[src/trunk]: src/external/gpl3/gcc/dist/gcc port this change from our gcc 4.1...

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

details:   https://anonhg.NetBSD.org/src/rev/601b43dbedb8
branches:  trunk
changeset: 766425:601b43dbedb8
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Jun 22 05:15:15 2011 +0000

description:
port this change from our gcc 4.1 tree.  not entirely sure it's correct
yet, but not yet able to test ...

revision 1.5
date: 2011/04/10 16:50:18;  author: joerg;  state: Exp;  lines: +2 -2
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.

diffstat:

 external/gpl3/gcc/dist/gcc/gcc.c |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (25 lines):

diff -r 601d7f96a7fe -r 601b43dbedb8 external/gpl3/gcc/dist/gcc/gcc.c
--- a/external/gpl3/gcc/dist/gcc/gcc.c  Wed Jun 22 05:14:26 2011 +0000
+++ b/external/gpl3/gcc/dist/gcc/gcc.c  Wed Jun 22 05:15:15 2011 +0000
@@ -7108,15 +7108,18 @@
                              PREFIX_PRIORITY_LAST, 0, 1);
       else if (*cross_compile == '0')
        {
+/* XXXMRG not sure this one is right? */
+#if !defined(NETBSD_NATIVE) && !defined(NETBSD_TOOLS)
          add_prefix (&startfile_prefixes,
                      concat (gcc_exec_prefix
                              ? gcc_exec_prefix : standard_exec_prefix,
                              machine_suffix,
                              standard_startfile_prefix, NULL),
                      NULL, PREFIX_PRIORITY_LAST, 0, 1);
-       }
-
-#ifndef NETBSD_NATIVE
+#endif /* NETBSD_NATIVE */
+       }
+
+#if !defined(NETBSD_NATIVE) && !defined(NETBSD_TOOLS)
       /* Sysrooted prefixes are relocated because target_system_root is
         also relocated by gcc_exec_prefix.  */
       if (*standard_startfile_prefix_1)