1 files changed, 62 insertions, 0 deletions
diff --git a/meta/packages/gcc/gcc-4.3.1/debian/gcc-multilib64dir.dpatch b/meta/packages/gcc/gcc-4.3.1/debian/gcc-multilib64dir.dpatch
new file mode 100644
index 0000000000..fe8f5a1a41
--- /dev/null
+++ b/meta/packages/gcc/gcc-4.3.1/debian/gcc-multilib64dir.dpatch
@@ -0,0 +1,62 @@
+#! /bin/sh -e
+# DP: Use lib instead of lib64 as multilibdir on amd64 and ppc64.
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+    pdir="-d $3"
+    dir="$3/"
+elif [ $# -ne 1 ]; then
+    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+    exit 1
+fi
+case "$1" in
+    -patch)
+        patch $pdir -f --no-backup-if-mismatch -p0 < $0
+        ;;
+    -unpatch)
+        patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+        ;;
+    *)
+        echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+        exit 1
+esac
+exit 0
+Index: gcc/config/i386/t-linux64
+===================================================================
+--- gcc/config/i386/t-linux64   (revision 130706)
+++ gcc/config/i386/t-linux64   (working copy)
+@@ -13,7 +13,7 @@
+ 
+ MULTILIB_OPTIONS = m64/m32
+ MULTILIB_DIRNAMES = 64 32 
+-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+ 
+ LIBGCC = stmp-multilib
+ INSTALL_LIBGCC = install-multilib
+Index: gcc/config/rs6000/t-linux64
+===================================================================
+--- gcc/config/rs6000/t-linux64 (revision 130706)
+++ gcc/config/rs6000/t-linux64 (working copy)
+@@ -14,13 +14,13 @@
+ # it doesn't tell anything about the 32bit libraries on those systems.  Set
+ # MULTILIB_OSDIRNAMES according to what is found on the target.
+ 
+-MULTILIB_OPTIONS        = m64/m32 msoft-float
+-MULTILIB_DIRNAMES       = 64 32 nof
+MULTILIB_OPTIONS        = m64/m32
+MULTILIB_DIRNAMES       = 64 32
+ MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
+-MULTILIB_EXCEPTIONS     = m64/msoft-float
+-MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
+-MULTILIB_OSDIRNAMES    = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
+-MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
+MULTILIB_EXCEPTIONS     =
+MULTILIB_EXCLUSIONS     =
+MULTILIB_OSDIRNAMES    = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+MULTILIB_MATCHES        =
+ 
+ softfp_wrap_start := '\#ifndef __powerpc64__'
+ softfp_wrap_end := '\#endif'

diff --git a/meta/packages/gcc/gcc-4.3.1/debian/gcc-multilib64dir.dpatch b/meta/packages/gcc/gcc-4.3.1/debian/gcc-multilib64dir.dpatch new file mode 100644 index 0000000000..fe8f5a1a41 --- /dev/null +++ b/meta/packages/gcc/gcc-4.3.1/debian/gcc-multilib64dir.dpatch
@@ -0,0 +1,62 @@
	1	#! /bin/sh -e
	2
	3	# DP: Use lib instead of lib64 as multilibdir on amd64 and ppc64.
	4
	5	dir=
	6	if [ $# -eq 3 -a "$2" = '-d' ]; then
	7	pdir="-d $3"
	8	dir="$3/"
	9	elif [ $# -ne 1 ]; then
	10	echo >&2 "`basename $0`: script expects -patch\|-unpatch as argument"
	11	exit 1
	12	fi
	13	case "$1" in
	14	-patch)
	15	patch $pdir -f --no-backup-if-mismatch -p0 < $0
	16	;;
	17	-unpatch)
	18	patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
	19	;;
	20	*)
	21	echo >&2 "`basename $0`: script expects -patch\|-unpatch as argument"
	22	exit 1
	23	esac
	24	exit 0
	25
	26	Index: gcc/config/i386/t-linux64
	27	===================================================================
	28	--- gcc/config/i386/t-linux64 (revision 130706)
	29	+++ gcc/config/i386/t-linux64 (working copy)
	30	@@ -13,7 +13,7 @@
	31
	32	MULTILIB_OPTIONS = m64/m32
	33	MULTILIB_DIRNAMES = 64 32
	34	-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
	35	+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
	36
	37	LIBGCC = stmp-multilib
	38	INSTALL_LIBGCC = install-multilib
	39	Index: gcc/config/rs6000/t-linux64
	40	===================================================================
	41	--- gcc/config/rs6000/t-linux64 (revision 130706)
	42	+++ gcc/config/rs6000/t-linux64 (working copy)
	43	@@ -14,13 +14,13 @@
	44	# it doesn't tell anything about the 32bit libraries on those systems. Set
	45	# MULTILIB_OSDIRNAMES according to what is found on the target.
	46
	47	-MULTILIB_OPTIONS = m64/m32 msoft-float
	48	-MULTILIB_DIRNAMES = 64 32 nof
	49	+MULTILIB_OPTIONS = m64/m32
	50	+MULTILIB_DIRNAMES = 64 32
	51	MULTILIB_EXTRA_OPTS = fPIC mstrict-align
	52	-MULTILIB_EXCEPTIONS = m64/msoft-float
	53	-MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
	54	-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
	55	-MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
	56	+MULTILIB_EXCEPTIONS =
	57	+MULTILIB_EXCLUSIONS =
	58	+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
	59	+MULTILIB_MATCHES =
	60
	61	softfp_wrap_start := '\#ifndef __powerpc64__'
	62	softfp_wrap_end := '\#endif'