- Remove always false OSVERSION condition and never used patches

Approved by:	portmgr blanket

8 files changed, 0 insertions, 982 deletions

diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index ea993f429158..99a61337b73d 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -164,15 +164,9 @@ RECOMPILEDIR=	base/system
 RECOMPILEDIR=
 .endif
 
-.if (${ARCH} == "amd64") && (${OSVERSION} < 1000029)
-MLRUNTIMEPATCHES_CMD=	cd ${FILESDIR} && \
-			( ${LS} do-patch-base_runtime_* extra-patch-base_runtime_* 2>&- || \
-			  ${TRUE} )
-.else
 MLRUNTIMEPATCHES_CMD=	cd ${FILESDIR} && \
 			( ${LS} do-patch-base_runtime_* 2>&- || \
 			  ${TRUE} )
-.endif
 MLSTANDARDPATCHES_CMD=	cd ${FILESDIR} && \
 			( for srcdir in ${MLSTDSRCDIRS} ; \
 			  do ${LS} do-patch-$${srcdir}_* 2>&- ; \
diff --git a/lang/smlnj/files/extra-patch-base_runtime_c-libs_smlnj-math_ctlrndmode.c b/lang/smlnj/files/extra-patch-base_runtime_c-libs_smlnj-math_ctlrndmode.c
deleted file mode 100644
index 057f573fcaa9..000000000000
--- a/lang/smlnj/files/extra-patch-base_runtime_c-libs_smlnj-math_ctlrndmode.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- base/runtime/c-libs/smlnj-math/ctlrndmode.c.orig	2000-06-01 20:34:03.000000000 +0200
-+++ base/runtime/c-libs/smlnj-math/ctlrndmode.c	2013-06-18 15:08:01.715990633 +0200
-@@ -3,6 +3,19 @@
-  * COPYRIGHT (c) 1996 AT&T Research.
-  */
- 
-+ #if defined(OPSYS_FREEBSD)
-+ #  if defined(INCLUDE_FREEBSD_I386__TYPES)
-+ #    include <sys/cdefs.h>
-+ #    include INCLUDE_FREEBSD_I386__TYPES
-+ #  endif
-+ #  if defined(INCLUDE_FREEBSD_I386_ENDIAN)
-+ #    include INCLUDE_FREEBSD_I386_ENDIAN
-+ #  endif
-+ #  if defined(INCLUDE_FREEBSD_I386_IEEEFP)
-+ #    include INCLUDE_FREEBSD_I386_IEEEFP
-+ #  endif
-+ #endif
-+ 
- #include "ml-base.h"
- #include "fp-dep.h"
- #include "ml-objects.h"
diff --git a/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-8-i386-__types.h b/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-8-i386-__types.h
deleted file mode 100644
index cedda3e5f374..000000000000
--- a/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-8-i386-__types.h
+++ /dev/null
@@ -1,137 +0,0 @@
---- base/runtime/include/freebsd-8-i386-_types.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ base/runtime/include/freebsd-8-i386-_types.h	2013-06-19 16:14:57.000000000 +0200
-@@ -0,0 +1,134 @@
-+/*-
-+ * Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
-+ * Copyright (c) 1990, 1993
-+ *	The Regents of the University of California.  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.
-+ * 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. All advertising materials mentioning features or use of this software
-+ *    must display the following acknowledgement:
-+ *	This product includes software developed by the University of
-+ *	California, Berkeley and its contributors.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
-+ *
-+ *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
-+ *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
-+ * $FreeBSD: stable/8/sys/i386/include/_types.h 176827 2008-03-05 11:21:14Z bde $
-+ */
-+
-+#ifndef _MACHINE__TYPES_H_
-+#define	_MACHINE__TYPES_H_
-+
-+#ifndef _SYS_CDEFS_H_
-+#error this file needs sys/cdefs.h as a prerequisite
-+#endif
-+
-+#define __NO_STRICT_ALIGNMENT
-+
-+/*
-+ * Basic types upon which most other types are built.
-+ */
-+typedef	__signed char		__int8_t;
-+typedef	unsigned char		__uint8_t;
-+typedef	short			__int16_t;
-+typedef	unsigned short		__uint16_t;
-+typedef	int			__int32_t;
-+typedef	unsigned int		__uint32_t;
-+
-+#if defined(lint)
-+/* LONGLONG */
-+typedef	long long		__int64_t;
-+/* LONGLONG */
-+typedef	unsigned long long	__uint64_t;
-+#elif defined(__GNUCLIKE_ATTRIBUTE_MODE_DI)
-+typedef	int __attribute__((__mode__(__DI__)))		__int64_t;
-+typedef	unsigned int __attribute__((__mode__(__DI__)))	__uint64_t;
-+#else
-+/* LONGLONG */
-+typedef	long long		__int64_t;
-+/* LONGLONG */
-+typedef	unsigned long long	__uint64_t;
-+#endif
-+
-+/*
-+ * Standard type definitions.
-+ */
-+typedef	unsigned long	__clock_t;		/* clock()... */
-+typedef	unsigned int	__cpumask_t;
-+typedef	__int32_t	__critical_t;
-+typedef	long double	__double_t;
-+typedef	long double	__float_t;
-+typedef	__int32_t	__intfptr_t;
-+typedef	__int64_t	__intmax_t;
-+typedef	__int32_t	__intptr_t;
-+typedef	__int32_t	__int_fast8_t;
-+typedef	__int32_t	__int_fast16_t;
-+typedef	__int32_t	__int_fast32_t;
-+typedef	__int64_t	__int_fast64_t;
-+typedef	__int8_t	__int_least8_t;
-+typedef	__int16_t	__int_least16_t;
-+typedef	__int32_t	__int_least32_t;
-+typedef	__int64_t	__int_least64_t;
-+typedef	__int32_t	__ptrdiff_t;		/* ptr1 - ptr2 */
-+typedef	__int32_t	__register_t;
-+typedef	__int32_t	__segsz_t;		/* segment size (in pages) */
-+typedef	__uint32_t	__size_t;		/* sizeof() */
-+typedef	__int32_t	__ssize_t;		/* byte count or error */
-+typedef	__int32_t	__time_t;		/* time()... */
-+typedef	__uint32_t	__uintfptr_t;
-+typedef	__uint64_t	__uintmax_t;
-+typedef	__uint32_t	__uintptr_t;
-+typedef	__uint32_t	__uint_fast8_t;
-+typedef	__uint32_t	__uint_fast16_t;
-+typedef	__uint32_t	__uint_fast32_t;
-+typedef	__uint64_t	__uint_fast64_t;
-+typedef	__uint8_t	__uint_least8_t;
-+typedef	__uint16_t	__uint_least16_t;
-+typedef	__uint32_t	__uint_least32_t;
-+typedef	__uint64_t	__uint_least64_t;
-+typedef	__uint32_t	__u_register_t;
-+typedef	__uint32_t	__vm_offset_t;
-+typedef	__int64_t	__vm_ooffset_t;
-+#ifdef PAE
-+typedef	__uint64_t	__vm_paddr_t;
-+#else
-+typedef	__uint32_t	__vm_paddr_t;
-+#endif
-+typedef	__uint64_t	__vm_pindex_t;
-+typedef	__uint32_t	__vm_size_t;
-+
-+/*
-+ * Unusual type definitions.
-+ */
-+#ifdef __GNUCLIKE_BUILTIN_VARARGS
-+typedef __builtin_va_list	__va_list;	/* internally known to gcc */
-+#else
-+typedef	char *			__va_list;
-+#endif /* __GNUCLIKE_BUILTIN_VARARGS */
-+#if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \
-+    && !defined(__NO_GNUC_VA_LIST)
-+#define __GNUC_VA_LIST
-+typedef __va_list		__gnuc_va_list;	/* compatibility w/GNU headers*/
-+#endif
-+
-+#endif /* !_MACHINE__TYPES_H_ */
diff --git a/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-8-i386-endian.h b/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-8-i386-endian.h
deleted file mode 100644
index c00265a5a803..000000000000
--- a/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-8-i386-endian.h
+++ /dev/null
@@ -1,139 +0,0 @@
---- base/runtime/include/freebsd-8-i386-endian.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ base/runtime/include/freebsd-8-i386-endian.h	2013-06-19 16:14:56.000000000 +0200
-@@ -0,0 +1,136 @@
-+/*-
-+ * Copyright (c) 1987, 1991 Regents of the University of California.
-+ * 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.
-+ * 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.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
-+ *
-+ *	@(#)endian.h	7.8 (Berkeley) 4/3/91
-+ * $FreeBSD: stable/8/sys/i386/include/endian.h 190854 2009-04-08 19:10:20Z ed $
-+ */
-+
-+#ifndef _MACHINE_ENDIAN_H_
-+#define	_MACHINE_ENDIAN_H_
-+
-+#include <sys/cdefs.h>
-+#include <sys/_types.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Define the order of 32-bit words in 64-bit words.
-+ */
-+#define	_QUAD_HIGHWORD 1
-+#define	_QUAD_LOWWORD 0
-+
-+/*
-+ * Definitions for byte order, according to byte significance from low
-+ * address to high.
-+ */
-+#define	_LITTLE_ENDIAN	1234	/* LSB first: i386, vax */
-+#define	_BIG_ENDIAN	4321	/* MSB first: 68000, ibm, net */
-+#define	_PDP_ENDIAN	3412	/* LSB first in word, MSW first in long */
-+
-+#define	_BYTE_ORDER	_LITTLE_ENDIAN
-+
-+/*
-+ * Deprecated variants that don't have enough underscores to be useful in more
-+ * strict namespaces.
-+ */
-+#if __BSD_VISIBLE
-+#define	LITTLE_ENDIAN	_LITTLE_ENDIAN
-+#define	BIG_ENDIAN	_BIG_ENDIAN
-+#define	PDP_ENDIAN	_PDP_ENDIAN
-+#define	BYTE_ORDER	_BYTE_ORDER
-+#endif
-+
-+#if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P)
-+
-+#define __byte_swap_int_var(x) \
-+__extension__ ({ register __uint32_t __X = (x); \
-+   __asm ("bswap %0" : "+r" (__X)); \
-+   __X; })
-+
-+#ifdef __OPTIMIZE__
-+
-+#define	__byte_swap_int_const(x) \
-+	((((x) & 0xff000000) >> 24) | \
-+	 (((x) & 0x00ff0000) >>  8) | \
-+	 (((x) & 0x0000ff00) <<  8) | \
-+	 (((x) & 0x000000ff) << 24))
-+#define	__byte_swap_int(x) (__builtin_constant_p(x) ? \
-+	__byte_swap_int_const(x) : __byte_swap_int_var(x))
-+
-+#else	/* __OPTIMIZE__ */
-+
-+#define	__byte_swap_int(x) __byte_swap_int_var(x)
-+
-+#endif	/* __OPTIMIZE__ */
-+
-+static __inline __uint64_t
-+__bswap64(__uint64_t _x)
-+{
-+
-+	return ((_x >> 56) | ((_x >> 40) & 0xff00) | ((_x >> 24) & 0xff0000) |
-+	    ((_x >> 8) & 0xff000000) | ((_x << 8) & ((__uint64_t)0xff << 32)) |
-+	    ((_x << 24) & ((__uint64_t)0xff << 40)) |
-+	    ((_x << 40) & ((__uint64_t)0xff << 48)) | ((_x << 56)));
-+}
-+
-+static __inline __uint32_t
-+__bswap32(__uint32_t _x)
-+{
-+
-+	return (__byte_swap_int(_x));
-+}
-+
-+static __inline __uint16_t
-+__bswap16(__uint16_t _x)
-+{
-+	return (_x << 8 | _x >> 8);
-+}
-+
-+#define	__htonl(x)	__bswap32(x)
-+#define	__htons(x)	__bswap16(x)
-+#define	__ntohl(x)	__bswap32(x)
-+#define	__ntohs(x)	__bswap16(x)
-+
-+#else /* !(__GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P) */
-+
-+/*
-+ * No optimizations are available for this compiler.  Fall back to
-+ * non-optimized functions by defining the constant usually used to prevent
-+ * redefinition.
-+ */
-+#define	_BYTEORDER_FUNC_DEFINED
-+
-+#endif /* __GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P */
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* !_MACHINE_ENDIAN_H_ */
diff --git a/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-8-i386-ieeefp.h b/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-8-i386-ieeefp.h
deleted file mode 100644
index 9722f88fd4f3..000000000000
--- a/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-8-i386-ieeefp.h
+++ /dev/null
@@ -1,262 +0,0 @@
---- base/runtime/include/freebsd-8-i386-ieeefp.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ base/runtime/include/freebsd-8-i386-ieeefp.h	2013-06-19 16:14:57.000000000 +0200
-@@ -0,0 +1,259 @@
-+/*-
-+ * Copyright (c) 2003 Peter Wemm.
-+ * Copyright (c) 1990 Andrew Moore, Talke Studio
-+ * 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.
-+ * 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. All advertising materials mentioning features or use of this software
-+ *    must display the following acknowledgement:
-+ *	This product includes software developed by the University of
-+ *	California, Berkeley and its contributors.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
-+ *
-+ * 	from: @(#) ieeefp.h 	1.0 (Berkeley) 9/23/93
-+ * $FreeBSD: stable/8/sys/i386/include/ieeefp.h 175234 2008-01-11 18:59:35Z bde $
-+ */
-+
-+#ifndef _MACHINE_IEEEFP_H_
-+#define _MACHINE_IEEEFP_H_
-+
-+/*
-+ * IEEE floating point type, constant and function definitions.
-+ * XXX: FP*FLD and FP*OFF are undocumented pollution.
-+ */
-+
-+#ifndef _SYS_CDEFS_H_
-+#error this file needs sys/cdefs.h as a prerequisite
-+#endif
-+
-+/*
-+ * Rounding modes.
-+ */
-+typedef enum {
-+	FP_RN=0,	/* round to nearest */
-+	FP_RM,		/* round down towards minus infinity */
-+	FP_RP,		/* round up towards plus infinity */
-+	FP_RZ		/* truncate */
-+} fp_rnd_t;
-+
-+/*
-+ * Precision (i.e., rounding precision) modes.
-+ */
-+typedef enum {
-+	FP_PS=0,	/* 24 bit (single-precision) */
-+	FP_PRS,		/* reserved */
-+	FP_PD,		/* 53 bit (double-precision) */
-+	FP_PE		/* 64 bit (extended-precision) */
-+} fp_prec_t;
-+
-+#define fp_except_t	int
-+
-+/*
-+ * Exception bit masks.
-+ */
-+#define FP_X_INV	0x01	/* invalid operation */
-+#define FP_X_DNML	0x02	/* denormal */
-+#define FP_X_DZ		0x04	/* zero divide */
-+#define FP_X_OFL	0x08	/* overflow */
-+#define FP_X_UFL	0x10	/* underflow */
-+#define FP_X_IMP	0x20	/* (im)precision */
-+#define FP_X_STK	0x40	/* stack fault */
-+
-+/*
-+ * FPU control word bit-field masks.
-+ */
-+#define FP_MSKS_FLD	0x3f	/* exception masks field */
-+#define FP_PRC_FLD	0x300	/* precision control field */
-+#define	FP_RND_FLD	0xc00	/* rounding control field */
-+
-+/*
-+ * FPU status word bit-field masks.
-+ */
-+#define FP_STKY_FLD	0x3f	/* sticky flags field */
-+
-+/*
-+ * FPU control word bit-field offsets (shift counts).
-+ */
-+#define FP_MSKS_OFF	0	/* exception masks offset */
-+#define FP_PRC_OFF	8	/* precision control offset */
-+#define	FP_RND_OFF	10	/* rounding control offset */
-+
-+/*
-+ * FPU status word bit-field offsets (shift counts).
-+ */
-+#define FP_STKY_OFF	0	/* sticky flags offset */
-+
-+#ifdef __GNUCLIKE_ASM
-+
-+#define	__fldcw(addr)	__asm __volatile("fldcw %0" : : "m" (*(addr)))
-+#define	__fldenv(addr)	__asm __volatile("fldenv %0" : : "m" (*(addr)))
-+#define	__fnclex()	__asm __volatile("fnclex")
-+#define	__fnstcw(addr)	__asm __volatile("fnstcw %0" : "=m" (*(addr)))
-+#define	__fnstenv(addr)	__asm __volatile("fnstenv %0" : "=m" (*(addr)))
-+#define	__fnstsw(addr)	__asm __volatile("fnstsw %0" : "=m" (*(addr)))
-+
-+/*
-+ * Load the control word.  Be careful not to trap if there is a currently
-+ * unmasked exception (ones that will become freshly unmasked are not a
-+ * problem).  This case must be handled by a save/restore of the
-+ * environment or even of the full x87 state.  Accessing the environment
-+ * is very inefficient, so only do it when necessary.
-+ */
-+static __inline void
-+__fnldcw(unsigned short _cw, unsigned short _newcw)
-+{
-+	struct {
-+		unsigned _cw;
-+		unsigned _other[6];
-+	} _env;
-+	unsigned short _sw;
-+
-+	if ((_cw & FP_MSKS_FLD) != FP_MSKS_FLD) {
-+		__fnstsw(&_sw);
-+		if (((_sw & ~_cw) & FP_STKY_FLD) != 0) {
-+			__fnstenv(&_env);
-+			_env._cw = _newcw;
-+			__fldenv(&_env);
-+			return;
-+		}
-+	}
-+	__fldcw(&_newcw);
-+}
-+
-+static __inline fp_rnd_t
-+fpgetround(void)
-+{
-+	unsigned short _cw;
-+
-+	__fnstcw(&_cw);
-+	return ((fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF));
-+}
-+
-+static __inline fp_rnd_t
-+fpsetround(fp_rnd_t _m)
-+{
-+	fp_rnd_t _p;
-+	unsigned short _cw, _newcw;
-+
-+	__fnstcw(&_cw);
-+	_p = (fp_rnd_t)((_cw & FP_RND_FLD) >> FP_RND_OFF);
-+	_newcw = _cw & ~FP_RND_FLD;
-+	_newcw |= (_m << FP_RND_OFF) & FP_RND_FLD;
-+	__fnldcw(_cw, _newcw);
-+	return (_p);
-+}
-+
-+static __inline fp_prec_t
-+fpgetprec(void)
-+{
-+	unsigned short _cw;
-+
-+	__fnstcw(&_cw);
-+	return ((fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF));
-+}
-+
-+static __inline fp_prec_t
-+fpsetprec(fp_prec_t _m)
-+{
-+	fp_prec_t _p;
-+	unsigned short _cw, _newcw;
-+
-+	__fnstcw(&_cw);
-+	_p = (fp_prec_t)((_cw & FP_PRC_FLD) >> FP_PRC_OFF);
-+	_newcw = _cw & ~FP_PRC_FLD;
-+	_newcw |= (_m << FP_PRC_OFF) & FP_PRC_FLD;
-+	__fnldcw(_cw, _newcw);
-+	return (_p);
-+}
-+
-+/*
-+ * Get or set the exception mask.
-+ * Note that the x87 mask bits are inverted by the API -- a mask bit of 1
-+ * means disable for x87 and SSE, but for fp*mask() it means enable.
-+ */
-+
-+static __inline fp_except_t
-+fpgetmask(void)
-+{
-+	unsigned short _cw;
-+
-+	__fnstcw(&_cw);
-+	return ((~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF);
-+}
-+
-+static __inline fp_except_t
-+fpsetmask(fp_except_t _m)
-+{
-+	fp_except_t _p;
-+	unsigned short _cw, _newcw;
-+
-+	__fnstcw(&_cw);
-+	_p = (~_cw & FP_MSKS_FLD) >> FP_MSKS_OFF;
-+	_newcw = _cw & ~FP_MSKS_FLD;
-+	_newcw |= (~_m << FP_MSKS_OFF) & FP_MSKS_FLD;
-+	__fnldcw(_cw, _newcw);
-+	return (_p);
-+}
-+
-+static __inline fp_except_t
-+fpgetsticky(void)
-+{
-+	unsigned _ex;
-+	unsigned short _sw;
-+
-+	__fnstsw(&_sw);
-+	_ex = (_sw & FP_STKY_FLD) >> FP_STKY_OFF;
-+	return ((fp_except_t)_ex);
-+}
-+
-+static __inline fp_except_t
-+fpresetsticky(fp_except_t _m)
-+{
-+	struct {
-+		unsigned _cw;
-+		unsigned _sw;
-+		unsigned _other[5];
-+	} _env;
-+	fp_except_t _p;
-+
-+	_m &= FP_STKY_FLD >> FP_STKY_OFF;
-+	_p = fpgetsticky();
-+	if ((_p & ~_m) == _p)
-+		return (_p);
-+	if ((_p & ~_m) == 0) {
-+		__fnclex();
-+		return (_p);
-+	}
-+	__fnstenv(&_env);
-+	_env._sw &= ~_m;
-+	__fldenv(&_env);
-+	return (_p);
-+}
-+
-+#endif /* __GNUCLIKE_ASM */
-+
-+/* Suppress prototypes in the MI header. */
-+#define	_IEEEFP_INLINED_	1
-+
-+#endif /* !_MACHINE_IEEEFP_H_ */
diff --git a/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-8-i386-signal.h b/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-8-i386-signal.h
deleted file mode 100644
index 31570e340095..000000000000
--- a/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-8-i386-signal.h
+++ /dev/null
@@ -1,137 +0,0 @@
---- base/runtime/include/freebsd-8-i386-signal.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ base/runtime/include/freebsd-8-i386-signal.h	2013-06-19 16:14:56.000000000 +0200
-@@ -0,0 +1,134 @@
-+/*-
-+ * Copyright (c) 1986, 1989, 1991, 1993
-+ *	The Regents of the University of California.  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.
-+ * 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.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
-+ *
-+ *	@(#)signal.h	8.1 (Berkeley) 6/11/93
-+ * $FreeBSD: stable/8/sys/i386/include/signal.h 190623 2009-04-01 13:44:28Z kib $
-+ */
-+
-+#ifndef _MACHINE_SIGNAL_H_
-+#define	_MACHINE_SIGNAL_H_
-+
-+#include <sys/cdefs.h>
-+#include <sys/_sigset.h>
-+
-+/*
-+ * Machine-dependent signal definitions
-+ */
-+
-+typedef int sig_atomic_t;
-+
-+#if __BSD_VISIBLE
-+#include <machine/trap.h>	/* codes for SIGILL, SIGFPE */
-+
-+/*
-+ * Only the kernel should need these old type definitions.
-+ */
-+#if defined(_KERNEL) && defined(COMPAT_43)
-+/*
-+ * Information pushed on stack when a signal is delivered.
-+ * This is used by the kernel to restore state following
-+ * execution of the signal handler.  It is also made available
-+ * to the handler to allow it to restore state properly if
-+ * a non-standard exit is performed.
-+ */
-+struct osigcontext {
-+	int	sc_onstack;		/* sigstack state to restore */
-+	osigset_t sc_mask;		/* signal mask to restore */
-+	int	sc_esp;			/* machine state follows: */
-+	int	sc_ebp;
-+	int	sc_isp;
-+	int	sc_eip;
-+	int	sc_efl;
-+	int	sc_es;
-+	int	sc_ds;
-+	int	sc_cs;
-+	int	sc_ss;
-+	int	sc_edi;
-+	int	sc_esi;
-+	int	sc_ebx;
-+	int	sc_edx;
-+	int	sc_ecx;
-+	int	sc_eax;
-+	int	sc_gs;
-+	int	sc_fs;
-+	int	sc_trapno;
-+	int	sc_err;
-+};
-+#endif
-+
-+/*
-+ * The sequence of the fields/registers in struct sigcontext should match
-+ * those in mcontext_t.
-+ */
-+struct sigcontext {
-+	struct __sigset sc_mask;	/* signal mask to restore */
-+	int	sc_onstack;		/* sigstack state to restore */
-+	int	sc_gs;			/* machine state (struct trapframe) */
-+	int	sc_fs;
-+	int	sc_es;
-+	int	sc_ds;
-+	int	sc_edi;
-+	int	sc_esi;
-+	int	sc_ebp;
-+	int	sc_isp;
-+	int	sc_ebx;
-+	int	sc_edx;
-+	int	sc_ecx;
-+	int	sc_eax;
-+	int	sc_trapno;
-+	int	sc_err;
-+	int	sc_eip;
-+	int	sc_cs;
-+	int	sc_efl;
-+	int	sc_esp;
-+	int	sc_ss;
-+	int	sc_len;			/* sizeof(mcontext_t) */
-+	/*
-+	 * XXX - See <machine/ucontext.h> and <machine/npx.h> for
-+	 *       the following fields.
-+	 */
-+	int	sc_fpformat;
-+	int	sc_ownedfp;
-+	int	sc_spare1[1];
-+	int	sc_fpstate[128] __aligned(16);
-+
-+	int	sc_fsbase;
-+	int	sc_gsbase;
-+
-+	int	sc_spare2[6];
-+};
-+
-+#define	sc_sp		sc_esp
-+#define	sc_fp		sc_ebp
-+#define	sc_pc		sc_eip
-+#define	sc_ps		sc_efl
-+#define	sc_eflags	sc_efl
-+
-+#endif /* __BSD_VISIBLE */
-+
-+#endif /* !_MACHINE_SIGNAL_H_ */
diff --git a/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-9-i386-__types.h b/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-9-i386-__types.h
deleted file mode 100644
index 4a6ca38435dc..000000000000
--- a/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-9-i386-__types.h
+++ /dev/null
@@ -1,131 +0,0 @@
---- base/runtime/include/freebsd-9-i386-_types.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ base/runtime/include/freebsd-9-i386-_types.h	2013-06-19 16:07:03.000000000 +0200
-@@ -0,0 +1,128 @@
-+/*-
-+ * Copyright (c) 2002 Mike Barcroft <mike@FreeBSD.org>
-+ * Copyright (c) 1990, 1993
-+ *	The Regents of the University of California.  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.
-+ * 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. All advertising materials mentioning features or use of this software
-+ *    must display the following acknowledgement:
-+ *	This product includes software developed by the University of
-+ *	California, Berkeley and its contributors.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
-+ *
-+ *	From: @(#)ansi.h	8.2 (Berkeley) 1/4/94
-+ *	From: @(#)types.h	8.3 (Berkeley) 1/5/94
-+ * $FreeBSD: stable/9/sys/i386/include/_types.h 222813 2011-06-07 08:46:13Z attilio $
-+ */
-+
-+#ifndef _MACHINE__TYPES_H_
-+#define	_MACHINE__TYPES_H_
-+
-+#ifndef _SYS_CDEFS_H_
-+#error this file needs sys/cdefs.h as a prerequisite
-+#endif
-+
-+#define __NO_STRICT_ALIGNMENT
-+
-+/*
-+ * Basic types upon which most other types are built.
-+ */
-+typedef	__signed char		__int8_t;
-+typedef	unsigned char		__uint8_t;
-+typedef	short			__int16_t;
-+typedef	unsigned short		__uint16_t;
-+typedef	int			__int32_t;
-+typedef	unsigned int		__uint32_t;
-+#ifndef lint
-+__extension__
-+#endif
-+/* LONGLONG */
-+typedef	long long		__int64_t;
-+#ifndef lint
-+__extension__
-+#endif
-+/* LONGLONG */
-+typedef	unsigned long long	__uint64_t;
-+
-+/*
-+ * Standard type definitions.
-+ */
-+typedef	unsigned long	__clock_t;		/* clock()... */
-+typedef	__int32_t	__critical_t;
-+typedef	long double	__double_t;
-+typedef	long double	__float_t;
-+typedef	__int32_t	__intfptr_t;
-+typedef	__int64_t	__intmax_t;
-+typedef	__int32_t	__intptr_t;
-+typedef	__int32_t	__int_fast8_t;
-+typedef	__int32_t	__int_fast16_t;
-+typedef	__int32_t	__int_fast32_t;
-+typedef	__int64_t	__int_fast64_t;
-+typedef	__int8_t	__int_least8_t;
-+typedef	__int16_t	__int_least16_t;
-+typedef	__int32_t	__int_least32_t;
-+typedef	__int64_t	__int_least64_t;
-+typedef	__int32_t	__ptrdiff_t;		/* ptr1 - ptr2 */
-+typedef	__int32_t	__register_t;
-+typedef	__int32_t	__segsz_t;		/* segment size (in pages) */
-+typedef	__uint32_t	__size_t;		/* sizeof() */
-+typedef	__int32_t	__ssize_t;		/* byte count or error */
-+typedef	__int32_t	__time_t;		/* time()... */
-+typedef	__uint32_t	__uintfptr_t;
-+typedef	__uint64_t	__uintmax_t;
-+typedef	__uint32_t	__uintptr_t;
-+typedef	__uint32_t	__uint_fast8_t;
-+typedef	__uint32_t	__uint_fast16_t;
-+typedef	__uint32_t	__uint_fast32_t;
-+typedef	__uint64_t	__uint_fast64_t;
-+typedef	__uint8_t	__uint_least8_t;
-+typedef	__uint16_t	__uint_least16_t;
-+typedef	__uint32_t	__uint_least32_t;
-+typedef	__uint64_t	__uint_least64_t;
-+typedef	__uint32_t	__u_register_t;
-+typedef	__uint32_t	__vm_offset_t;
-+typedef	__int64_t	__vm_ooffset_t;
-+#ifdef PAE
-+typedef	__uint64_t	__vm_paddr_t;
-+#else
-+typedef	__uint32_t	__vm_paddr_t;
-+#endif
-+typedef	__uint64_t	__vm_pindex_t;
-+typedef	__uint32_t	__vm_size_t;
-+
-+/*
-+ * Unusual type definitions.
-+ */
-+#ifdef __GNUCLIKE_BUILTIN_VARARGS
-+typedef __builtin_va_list	__va_list;	/* internally known to gcc */
-+#else
-+typedef	char *			__va_list;
-+#endif /* __GNUCLIKE_BUILTIN_VARARGS */
-+#if defined(__GNUC_VA_LIST_COMPATIBILITY) && !defined(__GNUC_VA_LIST) \
-+    && !defined(__NO_GNUC_VA_LIST)
-+#define __GNUC_VA_LIST
-+typedef __va_list		__gnuc_va_list;	/* compatibility w/GNU headers*/
-+#endif
-+
-+#endif /* !_MACHINE__TYPES_H_ */
diff --git a/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-9-i386-endian.h b/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-9-i386-endian.h
deleted file mode 100644
index 0b5e54e4a73d..000000000000
--- a/lang/smlnj/files/extra-patch-base_runtime_include_freebsd-9-i386-endian.h
+++ /dev/null
@@ -1,148 +0,0 @@
---- base/runtime/include/freebsd-9-i386-endian.h.orig	1970-01-01 01:00:00.000000000 +0100
-+++ base/runtime/include/freebsd-9-i386-endian.h	2013-06-19 16:13:50.000000000 +0200
-@@ -0,0 +1,145 @@
-+/*-
-+ * Copyright (c) 1987, 1991 Regents of the University of California.
-+ * 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.
-+ * 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.
-+ * 4. Neither the name of the University nor the names of its contributors
-+ *    may be used to endorse or promote products derived from this software
-+ *    without specific prior written permission.
-+ *
-+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
-+ *
-+ *	@(#)endian.h	7.8 (Berkeley) 4/3/91
-+ * $FreeBSD: stable/9/sys/i386/include/endian.h 219819 2011-03-21 09:40:01Z jeff $
-+ */
-+
-+#ifndef _MACHINE_ENDIAN_H_
-+#define	_MACHINE_ENDIAN_H_
-+
-+#include <sys/cdefs.h>
-+#include <sys/_types.h>
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+ * Define the order of 32-bit words in 64-bit words.
-+ */
-+#define	_QUAD_HIGHWORD 1
-+#define	_QUAD_LOWWORD 0
-+
-+/*
-+ * Definitions for byte order, according to byte significance from low
-+ * address to high.
-+ */
-+#define	_LITTLE_ENDIAN	1234	/* LSB first: i386, vax */
-+#define	_BIG_ENDIAN	4321	/* MSB first: 68000, ibm, net */
-+#define	_PDP_ENDIAN	3412	/* LSB first in word, MSW first in long */
-+
-+#define	_BYTE_ORDER	_LITTLE_ENDIAN
-+
-+/*
-+ * Deprecated variants that don't have enough underscores to be useful in more
-+ * strict namespaces.
-+ */
-+#if __BSD_VISIBLE
-+#define	LITTLE_ENDIAN	_LITTLE_ENDIAN
-+#define	BIG_ENDIAN	_BIG_ENDIAN
-+#define	PDP_ENDIAN	_PDP_ENDIAN
-+#define	BYTE_ORDER	_BYTE_ORDER
-+#endif
-+
-+#if defined(__GNUCLIKE_ASM) && defined(__GNUCLIKE_BUILTIN_CONSTANT_P)
-+
-+#define	__bswap64_const(_x)			\
-+	(((_x) >> 56) |				\
-+	(((_x) >> 40) & (0xffULL << 8)) |	\
-+	(((_x) >> 24) & (0xffULL << 16)) |	\
-+	(((_x) >> 8) & (0xffULL << 24)) |	\
-+	(((_x) << 8) & (0xffULL << 32)) |	\
-+	(((_x) << 24) & (0xffULL << 40)) |	\
-+	(((_x) << 40) & (0xffULL << 48)) |	\
-+	((_x) << 56))
-+
-+#define	__bswap32_const(_x)			\
-+	(((_x) >> 24) |				\
-+	(((_x) & (0xff << 16)) >> 8) |		\
-+	(((_x) & (0xff << 8)) << 8) |		\
-+	((_x) << 24))
-+
-+#define __bswap16_const(_x)	(__uint16_t)((_x) << 8 | (_x) >> 8)
-+
-+static __inline __uint64_t
-+__bswap64_var(__uint64_t __x)
-+{
-+
-+	return __bswap64_const(__x);
-+}
-+
-+
-+static __inline __uint32_t
-+__bswap32_var(__uint32_t _x)
-+{
-+
-+	__asm ("bswap %0" : "+r" (_x));
-+	return (_x);
-+}
-+
-+static __inline __uint16_t
-+__bswap16_var(__uint16_t _x)
-+{
-+
-+	return (__bswap16_const(_x));
-+}
-+
-+#define	__bswap64(_x)					\
-+	(__builtin_constant_p(_x) ?			\
-+	    __bswap64_const((__uint64_t)(_x)) : __bswap64_var(_x))
-+
-+#define	__bswap32(_x)					\
-+	(__builtin_constant_p(_x) ?			\
-+	    __bswap32_const((__uint32_t)(_x)) : __bswap32_var(_x))
-+
-+#define	__bswap16(_x)					\
-+	(__builtin_constant_p(_x) ?			\
-+	    __bswap16_const((__uint16_t)(_x)) : __bswap16_var(_x))
-+
-+#define	__htonl(x)	__bswap32(x)
-+#define	__htons(x)	__bswap16(x)
-+#define	__ntohl(x)	__bswap32(x)
-+#define	__ntohs(x)	__bswap16(x)
-+
-+#else /* !(__GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P) */
-+
-+/*
-+ * No optimizations are available for this compiler.  Fall back to
-+ * non-optimized functions by defining the constant usually used to prevent
-+ * redefinition.
-+ */
-+#define	_BYTEORDER_FUNC_DEFINED
-+
-+#endif /* __GNUCLIKE_ASM && __GNUCLIKE_BUILTIN_CONSTANT_P */
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* !_MACHINE_ENDIAN_H_ */