Attachment #178713 for bug #215939




--- bfd/config.bfd.orig	2015-04-19 16:58:11.995320000 +0000
+++ bfd/config.bfd	2015-04-19 16:57:38.778655000 +0000
@@ -1335,6 +1335,11 @@ case "${targ}" in
     want64=true
     ;;
 #ifdef BFD64
+  s390x-*-freebsd*)
+    targ_defvec=s390_elf64_vec
+    targ_selvecs=s390_elf32_vec
+    want64=true
+    ;;
   s390x-*-linux*)
     targ_defvec=s390_elf64_vec
     targ_selvecs=s390_elf32_vec
--- ld/configure.tgt.orig	2015-04-19 16:54:10.096853000 +0000
+++ ld/configure.tgt	2015-04-19 17:01:58.977914000 +0000
@@ -611,6 +611,10 @@ rs6000-*-aix*)		targ_emul=aixrs6
 			;;
 rl78-*-*)		targ_emul=elf32rl78 ;;
 rx-*-*)			targ_emul=elf32rx ;;
+s390x-*-freebsd*)       targ_emul=elf64_s390
+			targ_extra_emuls=elf_s390
+			targ_extra_libpath=$targ_extra_emuls
+			tdir_elf_s390=`echo ${targ_alias} | sed -e 's/s390x/s390/'` ;;
 s390x-*-linux*)         targ_emul=elf64_s390
 			targ_extra_emuls=elf_s390
 			targ_extra_libpath=$targ_extra_emuls
--- gas/configure.tgt.orig	2015-04-19 17:56:56.516410000 +0000
+++ gas/configure.tgt	2015-04-19 17:56:18.056337000 +0000
@@ -384,6 +384,7 @@ case ${generic_target} in
   ppc-*-kaos*)				fmt=elf ;;
   ppc-*-lynxos*)			fmt=elf em=lynx ;;
 
+  s390-*-freebsd-*)			fmt=elf em=freebsd ;;
   s390-*-linux-*)			fmt=elf em=linux ;;
   s390-*-tpf*)				fmt=elf ;;
 
--- gas/configure.orig	2015-04-19 17:14:55.030456000 +0000
+++ gas/configure	2015-04-19 17:58:48.284708000 +0000
@@ -6722,6 +6722,7 @@ ia64-*-hpux*)
   ;;
 
 x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+s390*-*freebsd*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
@@ -6752,6 +6753,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
 	  powerpc64-*linux*)
 	    LD="${LD-ld} -m elf32ppclinux"
 	    ;;
+	  s390x-*freebsd*)
+	    LD="${LD-ld} -m elf_s390"
+	    ;;
 	  s390x-*linux*)
 	    LD="${LD-ld} -m elf_s390"
 	    ;;
@@ -6774,6 +6778,9 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
 	  powerpc-*linux*)
 	    LD="${LD-ld} -m elf64ppc"
 	    ;;
+	  s390*-*freebsd*)
+	    LD="${LD-ld} -m elf64_s390"
+	    ;;
 	  s390*-*linux*|s390*-*tpf*)
 	    LD="${LD-ld} -m elf64_s390"
 	    ;;

Line 0 Link Here

(-)devel/s390x-binutils/Makefile (+9 lines)
	1	# $FreeBSD$
	2
	3	COMMENT= GNU binutils for s390x cross-development
	4	PKGNAMEPREFIX= s390x-
	5	PLIST= ${.CURDIR}/pkg-plist
	6
	7	MASTERDIR= ${.CURDIR}/../binutils
	8
	9	.include "${MASTERDIR}/Makefile"




bin/s390x-freebsd-addr2line
bin/s390x-freebsd-ar
bin/s390x-freebsd-as
bin/s390x-freebsd-c++filt
bin/s390x-freebsd-elfedit
bin/s390x-freebsd-gprof
bin/s390x-freebsd-ld
bin/s390x-freebsd-ld.bfd
bin/s390x-freebsd-nm
bin/s390x-freebsd-objcopy
bin/s390x-freebsd-objdump
bin/s390x-freebsd-ranlib
bin/s390x-freebsd-readelf
bin/s390x-freebsd-size
bin/s390x-freebsd-strings
bin/s390x-freebsd-strip
man/man1/s390x-freebsd-addr2line.1.gz
man/man1/s390x-freebsd-ar.1.gz
man/man1/s390x-freebsd-as.1.gz
man/man1/s390x-freebsd-c++filt.1.gz
man/man1/s390x-freebsd-dlltool.1.gz
man/man1/s390x-freebsd-elfedit.1.gz
man/man1/s390x-freebsd-gprof.1.gz
man/man1/s390x-freebsd-ld.1.gz
man/man1/s390x-freebsd-nlmconv.1.gz
man/man1/s390x-freebsd-nm.1.gz
man/man1/s390x-freebsd-objcopy.1.gz
man/man1/s390x-freebsd-objdump.1.gz
man/man1/s390x-freebsd-ranlib.1.gz
man/man1/s390x-freebsd-readelf.1.gz
man/man1/s390x-freebsd-size.1.gz
man/man1/s390x-freebsd-strings.1.gz
man/man1/s390x-freebsd-strip.1.gz
man/man1/s390x-freebsd-windmc.1.gz
man/man1/s390x-freebsd-windres.1.gz
s390x-freebsd/bin/ar
s390x-freebsd/bin/as
s390x-freebsd/bin/ld
s390x-freebsd/bin/ld.bfd
s390x-freebsd/bin/nm
s390x-freebsd/bin/objcopy
s390x-freebsd/bin/objdump
s390x-freebsd/bin/ranlib
s390x-freebsd/bin/readelf
s390x-freebsd/bin/strip
s390x-freebsd/lib/ldscripts/elf64_s390.x
s390x-freebsd/lib/ldscripts/elf64_s390.xbn
s390x-freebsd/lib/ldscripts/elf64_s390.xc
s390x-freebsd/lib/ldscripts/elf64_s390.xd
s390x-freebsd/lib/ldscripts/elf64_s390.xdc
s390x-freebsd/lib/ldscripts/elf64_s390.xdw
s390x-freebsd/lib/ldscripts/elf64_s390.xn
s390x-freebsd/lib/ldscripts/elf64_s390.xr
s390x-freebsd/lib/ldscripts/elf64_s390.xs
s390x-freebsd/lib/ldscripts/elf64_s390.xsc
s390x-freebsd/lib/ldscripts/elf64_s390.xsw
s390x-freebsd/lib/ldscripts/elf64_s390.xu
s390x-freebsd/lib/ldscripts/elf64_s390.xw
s390x-freebsd/lib/ldscripts/elf_s390.x
s390x-freebsd/lib/ldscripts/elf_s390.xbn
s390x-freebsd/lib/ldscripts/elf_s390.xc
s390x-freebsd/lib/ldscripts/elf_s390.xd
s390x-freebsd/lib/ldscripts/elf_s390.xdc
s390x-freebsd/lib/ldscripts/elf_s390.xdw
s390x-freebsd/lib/ldscripts/elf_s390.xn
s390x-freebsd/lib/ldscripts/elf_s390.xr
s390x-freebsd/lib/ldscripts/elf_s390.xs
s390x-freebsd/lib/ldscripts/elf_s390.xsc
s390x-freebsd/lib/ldscripts/elf_s390.xsw
s390x-freebsd/lib/ldscripts/elf_s390.xu
s390x-freebsd/lib/ldscripts/elf_s390.xw

Return to bug 215939

Line 0 Link Here

(-)devel/binutils/files/patch-s390x.diff (+67 lines)
		1	--- bfd/config.bfd.orig 2015-04-19 16:58:11.995320000 +0000
		2	+++ bfd/config.bfd 2015-04-19 16:57:38.778655000 +0000
		3	@@ -1335,6 +1335,11 @@ case "${targ}" in
		4	want64=true
		5	;;
		6	#ifdef BFD64
		7	+ s390x--freebsd)
		8	+ targ_defvec=s390_elf64_vec
		9	+ targ_selvecs=s390_elf32_vec
		10	+ want64=true
		11	+ ;;
		12	s390x--linux)
		13	targ_defvec=s390_elf64_vec
		14	targ_selvecs=s390_elf32_vec
		15	--- ld/configure.tgt.orig 2015-04-19 16:54:10.096853000 +0000
		16	+++ ld/configure.tgt 2015-04-19 17:01:58.977914000 +0000
		17	@@ -611,6 +611,10 @@ rs6000--aix) targ_emul=aixrs6
		18	;;
		19	rl78--) targ_emul=elf32rl78 ;;
		20	rx--) targ_emul=elf32rx ;;
		21	+s390x--freebsd) targ_emul=elf64_s390
		22	+ targ_extra_emuls=elf_s390
		23	+ targ_extra_libpath=$targ_extra_emuls
		24	+ tdir_elf_s390=`echo ${targ_alias} \| sed -e 's/s390x/s390/'` ;;
		25	s390x--linux) targ_emul=elf64_s390
		26	targ_extra_emuls=elf_s390
		27	targ_extra_libpath=$targ_extra_emuls
		28	--- gas/configure.tgt.orig 2015-04-19 17:56:56.516410000 +0000
		29	+++ gas/configure.tgt 2015-04-19 17:56:18.056337000 +0000
		30	@@ -384,6 +384,7 @@ case ${generic_target} in
		31	ppc--kaos) fmt=elf ;;
		32	ppc--lynxos) fmt=elf em=lynx ;;
		33
		34	+ s390--freebsd-) fmt=elf em=freebsd ;;
		35	s390--linux-) fmt=elf em=linux ;;
		36	s390--tpf) fmt=elf ;;
		37
		38	--- gas/configure.orig 2015-04-19 17:14:55.030456000 +0000
		39	+++ gas/configure 2015-04-19 17:58:48.284708000 +0000
		40	@@ -6722,6 +6722,7 @@ ia64--hpux)
		41	;;
		42
		43	x86_64-kfreebsd-gnu\|x86_64-linux\|powerpc-linux*\| \
		44	+s390-freebsd*\| \
		45	s390-linux\|s390-tpf\|sparc-linux*)
		46	# Find out which ABI we are using.
		47	echo 'int i;' > conftest.$ac_ext
		48	@@ -6752,6 +6753,9 @@ s390-linux\|s390-tpf\|sparc-linux*
		49	powerpc64-linux)
		50	LD="${LD-ld} -m elf32ppclinux"
		51	;;
		52	+ s390x-freebsd)
		53	+ LD="${LD-ld} -m elf_s390"
		54	+ ;;
		55	s390x-linux)
		56	LD="${LD-ld} -m elf_s390"
		57	;;
		58	@@ -6774,6 +6778,9 @@ s390-linux\|s390-tpf\|sparc-linux*
		59	powerpc-linux)
		60	LD="${LD-ld} -m elf64ppc"
		61	;;
		62	+ s390-freebsd*)
		63	+ LD="${LD-ld} -m elf64_s390"
		64	+ ;;
65	s390-linux\|s390-tpf)
66	LD="${LD-ld} -m elf64_s390"
67	;;

Line 0 Link Here

(-)devel/s390x-binutils/pkg-plist (+71 lines)
		1	bin/s390x-freebsd-addr2line
		2	bin/s390x-freebsd-ar
		3	bin/s390x-freebsd-as
		4	bin/s390x-freebsd-c++filt
		5	bin/s390x-freebsd-elfedit
		6	bin/s390x-freebsd-gprof
		7	bin/s390x-freebsd-ld
		8	bin/s390x-freebsd-ld.bfd
		9	bin/s390x-freebsd-nm
		10	bin/s390x-freebsd-objcopy
		11	bin/s390x-freebsd-objdump
		12	bin/s390x-freebsd-ranlib
		13	bin/s390x-freebsd-readelf
		14	bin/s390x-freebsd-size
		15	bin/s390x-freebsd-strings
		16	bin/s390x-freebsd-strip
		17	man/man1/s390x-freebsd-addr2line.1.gz
		18	man/man1/s390x-freebsd-ar.1.gz
		19	man/man1/s390x-freebsd-as.1.gz
		20	man/man1/s390x-freebsd-c++filt.1.gz
		21	man/man1/s390x-freebsd-dlltool.1.gz
		22	man/man1/s390x-freebsd-elfedit.1.gz
		23	man/man1/s390x-freebsd-gprof.1.gz
		24	man/man1/s390x-freebsd-ld.1.gz
		25	man/man1/s390x-freebsd-nlmconv.1.gz
		26	man/man1/s390x-freebsd-nm.1.gz
		27	man/man1/s390x-freebsd-objcopy.1.gz
		28	man/man1/s390x-freebsd-objdump.1.gz
		29	man/man1/s390x-freebsd-ranlib.1.gz
		30	man/man1/s390x-freebsd-readelf.1.gz
		31	man/man1/s390x-freebsd-size.1.gz
		32	man/man1/s390x-freebsd-strings.1.gz
		33	man/man1/s390x-freebsd-strip.1.gz
		34	man/man1/s390x-freebsd-windmc.1.gz
		35	man/man1/s390x-freebsd-windres.1.gz
		36	s390x-freebsd/bin/ar
		37	s390x-freebsd/bin/as
		38	s390x-freebsd/bin/ld
		39	s390x-freebsd/bin/ld.bfd
		40	s390x-freebsd/bin/nm
		41	s390x-freebsd/bin/objcopy
		42	s390x-freebsd/bin/objdump
		43	s390x-freebsd/bin/ranlib
		44	s390x-freebsd/bin/readelf
		45	s390x-freebsd/bin/strip
		46	s390x-freebsd/lib/ldscripts/elf64_s390.x
		47	s390x-freebsd/lib/ldscripts/elf64_s390.xbn
		48	s390x-freebsd/lib/ldscripts/elf64_s390.xc
		49	s390x-freebsd/lib/ldscripts/elf64_s390.xd
		50	s390x-freebsd/lib/ldscripts/elf64_s390.xdc
		51	s390x-freebsd/lib/ldscripts/elf64_s390.xdw
		52	s390x-freebsd/lib/ldscripts/elf64_s390.xn
		53	s390x-freebsd/lib/ldscripts/elf64_s390.xr
		54	s390x-freebsd/lib/ldscripts/elf64_s390.xs
		55	s390x-freebsd/lib/ldscripts/elf64_s390.xsc
		56	s390x-freebsd/lib/ldscripts/elf64_s390.xsw
		57	s390x-freebsd/lib/ldscripts/elf64_s390.xu
		58	s390x-freebsd/lib/ldscripts/elf64_s390.xw
		59	s390x-freebsd/lib/ldscripts/elf_s390.x
		60	s390x-freebsd/lib/ldscripts/elf_s390.xbn
		61	s390x-freebsd/lib/ldscripts/elf_s390.xc
		62	s390x-freebsd/lib/ldscripts/elf_s390.xd
		63	s390x-freebsd/lib/ldscripts/elf_s390.xdc
		64	s390x-freebsd/lib/ldscripts/elf_s390.xdw
65	s390x-freebsd/lib/ldscripts/elf_s390.xn
66	s390x-freebsd/lib/ldscripts/elf_s390.xr
67	s390x-freebsd/lib/ldscripts/elf_s390.xs
68	s390x-freebsd/lib/ldscripts/elf_s390.xsc
69	s390x-freebsd/lib/ldscripts/elf_s390.xsw
70	s390x-freebsd/lib/ldscripts/elf_s390.xu
71	s390x-freebsd/lib/ldscripts/elf_s390.xw