t-vxworks (LIBGCC_INCLUDES): Add -I$(MULTIBUILDTOP)../../gcc/include.

2018-06-07  Olivier Hainque  <hainque@adacore.com>

        * 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

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 575db684f4eaae730bd4d2d00ac0d36a170380c1..fc24d8e228c2a76c49dc380ac1ee29c8437360a8 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,10 @@
+2018-06-07  Olivier Hainque  <hainque@adacore.com>
+
+       * 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  <olga.makhotina@intel.com>
 
        * config/i386/cpuinfo.h (processor_types): Add INTEL_TREMONT.

diff --git a/libgcc/config/t-vxworks b/libgcc/config/t-vxworks
index bbbb16deedee13b3db9568d7eee0f268da580d4b..df70feecef3f68850888013fa713da2029573e32 100644 (file)
--- 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 ae1dff9ccbdb6f0003e111ab3c90ccfe826966df..f0293feb4728254620ea5233bfc36855f28aa6f7 100644 (file)
--- 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 ;; \