summaryrefslogtreecommitdiff
path: root/lang/gcc3
diff options
context:
space:
mode:
authormartin <martin>2003-07-26 17:37:04 +0000
committermartin <martin>2003-07-26 17:37:04 +0000
commit694cfe403685e8a38850ef49097c661052b0e11c (patch)
treee44d6c8dbe7899cd432205f1c42024cfe8552e52 /lang/gcc3
parent1668d723772c815272195476fc000d601902d078 (diff)
downloadpkgsrc-694cfe403685e8a38850ef49097c661052b0e11c.tar.gz
Bring in a patch from the base system gcc3 and adapt example gcc3.mk file
accordingly. From: matthew green <mrg@netbsd.org> To: source-changes@NetBSD.org Subject: CVS commit: src/gnu/dist/gcc/gcc Message-Id: <20030725175744.B6FC4B004@cvs.netbsd.org> Module Name: src Committed By: mrg Date: Fri Jul 25 17:57:44 UTC 2003 Modified Files: src/gnu/dist/gcc/gcc: cppspec.c src/gnu/dist/gcc/gcc/config: netbsd.h Log Message: make `cpp -gcc' the default on NetBSD. To generate a diff of this commit: cvs rdiff -r1.1.1.1 -r1.2 src/gnu/dist/gcc/gcc/cppspec.c cvs rdiff -r1.1.1.1 -r1.2 src/gnu/dist/gcc/gcc/config/netbsd.h
Diffstat (limited to 'lang/gcc3')
-rw-r--r--lang/gcc3/distinfo4
-rw-r--r--lang/gcc3/files/gcc3.mk4
-rw-r--r--lang/gcc3/patches/patch-af18
-rw-r--r--lang/gcc3/patches/patch-ag13
4 files changed, 36 insertions, 3 deletions
diff --git a/lang/gcc3/distinfo b/lang/gcc3/distinfo
index 1d2c82e2fec..14e5540d311 100644
--- a/lang/gcc3/distinfo
+++ b/lang/gcc3/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.11 2003/07/08 16:30:45 abs Exp $
+$NetBSD: distinfo,v 1.12 2003/07/26 17:37:04 martin Exp $
SHA1 (gcc-3.3.tar.bz2) = 18e23822c6dc9cb462e0ff88bc1b8a20c53da60a
Size (gcc-3.3.tar.bz2) = 23447616 bytes
SHA1 (patch-aa) = 9037d2504c5db6458494a18852d57c1ef5c9dcdb
SHA1 (patch-ab) = 8e899db69149894e737e1f68372f3eef9c403635
SHA1 (patch-ae) = e5dd184ca1b0c415215e82d0250469792a432741
+SHA1 (patch-af) = ee41c43dbb6e710a9399954793c6ff7c4274e515
+SHA1 (patch-ag) = 23fecd85ddca19a2c543827b60ea555ffbdcaa6c
diff --git a/lang/gcc3/files/gcc3.mk b/lang/gcc3/files/gcc3.mk
index 889609dabef..05b8be8ba24 100644
--- a/lang/gcc3/files/gcc3.mk
+++ b/lang/gcc3/files/gcc3.mk
@@ -1,9 +1,9 @@
-# $NetBSD: gcc3.mk,v 1.10 2003/07/17 09:07:55 abs Exp $
+# $NetBSD: gcc3.mk,v 1.11 2003/07/26 17:37:06 martin Exp $
#
# make configuration file for @DISTNAME@
CC= @GCC_PREFIX@/bin/gcc
-CPP= @GCC_PREFIX@/bin/cpp -gcc
+CPP= @GCC_PREFIX@/bin/cpp
CXX= @GCC_PREFIX@/bin/g++
F77= @GCC_PREFIX@/bin/g77
PKG_FC= @GCC_PREFIX@/bin/g77
diff --git a/lang/gcc3/patches/patch-af b/lang/gcc3/patches/patch-af
new file mode 100644
index 00000000000..62701518478
--- /dev/null
+++ b/lang/gcc3/patches/patch-af
@@ -0,0 +1,18 @@
+$NetBSD: patch-af,v 1.1 2003/07/26 17:37:07 martin Exp $
+
+--- gcc/cppspec.c Wed Jul 23 02:40:54 2003
++++ gcc/cppspec.c Fri Jul 25 17:57:41 2003
+@@ -85,6 +85,13 @@
+
+ is_cpp_driver = 1;
+
++ /* NetBSD uses __GNUC__ and friends in header files processed with cpp
++ regularly. Default to old behaviour here. XXX - move me to
++ config/netbsd.h "DEFAULT_CPP_NEED_NO_GCC". */
++#ifdef DEFAULT_CPP_NEED_NO_GCC
++ need_no_gcc = DEFAULT_CPP_NEED_NO_GCC;
++#endif
++
+ /* First pass. If we see an -S or -c, barf. If we see an input file,
+ turn off read_stdin. If we see a second input file, it is actually
+ the output file. If we see a third input file, barf. */
diff --git a/lang/gcc3/patches/patch-ag b/lang/gcc3/patches/patch-ag
new file mode 100644
index 00000000000..7a542dd0c9c
--- /dev/null
+++ b/lang/gcc3/patches/patch-ag
@@ -0,0 +1,13 @@
+$NetBSD: patch-ag,v 1.1 2003/07/26 17:37:08 martin Exp $
+
+Index: gcc/config/netbsd.h
+--- gcc/config/netbsd.h Wed Jul 23 02:41:37 2003
++++ gcc/config/netbsd.h Fri Jul 25 17:57:43 2003
+@@ -234,3 +234,7 @@
+ /* 7 == PROT_READ | PROT_WRITE | PROT_EXEC */ \
+ (void) mprotect (page, end - page, 7); \
+ }
++
++/* NetBSD depends on "cpp" having GNUC semantics, and must default as if
++ "cpp -gcc" was called. */
++#define DEFAULT_CPP_NEED_NO_GCC 0