From c3c9a5d23e79fd998f42a0948ed7d73cb731121b Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Fri, 2 Mar 2007 12:37:31 +0000 Subject: [PATCH] t-vxworks (LIBGCC2_INCLUDES): Pass -nostdinc. 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. From-SVN: r122474 --- gcc/ChangeLog | 6 ++++++ gcc/config/t-vxworks | 7 +++++-- 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 + + * 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 Michael Meissner 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 = -- 2.30.2