From: hainque Date: Tue, 1 Aug 2017 13:23:06 +0000 (+0000) Subject: 2017-08-01 Olivier Hainque X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fffdea9eb92e6009ee4b15981a440cba4f7fec81;p=thirdparty%2Fgcc.git 2017-08-01 Olivier Hainque * config/t-vxworks (LIBGCC2_INCLUDES): Start with -I. after -nostdinc. * config/t-vxworks7: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@250776 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 97da7105696b..626a50f1a400 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,8 @@ +2017-08-01 Olivier Hainque + + * config/t-vxworks (LIBGCC2_INCLUDES): Start with -I. after -nostdinc. + * config/t-vxworks7: Likewise. + 2017-08-01 Olivier Hainque * config/t-vxworks: Instead of redefining LIB2ADD, diff --git a/libgcc/config/t-vxworks b/libgcc/config/t-vxworks index 001f9fa108c4..bbbb16deedee 100644 --- a/libgcc/config/t-vxworks +++ b/libgcc/config/t-vxworks @@ -4,10 +4,11 @@ LIBGCC2_DEBUG_CFLAGS = # Extra libgcc2 modules used by gthr-vxworks.h functions LIB2ADDEH += $(srcdir)/config/vxlib.c $(srcdir)/config/vxlib-tls.c -# 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. -LIBGCC2_INCLUDES = -nostdinc \ +# 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. Make sure the local libgcc headers still +# prevail (e.g. unwind.h). +LIBGCC2_INCLUDES = -nostdinc -I. \ `case "/$(MULTIDIR)" in \ */mrtp*) echo -I$(WIND_USR)/h -I$(WIND_USR)/h/wrn/coreip ;; \ *) echo -I$(WIND_BASE)/target/h -I$(WIND_BASE)/target/h/wrn/coreip ;; \ diff --git a/libgcc/config/t-vxworks7 b/libgcc/config/t-vxworks7 index 77591cd642c1..ae1dff9ccbdb 100644 --- a/libgcc/config/t-vxworks7 +++ b/libgcc/config/t-vxworks7 @@ -4,11 +4,12 @@ LIBGCC2_DEBUG_CFLAGS = # Extra libgcc2 modules used by gthr-vxworks.h functions LIB2ADDEH += $(srcdir)/config/vxlib.c $(srcdir)/config/vxlib-tls.c -# 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. +# 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. Make sure the local libgcc headers still +# prevail (e.g. unwind.h). LIBGCC2_INCLUDES = -nostdinc \ - -I$(VSB_DIR)/h -I$(VSB_DIR)/share/h \ + -I. -I$(VSB_DIR)/h -I$(VSB_DIR)/share/h \ `case "/$(MULTIDIR)" in \ */mrtp*) echo -I$(VSB_DIR)/usr/h/public -I$(VSB_DIR)/usr/h ;; \ *) echo -I$(VSB_DIR)/krnl/h/system -I$(VSB_DIR)/krnl/h/public ;; \