ea33efa679
GCC47 was marked NOT-FOR-DRAGONFLY, so support has been added. * DragonFly-specific files added via patch mechanism * Some existing patches modified to add DragonFly configuration items * dl_iterate_phdr error handling support added (FreeBSD support was altered, NetBSD and OpenBSD support is commented out) * The java language is taken off as a default option On the i386 platform, the compiler will build from a full bootstrap, but one of the later stages fails on x86_64. It fails to find libstdc++.so.6 even though the previous stage library was built and -B, -L flags point to it. The cause of the platform-specific build failure isn't clear -- The workaround is to disable the bootstrap on DragonFly so that the compiler is built in one stage instead of three. This workaround could have been limited to the x86_64-DragonFly platform only, but currently is applied to i386-DragonFly too.
68 lines
2.3 KiB
C
68 lines
2.3 KiB
C
$NetBSD: patch-gcc_ginclude_stddef.h,v 1.2 2012/06/23 22:13:02 marino Exp $
|
|
|
|
Fix build on NetBSD i386/amd64 after the ansi.h header include protection
|
|
name change.
|
|
Add DragonFly support.
|
|
|
|
--- gcc/ginclude/stddef.h.orig 2012-02-12 01:06:04.000000000 +0000
|
|
+++ gcc/ginclude/stddef.h
|
|
@@ -53,12 +53,21 @@ see the files COPYING3 and COPYING.RUNTI
|
|
one less case to deal with in the following. */
|
|
#if defined (__BSD_NET2__) || defined (____386BSD____) || (defined (__FreeBSD__) && (__FreeBSD__ < 5)) || defined(__NetBSD__)
|
|
#include <machine/ansi.h>
|
|
+#if !defined(_MACHINE_ANSI_H_)
|
|
+#if defined(_I386_ANSI_H_) || defined(_X86_64_ANSI_H_)
|
|
+#define _MACHINE_ANSI_H_
|
|
+#endif
|
|
+#endif
|
|
#endif
|
|
/* On FreeBSD 5, machine/ansi.h does not exist anymore... */
|
|
#if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
|
|
#include <sys/_types.h>
|
|
#endif
|
|
|
|
+#if defined(__DragonFly__)
|
|
+#include <sys/types.h>
|
|
+#endif
|
|
+
|
|
/* In 4.3bsd-net2, machine/ansi.h defines these symbols, which are
|
|
defined if the corresponding type is *not* defined.
|
|
FreeBSD-2.1 defines _MACHINE_ANSI_H_ instead of _ANSI_H_.
|
|
@@ -136,6 +145,7 @@ _TYPE_wchar_t;
|
|
#ifndef _BSD_PTRDIFF_T_
|
|
#ifndef ___int_ptrdiff_t_h
|
|
#ifndef _GCC_PTRDIFF_T
|
|
+#ifndef _PTRDIFF_T_DECLARED /* DragonFly */
|
|
#define _PTRDIFF_T
|
|
#define _T_PTRDIFF_
|
|
#define _T_PTRDIFF
|
|
@@ -144,10 +154,12 @@ _TYPE_wchar_t;
|
|
#define _BSD_PTRDIFF_T_
|
|
#define ___int_ptrdiff_t_h
|
|
#define _GCC_PTRDIFF_T
|
|
+#define _PTRDIFF_T_DECLARED
|
|
#ifndef __PTRDIFF_TYPE__
|
|
#define __PTRDIFF_TYPE__ long int
|
|
#endif
|
|
typedef __PTRDIFF_TYPE__ ptrdiff_t;
|
|
+#endif /* _PTRDIFF_T_DECLARED */
|
|
#endif /* _GCC_PTRDIFF_T */
|
|
#endif /* ___int_ptrdiff_t_h */
|
|
#endif /* _BSD_PTRDIFF_T_ */
|
|
@@ -201,6 +213,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t;
|
|
#define _GCC_SIZE_T
|
|
#define _SIZET_
|
|
#if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \
|
|
+ || defined(__DragonFly__) \
|
|
|| defined(__FreeBSD_kernel__)
|
|
/* __size_t is a typedef on FreeBSD 5, must not trash it. */
|
|
#else
|
|
@@ -307,7 +320,7 @@ typedef _BSD_RUNE_T_ rune_t;
|
|
/* FreeBSD 5 can't be handled well using "traditional" logic above
|
|
since it no longer defines _BSD_RUNE_T_ yet still desires to export
|
|
rune_t in some cases... */
|
|
-#if defined (__FreeBSD__) && (__FreeBSD__ >= 5)
|
|
+#if defined (__DragonFly__) || (defined (__FreeBSD__) && (__FreeBSD__ >= 5))
|
|
#if !defined (_ANSI_SOURCE) && !defined (_POSIX_SOURCE)
|
|
#if __BSD_VISIBLE
|
|
#ifndef _RUNE_T_DECLARED
|