t-vxworks (LIBGCC2_INCLUDES): Start with -I.

2017-08-01  Olivier Hainque  <hainque@adacore.com>

	* config/t-vxworks (LIBGCC2_INCLUDES): Start with -I. after -nostdinc.
	* config/t-vxworks7: Likewise.

From-SVN: r250776
This commit is contained in:
Olivier Hainque 2017-08-01 13:23:06 +00:00 committed by Olivier Hainque
parent 5560e8c0af
commit 4df612fa60
3 changed files with 15 additions and 8 deletions

View File

@ -1,3 +1,8 @@
2017-08-01 Olivier Hainque <hainque@adacore.com>
* config/t-vxworks (LIBGCC2_INCLUDES): Start with -I. after -nostdinc.
* config/t-vxworks7: Likewise.
2017-08-01 Olivier Hainque <hainque@adacore.com>
* config/t-vxworks: Instead of redefining LIB2ADD,

View File

@ -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 ;; \

View File

@ -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 ;; \