From 4df612fa6076bd12d105a8b1d4cdbeb26e646ec1 Mon Sep 17 00:00:00 2001 From: Olivier Hainque Date: Tue, 1 Aug 2017 13:23:06 +0000 Subject: [PATCH] t-vxworks (LIBGCC2_INCLUDES): Start with -I. 2017-08-01 Olivier Hainque * config/t-vxworks (LIBGCC2_INCLUDES): Start with -I. after -nostdinc. * config/t-vxworks7: Likewise. From-SVN: r250776 --- libgcc/ChangeLog | 5 +++++ libgcc/config/t-vxworks | 9 +++++---- libgcc/config/t-vxworks7 | 9 +++++---- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 97da7105696..626a50f1a40 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 001f9fa108c..bbbb16deede 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 77591cd642c..ae1dff9ccbd 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 ;; \