- gprof is not built with cross-binutils so add another PLIST without it

- fix syntax of gas configure.in stuff for sparc
- add missing change for the sparc ELF transition to bfd
--
Hasn't actually been tested on a real sparc system but it at least allows
me to build a cross-binutils without bombing durring build or the PLIST issue
This commit is contained in:
brad 2003-06-05 18:28:24 +00:00
parent 3a81e742e2
commit a6c9968875
5 changed files with 61 additions and 13 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.13 2003/06/05 04:03:55 brad Exp $
# $OpenBSD: Makefile,v 1.14 2003/06/05 18:28:24 brad Exp $
COMMENT= "GNU development tools"
@ -36,6 +36,7 @@ FLAVOR?=
.if !empty(FLAVOR:L) && ${FLAVOR:L} != ${MACHINE_ARCH}
CONFIGURE_ARGS+= --target=${FLAVOR:L}-unknown-openbsd${OSREV}
TARGET_ARCH= ${FLAVOR:L}
PLIST= ${PKGDIR}/PLIST.cross
.else
TARGET_ARCH= ${MACHINE_ARCH}
.endif
@ -59,12 +60,15 @@ post-patch:
do-install:
${INSTALL_DATA_DIR} ${TARGET_DIR}/bin
${INSTALL_DATA_DIR} ${TARGET_DIR}/man/man1
.if exists (${WRKSRC}/gprof/gprof)
cd ${WRKSRC} && \
${INSTALL_PROGRAM} gprof/gprof ${TARGET_DIR}/bin && \
${INSTALL_MAN} gprof/gprof.1 ${TARGET_DIR}/man/man1
.endif
cd ${WRKSRC} && { \
${INSTALL_PROGRAM} gas/as-new ${TARGET_DIR}/bin/as; \
${INSTALL_PROGRAM} gprof/gprof ${TARGET_DIR}/bin; \
${INSTALL_PROGRAM} ld/ld-new ${TARGET_DIR}/bin/ld; \
${INSTALL_MAN} gas/doc/as.1 ${TARGET_DIR}/man/man1; \
${INSTALL_MAN} gprof/gprof.1 ${TARGET_DIR}/man/man1; \
${INSTALL_MAN} ld/ld.1 ${TARGET_DIR}/man/man1; \
for s in ${FILES}; do \
d=`echo $${s} | sed s/-new//`; \

View File

@ -1,5 +1,5 @@
--- bfd/config.bfd.orig Thu Nov 7 11:57:50 2002
+++ bfd/config.bfd Thu Apr 24 15:39:06 2003
+++ bfd/config.bfd Thu Jun 5 14:00:37 2003
@@ -405,7 +405,7 @@ case "${targ}" in
targ_cflags=-DOLD_FREEBSD_ABI_LABEL ;;
esac
@ -32,7 +32,23 @@
targ_defvec=bfd_elf32_bigmips_vec
targ_selvecs="bfd_elf32_littlemips_vec ecoff_big_vec ecoff_little_vec"
;;
@@ -1129,6 +1129,11 @@ case "${targ}" in
@@ -1041,10 +1041,14 @@ case "${targ}" in
targ_selvecs=bfd_elf32_sparc_vec
targ_underscore=yes
;;
- sparc-*-openbsd*)
+ sparc*-*-openbsd[01].* | sparc*-*-openbsd2.[0-9] | sparc*-*-openbsd3.[0-1])
targ_defvec=sparcnetbsd_vec
targ_underscore=yes
;;
+ sparc-*-openbsd*)
+ targ_defvec=bfd_elf32_sparc_vec
+ targ_selvecs=sparcnetbsd_vec
+ ;;
sparc-*-elf* | sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*)
targ_defvec=bfd_elf32_sparc_vec
targ_selvecs=sunos_big_vec
@@ -1129,6 +1133,11 @@ case "${targ}" in
vax-*-bsd* | vax-*-ultrix*)
targ_defvec=vaxbsd_vec

View File

@ -1,5 +1,5 @@
--- gas/configure.in.orig Wed Oct 30 12:07:32 2002
+++ gas/configure.in Tue Jun 3 20:59:35 2003
+++ gas/configure.in Thu Jun 5 12:36:15 2003
@@ -260,7 +260,7 @@ changequote([,])dnl
;;
esac
@ -9,16 +9,19 @@
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 ;;
@@ -460,7 +460,11 @@ changequote([,])dnl
@@ -460,7 +460,14 @@ changequote([,])dnl
;;
sparc-*-openbsd*) em=nbsd
case ${cpu} in
- sparc) fmt=aout ;;
+ sparc) case ${os} in
+ openbsd[01].* | openbsd2.[0-9] | openbsd3.[0-1]))
+ fmt=aout ;;
+ *)
+ fmt=elf ;;
+ sparc)
+ case ${os} in
+ openbsd[[01]].* | openbsd2.[[0-9]] | openbsd3.[[0-1]])
+ fmt=aout ;;
+ *)
+ fmt=elf ;;
+ esac
+ ;;
sparc64) fmt=elf ;;
esac
;;

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2002/02/20 05:27:18 fgsch Exp $
@comment $OpenBSD: PLIST,v 1.3 2003/06/05 18:28:24 brad Exp $
@option no-default-conflict
${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/ar
${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/as
${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/gprof

View File

@ -0,0 +1,24 @@
@comment $OpenBSD: PLIST.cross,v 1.1 2003/06/05 18:28:24 brad Exp $
@option no-default-conflict
${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/ar
${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/as
${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/ld
${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/nm
${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/objdump
${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/ranlib
${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/size
${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/strings
${TARGET_ARCH}-unknown-openbsd${OSREV}/bin/strip
${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/ar.1
${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/as.1
${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/ld.1
${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/nm.1
${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/objdump.1
${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/ranlib.1
${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/size.1
${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/strings.1
${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1/strip.1
@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/man/man1
@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/man
@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}/bin
@dirrm ${TARGET_ARCH}-unknown-openbsd${OSREV}