[rtems-libbsd commit] Use empty <sys/ucontext.h>

Sebastian Huber sebh at rtems.org
Fri Sep 20 14:16:45 UTC 2013


Module:    rtems-libbsd
Branch:    master
Commit:    a71a32535f925406a7aa8ef2bc2eeab6f2d00287
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=a71a32535f925406a7aa8ef2bc2eeab6f2d00287

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Sep 20 15:02:54 2013 +0200

Use empty <sys/ucontext.h>

---

 freebsd-to-rtems.py    |    2 +-
 freebsd/sys/ucontext.h |  100 +-----------------------------------------------
 2 files changed, 2 insertions(+), 100 deletions(-)

diff --git a/freebsd-to-rtems.py b/freebsd-to-rtems.py
index 81b1b28..8f28178 100755
--- a/freebsd-to-rtems.py
+++ b/freebsd-to-rtems.py
@@ -723,6 +723,7 @@ rtems.addEmptyHeaderFiles(
 		'sys/syslimits.h',
 		'sys/sysproto.h',
 		'sys/stat.h',
+		'sys/ucontext.h',
 		#'sys/time.h',
 		'time.h',
 		#'sys/timespec.h',
@@ -1231,7 +1232,6 @@ devUsbBase.addHeaderFiles(
 		'sys/ttycom.h',
 		'sys/_types.h',
 		'sys/types.h',
-		'sys/ucontext.h',
 		'sys/ucred.h',
 		# FreeBSD version is in RTEMS since used by readv/writev
 		# 'sys/uio.h',
diff --git a/freebsd/sys/ucontext.h b/freebsd/sys/ucontext.h
index e73925b..936ffd8 100644
--- a/freebsd/sys/ucontext.h
+++ b/freebsd/sys/ucontext.h
@@ -1,99 +1 @@
-/*-
- * Copyright (c) 1999 Marcel Moolenaar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer 
- *    in this position and unchanged.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * $FreeBSD$
- */
-
-#ifndef _SYS_UCONTEXT_HH_
-#define	_SYS_UCONTEXT_HH_
-
-#include <freebsd/sys/signal.h>
-#include <freebsd/machine/ucontext.h>
-
-typedef struct __ucontext {
-	/*
-	 * Keep the order of the first two fields. Also,
-	 * keep them the first two fields in the structure.
-	 * This way we can have a union with struct
-	 * sigcontext and ucontext_t. This allows us to
-	 * support them both at the same time.
-	 * note: the union is not defined, though.
-	 */
-	sigset_t	uc_sigmask;
-	mcontext_t	uc_mcontext;
-
-	struct __ucontext *uc_link;
-	stack_t		uc_stack;
-	int		uc_flags;
-#define	UCF_SWAPPED	0x00000001	/* Used by swapcontext(3). */
-	int		__spare__[4];
-} ucontext_t;
-
-#if defined(_KERNEL) && defined(COMPAT_FREEBSD4)
-#if defined(__i386__)
-struct ucontext4 {
-	sigset_t	uc_sigmask;
-	struct mcontext4 uc_mcontext;
-	struct ucontext4 *uc_link;
-	stack_t		uc_stack;
-	int		__spare__[8];
-};
-#else	/* __i386__ */
-#define ucontext4 ucontext
-#endif	/* __i386__ */
-#endif	/* _KERNEL */
-
-#ifndef _KERNEL
-
-__BEGIN_DECLS
-
-int	getcontext(ucontext_t *);
-int	setcontext(const ucontext_t *);
-void	makecontext(ucontext_t *, void (*)(void), int, ...);
-int	signalcontext(ucontext_t *, int, __sighandler_t *);
-int	swapcontext(ucontext_t *, const ucontext_t *);
-
-__END_DECLS
-
-#else /* _KERNEL */
-
-struct thread;
-
-/*
- * Flags for get_mcontext().  The low order 4 bits (i.e a mask of 0x0f) are
- * reserved for use by machine independent code.  All other bits are for use
- * by machine dependent code.
- */
-#define	GET_MC_CLEAR_RET	1
-
-/* Machine-dependent functions: */
-int	get_mcontext(struct thread *, mcontext_t *, int);
-int	set_mcontext(struct thread *, const mcontext_t *);
-
-#endif /* !_KERNEL */
-
-#endif /* !_SYS_UCONTEXT_HH_ */
+/* EMPTY */




More information about the vc mailing list