From fb9970973a494f83270781242a9bb515fef99fb4 Mon Sep 17 00:00:00 2001 From: Olivier Hainque Date: Thu, 7 Jun 2018 13:31:24 +0000 Subject: [PATCH] t-vxworks (LIBGCC_INCLUDES): Add -I$(MULTIBUILDTOP)../../gcc/include. 2018-06-07 Olivier Hainque * config/t-vxworks (LIBGCC_INCLUDES): Add -I$(MULTIBUILDTOP)../../gcc/include. * config/t-vxworks7: Likewise. Reformat a bit to match the t-vxworks layout. From-SVN: r261273 --- libgcc/ChangeLog | 7 +++++++ libgcc/config/t-vxworks | 4 +++- libgcc/config/t-vxworks7 | 8 +++++--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 575db684f4ea..fc24d8e228c2 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,10 @@ +2018-06-07 Olivier Hainque + + * config/t-vxworks (LIBGCC_INCLUDES): Add + -I$(MULTIBUILDTOP)../../gcc/include. + * config/t-vxworks7: Likewise. Reformat a bit to match + the t-vxworks layout. + 2018-06-07 Olga Makhotina * config/i386/cpuinfo.h (processor_types): Add INTEL_TREMONT. diff --git a/libgcc/config/t-vxworks b/libgcc/config/t-vxworks index bbbb16deedee..df70feecef3f 100644 --- a/libgcc/config/t-vxworks +++ b/libgcc/config/t-vxworks @@ -7,8 +7,10 @@ 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. Make sure the local libgcc headers still -# prevail (e.g. unwind.h). +# prevail (e.g. unwind.h), and that gcc provided header files intended +# to be user visible eventually are visible as well. LIBGCC2_INCLUDES = -nostdinc -I. \ + -I$(MULTIBUILDTOP)../../gcc/include \ `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 ae1dff9ccbdb..f0293feb4728 100644 --- a/libgcc/config/t-vxworks7 +++ b/libgcc/config/t-vxworks7 @@ -7,9 +7,11 @@ 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. Make sure the local libgcc headers still -# prevail (e.g. unwind.h). -LIBGCC2_INCLUDES = -nostdinc \ - -I. -I$(VSB_DIR)/h -I$(VSB_DIR)/share/h \ +# prevail (e.g. unwind.h), and that gcc provided header files intended +# to be user visible eventually are visible as well. +LIBGCC2_INCLUDES = -nostdinc -I. \ + -I$(VSB_DIR)/h -I$(VSB_DIR)/share/h \ + -I$(MULTIBUILDTOP)../../gcc/include \ `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 ;; \ -- 2.39.2