add AMD64 support.

--
From: art@
This commit is contained in:
brad 2003-06-15 04:43:31 +00:00
parent 847eaf2174
commit b17d8bf344
4 changed files with 46 additions and 24 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.18 2003/06/13 04:17:12 brad Exp $
# $OpenBSD: Makefile,v 1.19 2003/06/15 04:43:31 brad Exp $
COMMENT= "GNU development tools"
@ -29,7 +29,7 @@ CONFIGURE_ARGS= --with-prefix=${PREFIX} \
# cross-tools
FLAVORS= alpha hppa i386 m68k m88k mips powerpc sparc \
sparc64 vax
sparc64 vax x86_64
FLAVOR?=
# XXX: special handling needed for powerpc arch's and bootstraping
@ -37,6 +37,9 @@ FLAVOR?=
CONFIGURE_ARGS+= --target=${FLAVOR:L}-unknown-openbsd${OSREV}
TARGET_ARCH= ${FLAVOR:L}
PLIST= ${PKGDIR}/PLIST.cross
.if ${FLAVOR} == "x86_64" || ${FLAVOR} == "sparc64" || ${FLAVOR} == "alpha"
CONFIGURE_ARGS+= --enable-64-bit-bfd
.endif
.else
TARGET_ARCH= ${MACHINE_ARCH}
.endif

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-bfd_config_bfd,v 1.9 2003/06/13 04:17:12 brad Exp $
--- bfd/config.bfd.orig Thu Nov 7 11:57:50 2002
+++ bfd/config.bfd Thu Jun 12 12:11:41 2003
$OpenBSD: patch-bfd_config_bfd,v 1.10 2003/06/15 04:43:31 brad Exp $
--- bfd/config.bfd.orig Thu Nov 7 17:57:50 2002
+++ bfd/config.bfd Sat Jun 14 22:59:56 2003
@@ -413,11 +413,15 @@ case "${targ}" in
targ_defvec=i386pe_vec
targ_selvecs="i386pe_vec i386pei_vec bfd_elf32_i386_vec"
@ -18,7 +18,18 @@ $OpenBSD: patch-bfd_config_bfd,v 1.9 2003/06/13 04:17:12 brad Exp $
i[3456]86-*-netware*)
targ_defvec=bfd_elf32_i386_vec
targ_selvecs="nlm32_i386_vec i386coff_vec i386aout_vec"
@@ -673,11 +677,11 @@ case "${targ}" in
@@ -440,6 +444,10 @@ case "${targ}" in
targ_defvec=bfd_elf64_x86_64_vec
targ_selvecs="bfd_elf32_i386_vec i386netbsd_vec i386coff_vec bfd_efi_app_ia32_vec"
;;
+ x86_64-*-openbsd*)
+ targ_defvec=bfd_elf64_x86_64_vec
+ targ_selvecs="bfd_elf32_i386_vec i386coff_vec bfd_efi_app_ia32_vec"
+ ;;
x86_64-*-linux-gnu*)
targ_defvec=bfd_elf64_x86_64_vec
targ_selvecs="bfd_elf32_i386_vec i386linux_vec bfd_efi_app_ia32_vec"
@@ -673,11 +681,11 @@ case "${targ}" in
targ_defvec=ecoff_big_vec
targ_selvecs=ecoff_little_vec
;;
@ -32,7 +43,7 @@ $OpenBSD: patch-bfd_config_bfd,v 1.9 2003/06/13 04:17:12 brad Exp $
targ_defvec=bfd_elf32_bigmips_vec
targ_selvecs="bfd_elf32_littlemips_vec ecoff_big_vec ecoff_little_vec"
;;
@@ -788,7 +792,7 @@ case "${targ}" in
@@ -788,7 +796,7 @@ case "${targ}" in
targ_defvec=pc532machaout_vec
targ_underscore=yes
;;
@ -41,7 +52,7 @@ $OpenBSD: patch-bfd_config_bfd,v 1.9 2003/06/13 04:17:12 brad Exp $
targ_defvec=pc532netbsd_vec
targ_underscore=yes
;;
@@ -1041,10 +1045,14 @@ case "${targ}" in
@@ -1041,10 +1049,14 @@ case "${targ}" in
targ_selvecs=bfd_elf32_sparc_vec
targ_underscore=yes
;;
@ -57,7 +68,7 @@ $OpenBSD: patch-bfd_config_bfd,v 1.9 2003/06/13 04:17:12 brad Exp $
sparc-*-elf* | sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
targ_defvec=bfd_elf32_sparc_vec
targ_selvecs=sunos_big_vec
@@ -1129,6 +1137,11 @@ case "${targ}" in
@@ -1129,6 +1141,11 @@ case "${targ}" in
vax-*-bsd* | vax-*-ultrix*)
targ_defvec=vaxbsd_vec

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-gas_configure_in,v 1.9 2003/06/13 04:17:12 brad Exp $
--- gas/configure.in.orig Wed Oct 30 12:07:32 2002
+++ gas/configure.in Thu Jun 12 12:08:53 2003
$OpenBSD: patch-gas_configure_in,v 1.10 2003/06/15 04:43:31 brad Exp $
--- gas/configure.in.orig Wed Oct 30 18:07:32 2002
+++ gas/configure.in Sat Jun 14 23:03:37 2003
@@ -193,7 +193,8 @@ changequote([,])dnl
arm*-*-linux-gnu* | arm*-*-uclinux*)
fmt=elf em=linux ;;
@ -20,25 +20,28 @@ $OpenBSD: patch-gas_configure_in,v 1.9 2003/06/13 04:17:12 brad Exp $
hppa-*-osf*) fmt=som em=hppa ;;
hppa-*-rtems*) fmt=elf em=hppa ;;
hppa-*-hpux11*) case ${cpu} in
@@ -260,7 +261,16 @@ changequote([,])dnl
@@ -260,7 +261,19 @@ changequote([,])dnl
;;
esac
;;
- i386-*-openbsd*) fmt=aout em=nbsd bfd_gas=yes;;
+changequote(,)dnl
+ i386-*-openbsd*) em=obsd bfd_gas=yes
+ case ${os} in
+ case ${cpu} in
+ x86_64) fmt=elf ;;
+ *) case ${os} in
+ openbsd[0-2].* | openbsd3.[0-2])
+ fmt=aout ;;
+ *)
+ fmt=elf ;;
+ esac
+ esac
+ ;;
+changequote([,])dnl
i386-*-linux*aout* | i386-*-linux*oldld) fmt=aout em=linux ;;
i386-*-linux*coff*) fmt=coff em=linux ;;
i386-*-linux-gnu*) fmt=elf em=linux bfd_gas=yes ;;
@@ -344,7 +354,7 @@ changequote([,])dnl
@@ -344,7 +357,7 @@ changequote([,])dnl
m68k-*-netbsdelf*) fmt=elf em=nbsd bfd_gas=yes ;;
m68k-*-netbsdaout* | m68k-*-netbsd*)
fmt=aout em=nbsd bfd_gas=yes ;;
@ -47,7 +50,7 @@ $OpenBSD: patch-gas_configure_in,v 1.9 2003/06/13 04:17:12 brad Exp $
m68k-apple-aux*) fmt=coff em=aux ;;
m68k-*-psos*) fmt=elf em=psos;;
@@ -355,7 +365,6 @@ changequote([,])dnl
@@ -355,7 +368,6 @@ changequote([,])dnl
mcore-*-pe) fmt=coff em=pe bfd_gas=yes ;;
# don't change em like *-*-bsd does
@ -55,7 +58,7 @@ $OpenBSD: patch-gas_configure_in,v 1.9 2003/06/13 04:17:12 brad Exp $
mips-dec-bsd*) fmt=aout endian=little ;;
mips-sony-bsd*) fmt=ecoff ;;
mips-*-bsd*) AC_MSG_ERROR(Unknown vendor for mips-bsd configuration.) ;;
@@ -434,7 +443,6 @@ changequote([,])dnl
@@ -434,7 +446,6 @@ changequote([,])dnl
sh64-*-elf*) fmt=elf ;;
ns32k-pc532-mach* | ns32k-pc532-ux*) fmt=aout em=pc532mach ;;
ns32k-*-netbsd* | ns32k-pc532-lites*) fmt=aout em=nbsd532 ;;
@ -63,7 +66,7 @@ $OpenBSD: patch-gas_configure_in,v 1.9 2003/06/13 04:17:12 brad Exp $
sparc-*-rtemsaout*) fmt=aout ;;
sparc-*-rtemself*) fmt=elf ;;
@@ -458,12 +466,17 @@ changequote([,])dnl
@@ -458,12 +469,17 @@ changequote([,])dnl
sparc64) fmt=elf ;;
esac
;;

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ld_configure_tgt,v 1.6 2003/06/08 03:04:50 brad Exp $
--- ld/configure.tgt.orig Mon Oct 28 10:58:12 2002
+++ ld/configure.tgt Thu Jun 5 22:48:19 2003
$OpenBSD: patch-ld_configure_tgt,v 1.7 2003/06/15 04:43:31 brad Exp $
--- ld/configure.tgt.orig Mon Oct 28 16:58:12 2002
+++ ld/configure.tgt Tue Jun 10 04:30:01 2003
@@ -70,12 +70,15 @@ sparc*-*-linux-gnu*) targ_emul=elf32_spa
tdir_sun4=sparc-sun-sunos4
;;
@ -19,17 +19,22 @@ $OpenBSD: patch-ld_configure_tgt,v 1.6 2003/06/08 03:04:50 brad Exp $
sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
targ_emul=elf32_sparc ;;
sparc-*-solaris2*) targ_emul=elf32_sparc
@@ -169,6 +172,9 @@ i[3456]86-*-netbsdpe*) targ_emul=i386pe
@@ -169,6 +172,14 @@ i[3456]86-*-netbsdpe*) targ_emul=i386pe
i[3456]86-*-netbsd*) targ_emul=i386nbsd
targ_extra_emuls=elf_i386
;;
+i[3456]86-*-openbsd[0-2].* | i[3456]86-*-openbsd3.[0-2])
+ targ_emul=i386obsd ;;
+i[3456]86-*-openbsd*) targ_emul=elf_i386 ;;
+x86_64-*-openbsd*) targ_emul=elf_x86_64
+ targ_extra_emuls="elf_x86_64 elf_i386"
+ tdir_elf_i386=`echo ${targ_alias} \
+ | sed -e 's/x86_64/i386/'`
+ ;;
x86_64-*-netbsd*) targ_emul=elf_x86_64
targ_extra_emuls="elf_i386 i386nbsd"
tdir_elf_i386=`echo ${targ_alias} | \
@@ -340,6 +346,7 @@ m68*-*-netbsdelf*) targ_emul=m68kelfnbsd
@@ -340,6 +351,7 @@ m68*-*-netbsdelf*) targ_emul=m68kelfnbsd
m68*-*-netbsdaout* | m68*-*-netbsd*)
targ_emul=m68knbsd
targ_extra_emuls="m68kelfnbsd m68k4knbsd" ;;
@ -37,7 +42,7 @@ $OpenBSD: patch-ld_configure_tgt,v 1.6 2003/06/08 03:04:50 brad Exp $
m68*-*-psos*) targ_emul=m68kpsos ;;
m68*-*-rtemscoff*) targ_emul=m68kcoff ;;
m68*-*-rtems*) targ_emul=m68kelf ;;
@@ -375,6 +382,8 @@ mips*el-*-netbsd*) targ_emul=elf32lmip
@@ -375,6 +387,8 @@ mips*el-*-netbsd*) targ_emul=elf32lmip
mips*-*-netbsd*) targ_emul=elf32bmip
targ_extra_emuls="elf32lmip"
;;