From: Olivier Hainque Date: Fri, 26 Jun 2020 16:29:42 +0000 (+0000) Subject: Honor $(MULTISUBDIR) in -I directives for libgcc on VxWorks X-Git-Tag: basepoints/gcc-12~4371 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69d6b3f650e73f272766a0c370b246a86c6a8d39;p=thirdparty%2Fgcc.git 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 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. --- diff --git a/libgcc/config/t-vxworks b/libgcc/config/t-vxworks index e1f1e937687e..02e2efa0eb7d 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 75f6cb4a29f6..20c72f490dd3 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 \