initial import from Debian
version: 14.3.0-5 commit: bee30ab0fff2fd6af94c62376c8aa4221bb831e0
This commit is contained in:
23
debian/patches/hurd-multilib-multiarch.diff
vendored
Normal file
23
debian/patches/hurd-multilib-multiarch.diff
vendored
Normal file
@@ -0,0 +1,23 @@
|
||||
--- a/src/gcc/config/i386/t-gnu64
|
||||
+++ b/src/gcc/config/i386/t-gnu64
|
||||
@@ -33,9 +33,19 @@
|
||||
comma=,
|
||||
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
|
||||
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
|
||||
+ifneq (,$(findstring gnux32,$(target)))
|
||||
MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-gnu)
|
||||
-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-gnu)
|
||||
+MULTILIB_OSDIRNAMES+= m32=../lib32$(call if_multiarch,:i386-gnu)
|
||||
+MULTILIB_OSDIRNAMES+= mx32=../lib$(call if_multiarch,:x86_64-gnux32)
|
||||
+else ifneq (,$(findstring x86_64,$(target)))
|
||||
+MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-gnu)
|
||||
+MULTILIB_OSDIRNAMES+= m32=../lib32$(call if_multiarch,:i386-gnu)
|
||||
MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-gnux32)
|
||||
+else
|
||||
+MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-gnu)
|
||||
+MULTILIB_OSDIRNAMES+= m32=../lib$(call if_multiarch,:i386-gnu)
|
||||
+MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-gnux32)
|
||||
+endif
|
||||
|
||||
ifneq (,$(findstring x86_64,$(target)))
|
||||
ifneq (,$(findstring biarchx32.h,$(tm_include_list)))
|
Reference in New Issue
Block a user