diff options
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/t-vxworks | 7 |
2 files changed, 11 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7b6870b..688ffd6 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 9a6a6b0..f623503 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 = |