summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>2007-03-02 12:37:31 +0000
committerrsandifo <rsandifo@138bc75d-0d04-0410-961f-82ee72b054a4>2007-03-02 12:37:31 +0000
commitedb474a199145805e660280c09fcadd911e815cd (patch)
treec5d0a9dd68e7c817542661671fa5aa8144abb0a5
parent3e6cba40516d845284781f95bae10677dfa12d72 (diff)
downloadppe42-gcc-edb474a199145805e660280c09fcadd911e815cd.tar.gz
ppe42-gcc-edb474a199145805e660280c09fcadd911e815cd.zip
gcc/
* config/t-vxworks (LIBGCC2_INCLUDES): Pass -nostdinc. Use $MULTIDIR to choose between the kernel and RTP headers, and use $WIND_BASE and $WIND_USR to locate them. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122474 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/t-vxworks7
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7b6870bb4b5..688ffd63376 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-02 Richard Sandiford <richard@codesourcery.com>
+
+ * config/t-vxworks (LIBGCC2_INCLUDES): Pass -nostdinc.
+ Use $MULTIDIR to choose between the kernel and RTP headers,
+ and use $WIND_BASE and $WIND_USR to locate them.
+
2007-03-02 Uros Bizjak <ubizjak@gmail.com>
Michael Meissner <michael.meissner@amd.com>
diff --git a/gcc/config/t-vxworks b/gcc/config/t-vxworks
index 9a6a6b0d120..f6235035704 100644
--- a/gcc/config/t-vxworks
+++ b/gcc/config/t-vxworks
@@ -21,8 +21,11 @@ EXTRA_HEADERS += $(srcdir)/gthr-vxworks.h gthr-default.h
# This ensures that the correct target headers are used; some
# VxWorks system headers have names that collide with GCC's
# internal (host) headers, e.g. regs.h.
-# FIXME: May not be necessary anymore.
-LIBGCC2_INCLUDES="-I$(SYSTEM_HEADER_DIR)"
+LIBGCC2_INCLUDES = -nostdinc -I \
+ `case "/$$(MULTIDIR)" in \
+ */mrtp*) echo $(WIND_USR)/h ;; \
+ *) echo $(WIND_BASE)/target/h ;; \
+ esac`
EXTRA_MULTILIB_PARTS =
OpenPOWER on IntegriCloud