diff options
| author | Olivier Hainque <hainque@adacore.com> | 2020-06-26 16:29:42 +0000 |
|---|---|---|
| committer | Olivier Hainque <hainque@adacore.com> | 2020-10-14 17:38:37 +0000 |
| commit | 69d6b3f650e73f272766a0c370b246a86c6a8d39 (patch) | |
| tree | e5caf03b216bcc672d0a27c7911b811effbcab84 | |
| parent | e4b887cb7652f5749cbd3a6ac8327cf308c70aba (diff) | |
| download | gcc-69d6b3f650e73f272766a0c370b246a86c6a8d39.zip gcc-69d6b3f650e73f272766a0c370b246a86c6a8d39.tar.gz gcc-69d6b3f650e73f272766a0c370b246a86c6a8d39.tar.bz2 | |
Honor $(MULTISUBDIR) in -I directives for libgcc on VxWorks
This is useful to handle ports where we might arrange to use
different sets of fixed headers for different multilibs, typically
for kernel vs rtp modes.
2020-10-14 Olivier Hainque <hainque@adacore.com>
libgcc/
* config/t-vxworks (LIBGCC2_INCLUDES): Append
$(MULTISUBDIR) to the -I path for fixed headers, as we
arrange to have different sets of such headers for different
multilibs when they are activated.
* config/t-vxworks7: Likewise.
| -rw-r--r-- | libgcc/config/t-vxworks | 2 | ||||
| -rw-r--r-- | libgcc/config/t-vxworks7 | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libgcc/config/t-vxworks b/libgcc/config/t-vxworks index e1f1e93..02e2efa 100644 --- a/libgcc/config/t-vxworks +++ b/libgcc/config/t-vxworks @@ -12,7 +12,7 @@ LIB2ADD += $(srcdir)/config/vxcache.c # 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-fixed \ + -I$(MULTIBUILDTOP)../../gcc/include-fixed$(MULTISUBDIR) \ -I$(MULTIBUILDTOP)../../gcc/include \ `case "/$(MULTIDIR)" in \ */mrtp*) echo -I$(WIND_USR)/h -I$(WIND_USR)/h/wrn/coreip ;; \ diff --git a/libgcc/config/t-vxworks7 b/libgcc/config/t-vxworks7 index 75f6cb4..20c72f4 100644 --- a/libgcc/config/t-vxworks7 +++ b/libgcc/config/t-vxworks7 @@ -12,7 +12,7 @@ LIB2ADD += $(srcdir)/config/vxcache.c # 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-fixed \ + -I$(MULTIBUILDTOP)../../gcc/include-fixed$(MULTISUBDIR) \ -I$(VSB_DIR)/h -I$(VSB_DIR)/share/h \ -I$(MULTIBUILDTOP)../../gcc/include \ `case "/$(MULTIDIR)" in \ |