[src/trunk]: src/external/gpl3/gcc/dist/gcc/config pull across these revision...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4f09b35337b4
branches:  trunk
changeset: 766376:4f09b35337b4
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Jun 21 06:54:27 2011 +0000

description:
pull across these revisions from gcc 4.1:

revision 1.9
date: 2011/04/15 13:42:22;  author: joerg;  state: Exp;  lines: +2 -1
Move the headers for compiler and platform specific intrinsincs from
/usr/include to /usr/include/gcc-4.1.

revision 1.8
date: 2011/04/10 21:25:56;  author: joerg;  state: Exp;  lines: +1 -0
Add back a stylish new line.

revision 1.7
date: 2011/04/10 16:50:18;  author: joerg;  state: Exp;  lines: +20 -12
Reduce difference between src/tools/gcc and src/gnu/usr.bin/gcc4
configuration. All but the target to helper programs should be the same.
Mark include directories as sysroot-relative.


adjust the paths to gcc-4.5, and add an XXX note about this ugliness.

diffstat:

 external/gpl3/gcc/dist/gcc/config/netbsd.h |  37 ++++++++++++++++++++---------
 1 files changed, 25 insertions(+), 12 deletions(-)

diffs (68 lines):

diff -r 561a5e17b8b7 -r 4f09b35337b4 external/gpl3/gcc/dist/gcc/config/netbsd.h
--- a/external/gpl3/gcc/dist/gcc/config/netbsd.h        Tue Jun 21 06:43:38 2011 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/netbsd.h        Tue Jun 21 06:54:27 2011 +0000
@@ -37,9 +37,13 @@
 
 /* NETBSD_NATIVE is defined when gcc is integrated into the NetBSD
    source tree so it can be configured appropriately without using
-   the GNU configure/build mechanism.  */
+   the GNU configure/build mechanism.
 
-#ifdef NETBSD_NATIVE
+   NETBSD_TOOLS is defined when gcc is built as cross-compiler for
+   the in-tree toolchain.
+ */
+
+#if defined(NETBSD_NATIVE) || defined(NETBSD_TOOLS)
 
 /* Look for the include files in the system-defined places.  */
 
@@ -49,29 +53,38 @@
 #undef GPLUSPLUS_BACKWARD_INCLUDE_DIR
 #define GPLUSPLUS_BACKWARD_INCLUDE_DIR "/usr/include/g++/backward"
 
+/*
+ * XXX figure out a better way to do this
+ */
 #undef GCC_INCLUDE_DIR
-#define GCC_INCLUDE_DIR "/usr/include"
+#define GCC_INCLUDE_DIR "/usr/include/gcc-4.5"
 
 #undef INCLUDE_DEFAULTS
 #define INCLUDE_DEFAULTS                               \
   {                                                    \
-    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },            \
-    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1 },   \
-    { GCC_INCLUDE_DIR, "GCC", 0, 0 },                  \
+    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1 },         \
+    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 1 },        \
+    { GCC_INCLUDE_DIR, "GCC", 0, 0, 1 },               \
+    { "/usr/include", "GCC", 0, 0, 1 },                        \
     { 0, 0, 0, 0 }                                     \
   }
 
-/* Under NetBSD, the normal location of the compiler back ends is the
-   /usr/libexec directory.  */
-
-#undef STANDARD_EXEC_PREFIX
-#define STANDARD_EXEC_PREFIX           "/usr/libexec/"
-
 /* Under NetBSD, the normal location of the various *crt*.o files is the
    /usr/lib directory.  */
 
 #undef STANDARD_STARTFILE_PREFIX
 #define STANDARD_STARTFILE_PREFIX      "/usr/lib/"
+#undef STANDARD_STARTFILE_PREFIX_1
+#define STANDARD_STARTFILE_PREFIX_1    "/usr/lib/"
+
+#endif /* NETBSD_NATIVE || NETBSD_TOOLS */
+
+#if defined(NETBSD_NATIVE)
+/* Under NetBSD, the normal location of the compiler back ends is the
+   /usr/libexec directory.  */
+
+#undef STANDARD_EXEC_PREFIX
+#define STANDARD_EXEC_PREFIX           "/usr/libexec/"
 
 #undef TOOLDIR_BASE_PREFIX
 #define TOOLDIR_BASE_PREFIX            "/usr/"