diff options
| author | Pav Lucistnik <pav@FreeBSD.org> | 2007-12-26 16:45:31 +0000 |
|---|---|---|
| committer | Pav Lucistnik <pav@FreeBSD.org> | 2007-12-26 16:45:31 +0000 |
| commit | a1218ec516dcc9e893d9112874a766364cc850c2 (patch) | |
| tree | 5fc0f9f8c4e10e4b7a22fb2bb667a6651120e94e /lang/gcc-ooo | |
| parent | - Fix a segfault on amd64 (except on qmail-spamcontrol and qmail-ldap) [1] (diff) | |
- Fix build on FreeBSD 8.x
Submitted by: Wesley Shields <wxs@atarininja.org>
Notes
Notes:
svn path=/head/; revision=204581
Diffstat (limited to 'lang/gcc-ooo')
| -rw-r--r-- | lang/gcc-ooo/files/patch-freebsd-spec.h | 30 | ||||
| -rw-r--r-- | lang/gcc-ooo/files/patch-gcc+config.gcc | 8 |
2 files changed, 22 insertions, 16 deletions
diff --git a/lang/gcc-ooo/files/patch-freebsd-spec.h b/lang/gcc-ooo/files/patch-freebsd-spec.h index d9e34a7bf9ef..479a375391e6 100644 --- a/lang/gcc-ooo/files/patch-freebsd-spec.h +++ b/lang/gcc-ooo/files/patch-freebsd-spec.h @@ -1,17 +1,19 @@ ---- gcc/config/freebsd-spec.h.orig Wed Mar 3 07:34:55 2004 -+++ gcc/config/freebsd-spec.h Sat Aug 13 18:47:14 2005 -@@ -51,7 +51,9 @@ +--- gcc/config/freebsd-spec.h.orig 2004-03-02 17:34:55.000000000 -0500 ++++ gcc/config/freebsd-spec.h 2007-12-26 09:17:49.000000000 -0500 +@@ -51,7 +51,11 @@ #define FBSD_TARGET_OS_CPP_BUILTINS() \ do \ { \ - if (FBSD_MAJOR == 6) \ -+ if (FBSD_MAJOR == 7) \ ++ if (FBSD_MAJOR == 8) \ ++ builtin_define ("__FreeBSD__=8"); \ ++ else if (FBSD_MAJOR == 7) \ + builtin_define ("__FreeBSD__=7"); \ + else if (FBSD_MAJOR == 6) \ builtin_define ("__FreeBSD__=6"); \ else if (FBSD_MAJOR == 5) \ builtin_define ("__FreeBSD__=5"); \ -@@ -130,11 +132,19 @@ +@@ -130,6 +134,7 @@ }" #else #if FBSD_MAJOR >= 5 @@ -19,15 +21,17 @@ #define FBSD_LIB_SPEC " \ %{!shared: \ %{!pg: %{pthread:-lc_r} -lc} \ - %{pg: %{pthread:-lc_r_p} -lc_p} \ - }" -+#else -+#define FBSD_LIB_SPEC " \ -+ %{!shared: \ +@@ -138,6 +143,13 @@ + #else + #define FBSD_LIB_SPEC " \ + %{!shared: \ + %{!pg: %{pthread:-lpthread} -lc} \ + %{pg: %{pthread:-lpthread_p} -lc_p} \ + }" +#endif /* deal with FreeBSD 5.0 - 5.2.1 */ - #else - #define FBSD_LIB_SPEC " \ - %{!shared: \ ++#else ++#define FBSD_LIB_SPEC " \ ++ %{!shared: \ + %{!pg: \ + %{!pthread:-lc} \ + %{pthread:-lc_r}} \ diff --git a/lang/gcc-ooo/files/patch-gcc+config.gcc b/lang/gcc-ooo/files/patch-gcc+config.gcc index 623ca3490d11..9660d5a5db0c 100644 --- a/lang/gcc-ooo/files/patch-gcc+config.gcc +++ b/lang/gcc-ooo/files/patch-gcc+config.gcc @@ -1,11 +1,13 @@ ---- gcc/config.gcc.orig Thu Apr 22 00:12:35 2004 -+++ gcc/config.gcc Sat Aug 13 10:17:42 2005 -@@ -400,6 +400,8 @@ +--- gcc/config.gcc.orig 2004-04-21 11:12:35.000000000 -0400 ++++ gcc/config.gcc 2007-12-26 09:18:23.000000000 -0500 +@@ -400,6 +400,10 @@ tm_defines="${tm_defines} FBSD_MAJOR=5" ;; *-*-freebsd6 | *-*-freebsd[6].*) tm_defines="${tm_defines} FBSD_MAJOR=6" ;; + *-*-freebsd7 | *-*-freebsd[7].*) + tm_defines="${tm_defines} FBSD_MAJOR=7" ;; ++ *-*-freebsd8 | *-*-freebsd[8].*) ++ tm_defines="${tm_defines} FBSD_MAJOR=8" ;; *) echo 'Please update *-*-freebsd* in gcc/config.gcc' exit 1 |