aboutsummaryrefslogtreecommitdiff
path: root/libgcc
diff options
context:
space:
mode:
authorOlivier Hainque <hainque@adacore.com>2018-06-07 13:31:24 +0000
committerOlivier Hainque <hainque@gcc.gnu.org>2018-06-07 13:31:24 +0000
commitfb9970973a494f83270781242a9bb515fef99fb4 (patch)
tree641c30cf21911ca18b0daca42584b80e22174e9f /libgcc
parenta548a5a1d6bbaeca98787f11f9ff193be1a8cd44 (diff)
downloadgcc-fb9970973a494f83270781242a9bb515fef99fb4.zip
gcc-fb9970973a494f83270781242a9bb515fef99fb4.tar.gz
gcc-fb9970973a494f83270781242a9bb515fef99fb4.tar.bz2
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
Diffstat (limited to 'libgcc')
-rw-r--r--libgcc/ChangeLog7
-rw-r--r--libgcc/config/t-vxworks4
-rw-r--r--libgcc/config/t-vxworks78
3 files changed, 15 insertions, 4 deletions
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 575db68..fc24d8e 100644
--- 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 bbbb16d..df70fee 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 ae1dff9..f0293fe 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 ;; \