diff --git a/devel/binutils/stable/Makefile b/devel/binutils/stable/Makefile index 8ef59073cb3..16f31d2c5f6 100644 --- a/devel/binutils/stable/Makefile +++ b/devel/binutils/stable/Makefile @@ -1,11 +1,12 @@ -# $OpenBSD: Makefile,v 1.24 2003/07/28 05:12:00 brad Exp $ +# $OpenBSD: Makefile,v 1.25 2003/10/11 00:52:21 brad Exp $ COMMENT= "GNU development tools" -V= 2.13.2.1 +V= 2.14 DISTNAME= binutils-$V CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=binutils/} +EXTRACT_SUFX= .tar.bz2 # GPL PERMIT_PACKAGE_CDROM= Yes @@ -39,7 +40,6 @@ SEPARATE_BUILD= flavored .if !empty(FLAVOR:L) && ${FLAVOR:L} != ${MACHINE_ARCH} CONFIGURE_ARGS+= --target=${FLAVOR:L}-unknown-openbsd${OSREV} TARGET_ARCH= ${FLAVOR:L} -PLIST= ${PKGDIR}/PLIST.cross FULLPKGNAME= binutils-${TARGET_ARCH}-$V .if ${FLAVOR} == "x86_64" || ${FLAVOR} == "sparc64" || ${FLAVOR} == "alpha" CONFIGURE_ARGS+= --enable-64-bit-bfd @@ -53,7 +53,20 @@ TARGET_DIR= $${PREFIX}/${TARGET_ARCH}-unknown-openbsd${OSREV} REGRESS_TARGET= check REGRESS_DEPENDS= ::devel/dejagnu -FILES= ar nm-new objdump ranlib size strings strip-new +PLIST_ARCH?= +.if !empty(FLAVOR:L) +. if ${FLAVOR:L} == "armeb" + PLIST_ARCH= arm +. else + PLIST_ARCH= ${FLAVOR:L} +. endif +.else + PLIST_ARCH= ${MACHINE_ARCH} +.endif + +SED_PLIST+= |sed -e '/^%%arch%%$$/r${PKGDIR}/PFRAG.${PLIST_ARCH}' -e '//d' + +FILES= addr2line ar nm-new objdump ranlib readelf size strings strip-new EMULPARAMS= i386obsd.sh sparcobsd.sh m68kobsd.sh \ elf32_sparc_obsd.sh elf32ppc_obsd.sh \ @@ -75,16 +88,15 @@ post-patch: do-install: ${INSTALL_DATA_DIR} ${TARGET_DIR}/bin ${INSTALL_DATA_DIR} ${TARGET_DIR}/man/man1 - if [ -f ${WRKBUILD}/gprof/gprof ]; then \ - cd ${WRKBUILD}; \ - ${INSTALL_PROGRAM} gprof/gprof ${TARGET_DIR}/bin; \ - ${INSTALL_MAN} gprof/gprof.1 ${TARGET_DIR}/man/man1; \ - fi + ${INSTALL_DATA_DIR} ${TARGET_DIR}/lib/ldscripts cd ${WRKBUILD} && { \ + ${INSTALL_PROGRAM} binutils/addr2line ${TARGET_DIR}/bin; \ + ${INSTALL_PROGRAM} binutils/readelf ${TARGET_DIR}/bin; \ ${INSTALL_PROGRAM} gas/as-new ${TARGET_DIR}/bin/as; \ ${INSTALL_PROGRAM} ld/ld-new ${TARGET_DIR}/bin/ld; \ ${INSTALL_MAN} gas/doc/as.1 ${TARGET_DIR}/man/man1; \ ${INSTALL_MAN} ld/ld.1 ${TARGET_DIR}/man/man1; \ + ${INSTALL_DATA} ld/ldscripts/* ${TARGET_DIR}/lib/ldscripts; \ for s in ${FILES}; do \ d=`echo $${s} | sed s/-new//`; \ ${INSTALL_PROGRAM} binutils/$${s} ${TARGET_DIR}/bin/$${d}; \ diff --git a/devel/binutils/stable/distinfo b/devel/binutils/stable/distinfo index ed4afb42866..b5f74e082a5 100644 --- a/devel/binutils/stable/distinfo +++ b/devel/binutils/stable/distinfo @@ -1,3 +1,3 @@ -MD5 (binutils-2.13.2.1.tar.gz) = 0bcbe178291e3b3254f3835a2171a710 -RMD160 (binutils-2.13.2.1.tar.gz) = 7100913d4c9a98d76eced1d84bd771a3374ea9e2 -SHA1 (binutils-2.13.2.1.tar.gz) = d13624807c6b47fec870096a65d47cce4cf82370 +MD5 (binutils-2.14.tar.bz2) = 2da8def15d28af3ec6af0982709ae90a +RMD160 (binutils-2.14.tar.bz2) = e629a1256b5f75552e3360a315d28ad37f11a604 +SHA1 (binutils-2.14.tar.bz2) = 66b4f057bf687126d7cc11d0a68ed89182541ae7 diff --git a/devel/binutils/stable/files/elf_obsd.sh b/devel/binutils/stable/files/elf_obsd.sh index 5d3d810f2e7..84b76462a78 100644 --- a/devel/binutils/stable/files/elf_obsd.sh +++ b/devel/binutils/stable/files/elf_obsd.sh @@ -1,13 +1,7 @@ LIB_PATH=/usr/lib -case "${target}" in -*-*-openbsd[0-2].* | *-*-openbsd3.[0-2]) - ;; -*) - PAD_RO= - RODATA_PADSIZE=${MAXPAGESIZE} - RODATA_ALIGN=". = ALIGN(${RODATA_PADSIZE}) + (. & (${RODATA_PADSIZE} - 1))" - PAD_GOT= - PAD_PLT= - ;; -esac +PAD_RO= +RODATA_PADSIZE=${MAXPAGESIZE} +RODATA_ALIGN=". = ALIGN(${RODATA_PADSIZE}) + (. & (${RODATA_PADSIZE} - 1))" +PAD_GOT= +PAD_PLT= diff --git a/devel/binutils/stable/patches/patch-Makefile_in b/devel/binutils/stable/patches/patch-Makefile_in index d3b33be808f..faf38610ea8 100644 --- a/devel/binutils/stable/patches/patch-Makefile_in +++ b/devel/binutils/stable/patches/patch-Makefile_in @@ -1,12 +1,12 @@ -$OpenBSD: patch-Makefile_in,v 1.4 2003/06/08 03:04:50 brad Exp $ ---- Makefile.in.orig Sat Mar 15 17:15:38 2003 -+++ Makefile.in Sat Mar 15 17:15:48 2003 -@@ -1755,7 +1755,7 @@ configure-target-libiberty: $(ALL_GCC_C) - all-target-libiberty: configure-target-libiberty - all-target: $(ALL_TARGET_MODULES) - install-target: $(INSTALL_TARGET_MODULES) --install-gdb: install-tcl install-tk install-itcl install-tix install-libgui -+#install-gdb: install-tcl install-tk install-itcl install-tix install-libgui - install-sid: install-tcl install-tk - ### other supporting targets +$OpenBSD: patch-Makefile_in,v 1.5 2003/10/11 00:52:22 brad Exp $ +--- Makefile.in.orig 2003-06-12 10:31:31.000000000 -0400 ++++ Makefile.in 2003-09-04 02:13:09.000000000 -0400 +@@ -7397,7 +7397,7 @@ all-bootstrap: maybe-all-libiberty maybe + configure-gdb: maybe-configure-tcl maybe-configure-tk maybe-configure-sim + GDB_TK = @GDB_TK@ + all-gdb: maybe-all-libiberty maybe-all-opcodes maybe-all-bfd maybe-all-mmalloc maybe-all-readline maybe-all-bison maybe-all-byacc maybe-all-sim $(gdbnlmrequirements) $(GDB_TK) +-install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui ++#install-gdb: maybe-install-tcl maybe-install-tk maybe-install-itcl maybe-install-tix maybe-install-libgui + configure-libgui: maybe-configure-tcl maybe-configure-tk + all-libgui: maybe-all-tcl maybe-all-tk maybe-all-itcl diff --git a/devel/binutils/stable/patches/patch-bfd_Makefile_in b/devel/binutils/stable/patches/patch-bfd_Makefile_in index 73ad64336aa..322b68d19ea 100644 --- a/devel/binutils/stable/patches/patch-bfd_Makefile_in +++ b/devel/binutils/stable/patches/patch-bfd_Makefile_in @@ -1,15 +1,7 @@ -$OpenBSD: patch-bfd_Makefile_in,v 1.4 2003/06/08 03:04:50 brad Exp $ ---- bfd/Makefile.in.orig Sat Mar 15 17:25:43 2003 -+++ bfd/Makefile.in Sat Mar 15 17:28:34 2003 -@@ -932,6 +932,7 @@ maintainer-clean-recursive: - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" = "." && dot_seen=yes; \ -+ true; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ -@@ -1319,7 +1320,7 @@ host-aout.lo: Makefile +$OpenBSD: patch-bfd_Makefile_in,v 1.5 2003/10/11 00:52:22 brad Exp $ +--- bfd/Makefile.in.orig 2003-05-02 13:06:14.000000000 -0400 ++++ bfd/Makefile.in 2003-09-04 02:03:34.000000000 -0400 +@@ -1350,7 +1350,7 @@ host-aout.lo: Makefile aout-params.h: gen-aout ./gen-aout host > aout-params.h gen-aout: $(srcdir)/gen-aout.c Makefile diff --git a/devel/binutils/stable/patches/patch-bfd_config_bfd b/devel/binutils/stable/patches/patch-bfd_config_bfd index 774dab64a93..08d5b62cb28 100644 --- a/devel/binutils/stable/patches/patch-bfd_config_bfd +++ b/devel/binutils/stable/patches/patch-bfd_config_bfd @@ -1,7 +1,7 @@ -$OpenBSD: patch-bfd_config_bfd,v 1.13 2003/07/28 05:12:01 brad Exp $ ---- bfd/config.bfd.orig Thu Nov 7 11:57:50 2002 -+++ bfd/config.bfd Mon Jul 21 16:18:47 2003 -@@ -180,11 +180,11 @@ case "${targ}" in +$OpenBSD: patch-bfd_config_bfd,v 1.14 2003/10/11 00:52:22 brad Exp $ +--- bfd/config.bfd.orig 2003-06-02 16:35:20.000000000 -0400 ++++ bfd/config.bfd 2003-09-04 02:23:35.000000000 -0400 +@@ -199,7 +199,7 @@ case "${targ}" in targ_defvec=bfd_elf32_littlearm_vec targ_selvecs=bfd_elf32_bigarm_vec ;; @@ -10,12 +10,16 @@ $OpenBSD: patch-bfd_config_bfd,v 1.13 2003/07/28 05:12:01 brad Exp $ targ_defvec=bfd_elf32_bigarm_vec targ_selvecs=bfd_elf32_littlearm_vec ;; +@@ -207,7 +207,7 @@ case "${targ}" in + targ_defvec=bfd_elf32_littlearm_vec + targ_selvecs=bfd_elf32_bigarm_vec + ;; - arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | arm*-*-uclinux*) + arm-*-elf | arm-*-freebsd* | arm*-*-linux-gnu* | arm*-*-conix* | arm*-*-uclinux* | arm-*-openbsd*) targ_defvec=bfd_elf32_littlearm_vec targ_selvecs=bfd_elf32_bigarm_vec ;; -@@ -413,11 +413,15 @@ case "${targ}" in +@@ -454,11 +454,15 @@ case "${targ}" in targ_defvec=i386pe_vec targ_selvecs="i386pe_vec i386pei_vec bfd_elf32_i386_vec" ;; @@ -32,7 +36,7 @@ $OpenBSD: patch-bfd_config_bfd,v 1.13 2003/07/28 05:12:01 brad Exp $ i[3456]86-*-netware*) targ_defvec=bfd_elf32_i386_vec targ_selvecs="nlm32_i386_vec i386coff_vec i386aout_vec" -@@ -440,6 +444,10 @@ case "${targ}" in +@@ -482,6 +486,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" ;; @@ -43,21 +47,36 @@ $OpenBSD: patch-bfd_config_bfd,v 1.13 2003/07/28 05:12:01 brad Exp $ 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 +@@ -723,11 +731,11 @@ case "${targ}" in targ_defvec=ecoff_big_vec targ_selvecs=ecoff_little_vec ;; - mips*el-*-netbsd*) + mips*el-*-netbsd* | mips*el-*-openbsd*) targ_defvec=bfd_elf32_littlemips_vec - targ_selvecs="bfd_elf32_bigmips_vec ecoff_little_vec ecoff_big_vec" + targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec" ;; - mips*-*-netbsd*) + mips*-*-netbsd* | mips*-*-openbsd*) targ_defvec=bfd_elf32_bigmips_vec - targ_selvecs="bfd_elf32_littlemips_vec ecoff_big_vec ecoff_little_vec" + targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec" ;; -@@ -788,7 +796,7 @@ case "${targ}" in +@@ -785,14 +793,6 @@ case "${targ}" in + targ_defvec=bfd_elf32_bigmips_vec + targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec" + ;; +- mips*el-*-openbsd*) +- targ_defvec=bfd_elf32_littlemips_vec +- targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec" +- ;; +- mips*-*-openbsd*) +- targ_defvec=bfd_elf32_bigmips_vec +- targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec" +- ;; + #ifdef BFD64 + mips64*el-*-linux*) + targ_defvec=bfd_elf32_ntradlittlemips_vec +@@ -835,7 +835,7 @@ case "${targ}" in targ_defvec=pc532machaout_vec targ_underscore=yes ;; @@ -66,7 +85,7 @@ $OpenBSD: patch-bfd_config_bfd,v 1.13 2003/07/28 05:12:01 brad Exp $ targ_defvec=pc532netbsd_vec targ_underscore=yes ;; -@@ -1041,10 +1049,14 @@ case "${targ}" in +@@ -1112,10 +1112,14 @@ case "${targ}" in targ_selvecs=bfd_elf32_sparc_vec targ_underscore=yes ;; @@ -82,15 +101,15 @@ $OpenBSD: patch-bfd_config_bfd,v 1.13 2003/07/28 05:12:01 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 +1141,11 @@ case "${targ}" in - - vax-*-bsd* | vax-*-ultrix*) - targ_defvec=vaxbsd_vec -+ targ_underscore=yes -+ ;; -+ -+ vax-*-openbsd*) -+ targ_defvec=vaxnetbsd_vec +@@ -1203,6 +1207,11 @@ case "${targ}" in targ_underscore=yes ;; ++ vax-*-openbsd*) ++ targ_defvec=vaxnetbsd_vec ++ targ_underscore=yes ++ ;; ++ + vax*-*-*vms*) + targ_defvec=vms_vax_vec + ;; diff --git a/devel/binutils/stable/patches/patch-bfd_configure_in b/devel/binutils/stable/patches/patch-bfd_configure_in index 115a2bf7f72..add79f57537 100644 --- a/devel/binutils/stable/patches/patch-bfd_configure_in +++ b/devel/binutils/stable/patches/patch-bfd_configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-bfd_configure_in,v 1.8 2003/07/28 05:12:01 brad Exp $ ---- bfd/configure.in.orig Wed Jan 1 20:23:03 2003 -+++ bfd/configure.in Mon Jul 21 16:19:41 2003 -@@ -168,7 +168,7 @@ if test "${target}" = "${host}"; then +$OpenBSD: patch-bfd_configure_in,v 1.9 2003/10/11 00:52:22 brad Exp $ +--- bfd/configure.in.orig 2003-06-12 10:25:46.000000000 -0400 ++++ bfd/configure.in 2003-09-04 02:03:34.000000000 -0400 +@@ -162,7 +162,7 @@ if test "${target}" = "${host}"; then ;; alpha*-*-*) COREFILE=osf-core.lo ;; arm-*-freebsd*) COREFILE='' ;; @@ -10,7 +10,7 @@ $OpenBSD: patch-bfd_configure_in,v 1.8 2003/07/28 05:12:01 brad Exp $ arm-*-riscix) COREFILE=trad-core.lo ;; hppa*-*-hpux*) COREFILE=hpux-core.lo ;; hppa*-*-hiux*) COREFILE=hpux-core.lo ;; -@@ -365,7 +365,7 @@ changequote([,])dnl +@@ -359,7 +359,7 @@ changequote([,])dnl COREFILE=trad-core.lo TRAD_HEADER='"hosts/tahoe.h"' ;; diff --git a/devel/binutils/stable/patches/patch-bfd_elf_c b/devel/binutils/stable/patches/patch-bfd_elf_c index e8ccc9a289e..edeff00953c 100644 --- a/devel/binutils/stable/patches/patch-bfd_elf_c +++ b/devel/binutils/stable/patches/patch-bfd_elf_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-bfd_elf_c,v 1.4 2003/06/05 04:29:16 brad Exp $ ---- bfd/elf.c.orig Wed Mar 19 22:34:28 2003 -+++ bfd/elf.c Wed Mar 19 22:37:10 2003 -@@ -4013,9 +4013,12 @@ get_program_header_size (abfd) +$OpenBSD: patch-bfd_elf_c,v 1.5 2003/10/11 00:52:22 brad Exp $ +--- bfd/elf.c.orig 2003-06-02 16:35:20.000000000 -0400 ++++ bfd/elf.c 2003-09-04 02:03:34.000000000 -0400 +@@ -4073,9 +4073,12 @@ get_program_header_size (abfd) return elf_tdata (abfd)->program_header_size; } diff --git a/devel/binutils/stable/patches/patch-binutils_Makefile_in b/devel/binutils/stable/patches/patch-binutils_Makefile_in index 637c7e6709f..1c1d3abe914 100644 --- a/devel/binutils/stable/patches/patch-binutils_Makefile_in +++ b/devel/binutils/stable/patches/patch-binutils_Makefile_in @@ -1,15 +1,7 @@ -$OpenBSD: patch-binutils_Makefile_in,v 1.4 2003/06/08 03:04:50 brad Exp $ ---- binutils/Makefile.in.orig Mon Jul 15 22:04:30 2002 -+++ binutils/Makefile.in Sun Mar 16 17:16:45 2003 -@@ -690,6 +690,7 @@ maintainer-clean-recursive: - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ -+ true; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ -@@ -1081,7 +1082,7 @@ mostlyclean-local: +$OpenBSD: patch-binutils_Makefile_in,v 1.5 2003/10/11 00:52:22 brad Exp $ +--- binutils/Makefile.in.orig 2003-03-24 06:28:35.000000000 -0500 ++++ binutils/Makefile.in 2003-09-13 18:06:46.000000000 -0400 +@@ -1069,7 +1069,7 @@ mostlyclean-local: install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS) @list='$(noinst_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ diff --git a/devel/binutils/stable/patches/patch-binutils_bucomm_c b/devel/binutils/stable/patches/patch-binutils_bucomm_c index 0ecee4cc0bb..7eca73d4070 100644 --- a/devel/binutils/stable/patches/patch-binutils_bucomm_c +++ b/devel/binutils/stable/patches/patch-binutils_bucomm_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-binutils_bucomm_c,v 1.4 2003/06/08 03:04:50 brad Exp $ ---- binutils/bucomm.c.orig Mon Oct 28 11:01:19 2002 -+++ binutils/bucomm.c Sun Mar 16 17:19:58 2003 -@@ -200,12 +200,14 @@ print_arelt_descr (file, abfd, verbose) +$OpenBSD: patch-binutils_bucomm_c,v 1.5 2003/10/11 00:52:22 brad Exp $ +--- binutils/bucomm.c.orig 2003-03-24 06:28:35.000000000 -0500 ++++ binutils/bucomm.c 2003-09-04 02:03:35.000000000 -0400 +@@ -403,12 +403,14 @@ print_arelt_descr (file, abfd, verbose) /* Return the name of a temporary file in the same directory as FILENAME. */ char * @@ -17,7 +17,7 @@ $OpenBSD: patch-binutils_bucomm_c,v 1.4 2003/06/08 03:04:50 brad Exp $ #ifdef HAVE_DOS_BASED_FILE_SYSTEM { -@@ -220,8 +222,6 @@ make_tempname (filename) +@@ -423,8 +425,6 @@ make_tempname (filename) if (slash != (char *) NULL) { @@ -26,7 +26,7 @@ $OpenBSD: patch-binutils_bucomm_c,v 1.4 2003/06/08 03:04:50 brad Exp $ c = *slash; *slash = 0; tmpname = xmalloc (strlen (filename) + sizeof (template) + 2); -@@ -235,15 +235,31 @@ make_tempname (filename) +@@ -438,15 +438,31 @@ make_tempname (filename) #endif strcat (tmpname, "/"); strcat (tmpname, template); diff --git a/devel/binutils/stable/patches/patch-binutils_bucomm_h b/devel/binutils/stable/patches/patch-binutils_bucomm_h index 883d4aacae7..ede98ba9f00 100644 --- a/devel/binutils/stable/patches/patch-binutils_bucomm_h +++ b/devel/binutils/stable/patches/patch-binutils_bucomm_h @@ -1,12 +1,12 @@ -$OpenBSD: patch-binutils_bucomm_h,v 1.4 2003/06/08 03:04:50 brad Exp $ ---- binutils/bucomm.h.orig Sun Jul 29 01:31:43 2001 -+++ binutils/bucomm.h Sun Mar 16 17:19:58 2003 -@@ -168,7 +168,7 @@ void list_supported_architectures PARAMS +$OpenBSD: patch-binutils_bucomm_h,v 1.5 2003/10/11 00:52:22 brad Exp $ +--- binutils/bucomm.h.orig 2003-03-24 06:28:35.000000000 -0500 ++++ binutils/bucomm.h 2003-09-04 02:26:28.000000000 -0400 +@@ -182,7 +182,7 @@ void print_arelt_descr + PARAMS ((FILE *, bfd *, bfd_boolean)); - void print_arelt_descr PARAMS ((FILE *file, bfd *abfd, boolean verbose)); - --char *make_tempname PARAMS ((char *)); -+char *make_tempname PARAMS ((char *, int)); - - bfd_vma parse_vma PARAMS ((const char *, const char *)); + char *make_tempname +- PARAMS ((char *)); ++ PARAMS ((char *, int)); + bfd_vma parse_vma + PARAMS ((const char *, const char *)); diff --git a/devel/binutils/stable/patches/patch-binutils_dlltool_c b/devel/binutils/stable/patches/patch-binutils_dlltool_c index 20c88aa19a5..604e5eef4b5 100644 --- a/devel/binutils/stable/patches/patch-binutils_dlltool_c +++ b/devel/binutils/stable/patches/patch-binutils_dlltool_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-binutils_dlltool_c,v 1.2 2003/06/05 04:03:55 brad Exp $ ---- binutils/dlltool.c.orig Mon Jul 15 22:04:32 2002 -+++ binutils/dlltool.c Sun Mar 16 17:19:58 2003 -@@ -1129,7 +1129,11 @@ run (what, args) +$OpenBSD: patch-binutils_dlltool_c,v 1.3 2003/10/11 00:52:22 brad Exp $ +--- binutils/dlltool.c.orig 2003-03-22 16:04:50.000000000 -0500 ++++ binutils/dlltool.c 2003-09-04 02:03:35.000000000 -0400 +@@ -1189,7 +1189,11 @@ run (what, args) int i; const char **argv; char *errmsg_fmt, *errmsg_arg; diff --git a/devel/binutils/stable/patches/patch-binutils_doc_Makefile_in b/devel/binutils/stable/patches/patch-binutils_doc_Makefile_in index 834c1b9734d..536f254afae 100644 --- a/devel/binutils/stable/patches/patch-binutils_doc_Makefile_in +++ b/devel/binutils/stable/patches/patch-binutils_doc_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-binutils_doc_Makefile_in,v 1.1 2003/06/30 13:07:32 espie Exp $ ---- binutils/doc/Makefile.in.orig Mon Jun 30 14:39:20 2003 -+++ binutils/doc/Makefile.in Mon Jun 30 14:42:21 2003 -@@ -443,100 +443,100 @@ binutils.dvi: $(binutils_TEXI) config.t +$OpenBSD: patch-binutils_doc_Makefile_in,v 1.2 2003/10/11 00:52:22 brad Exp $ +--- binutils/doc/Makefile.in.orig 2002-10-23 10:49:08.000000000 -0400 ++++ binutils/doc/Makefile.in 2003-09-04 02:03:35.000000000 -0400 +@@ -442,100 +442,100 @@ binutils.dvi: $(binutils_TEXI) config.t binutils.info: $(binutils_TEXI) config.texi # Man page generation from texinfo diff --git a/devel/binutils/stable/patches/patch-binutils_objcopy_c b/devel/binutils/stable/patches/patch-binutils_objcopy_c index 0351f6928dc..c0729904bdb 100644 --- a/devel/binutils/stable/patches/patch-binutils_objcopy_c +++ b/devel/binutils/stable/patches/patch-binutils_objcopy_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-binutils_objcopy_c,v 1.4 2003/06/08 03:04:50 brad Exp $ ---- binutils/objcopy.c.orig Mon Jul 15 22:04:33 2002 -+++ binutils/objcopy.c Sun Mar 16 19:47:51 2003 -@@ -1292,7 +1292,7 @@ copy_archive (ibfd, obfd, output_target) +$OpenBSD: patch-binutils_objcopy_c,v 1.5 2003/10/11 00:52:22 brad Exp $ +--- binutils/objcopy.c.orig 2003-06-02 16:35:15.000000000 -0400 ++++ binutils/objcopy.c 2003-09-04 02:03:35.000000000 -0400 +@@ -1364,7 +1364,7 @@ copy_archive (ibfd, obfd, output_target) } *list, *l; bfd **ptr = &obfd->archive_head; bfd *this_element; @@ -10,7 +10,7 @@ $OpenBSD: patch-binutils_objcopy_c,v 1.4 2003/06/08 03:04:50 brad Exp $ /* Make a temp directory to hold the contents. */ if (MKDIR (dir, 0700) != 0) -@@ -1324,7 +1324,7 @@ copy_archive (ibfd, obfd, output_target) +@@ -1396,7 +1396,7 @@ copy_archive (ibfd, obfd, output_target) /* If the file already exists, make another temp dir. */ if (stat (output_name, &buf) >= 0) { @@ -19,7 +19,7 @@ $OpenBSD: patch-binutils_objcopy_c,v 1.4 2003/06/08 03:04:50 brad Exp $ if (MKDIR (output_name, 0700) != 0) { fatal (_("cannot mkdir %s for archive copying (error: %s)"), -@@ -2083,7 +2083,7 @@ strip_main (argc, argv) +@@ -2204,7 +2204,7 @@ strip_main (argc, argv) if (output_file != NULL) tmpname = output_file; else @@ -28,9 +28,9 @@ $OpenBSD: patch-binutils_objcopy_c,v 1.4 2003/06/08 03:04:50 brad Exp $ status = 0; copy_file (argv[i], tmpname, input_target, output_target); -@@ -2592,7 +2592,7 @@ copy_main (argc, argv) - - if (output_filename == (char *) NULL) +@@ -2738,7 +2738,7 @@ copy_main (argc, argv) + if ((output_filename == (char *) NULL) || + (strcmp (input_filename, output_filename) == 0)) { - char *tmpname = make_tempname (input_filename); + char *tmpname = make_tempname (input_filename, 0); diff --git a/devel/binutils/stable/patches/patch-configure_in b/devel/binutils/stable/patches/patch-configure_in index d2a117bcf2d..56515c79c66 100644 --- a/devel/binutils/stable/patches/patch-configure_in +++ b/devel/binutils/stable/patches/patch-configure_in @@ -1,15 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.5 2003/06/08 03:04:50 brad Exp $ ---- configure.in.orig Sun Mar 16 15:45:23 2003 -+++ configure.in Sun Mar 16 15:42:29 2003 -@@ -415,6 +415,7 @@ case "${target}" in - hppa*-*-*elf* | \ - parisc*-*-linux* | hppa*-*-linux* | \ - hppa*-*-lites* | \ -+ hppa*-*-openbsd* | \ - hppa*64*-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" - # Do configure ld/binutils/gas for this case. -@@ -571,6 +572,9 @@ case "${target}" in +$OpenBSD: patch-configure_in,v 1.6 2003/10/11 00:52:22 brad Exp $ +--- configure.in.orig 2003-06-12 10:33:14.000000000 -0400 ++++ configure.in 2003-09-04 02:03:35.000000000 -0400 +@@ -633,6 +633,9 @@ case "${target}" in mips*-dec-bsd*) noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}" ;; @@ -19,13 +11,13 @@ $OpenBSD: patch-configure_in,v 1.5 2003/06/08 03:04:50 brad Exp $ mips*-*-bsd*) noconfigdirs="$noconfigdirs gprof target-libgloss ${libgcj}" ;; -@@ -628,6 +632,9 @@ case "${target}" in - ;; +@@ -691,6 +694,9 @@ case "${target}" in v850ea-*-*) noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" -+ ;; + ;; + vax-*-openbsd*) + noconfigdirs="$noconfigdirs ld gas gprof ${libgcj}" - ;; ++ ;; vax-*-vms) noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes target-libgloss ${libgcj}" + ;; diff --git a/devel/binutils/stable/patches/patch-gas_Makefile_am b/devel/binutils/stable/patches/patch-gas_Makefile_am index 9410c4e27a4..8e6253aeff9 100644 --- a/devel/binutils/stable/patches/patch-gas_Makefile_am +++ b/devel/binutils/stable/patches/patch-gas_Makefile_am @@ -1,7 +1,7 @@ -$OpenBSD: patch-gas_Makefile_am,v 1.4 2003/06/08 03:04:50 brad Exp $ ---- gas/Makefile.am.orig Sun Mar 16 15:56:19 2003 -+++ gas/Makefile.am Sun Mar 16 15:58:04 2003 -@@ -376,6 +376,7 @@ TARG_ENV_HFILES = \ +$OpenBSD: patch-gas_Makefile_am,v 1.5 2003/10/11 00:52:22 brad Exp $ +--- gas/Makefile.am.orig 2003-04-24 08:47:31.000000000 -0400 ++++ gas/Makefile.am 2003-09-04 02:03:36.000000000 -0400 +@@ -386,6 +386,7 @@ TARG_ENV_HFILES = \ config/te-macos.h \ config/te-nbsd.h \ config/te-nbsd532.h \ @@ -9,7 +9,7 @@ $OpenBSD: patch-gas_Makefile_am,v 1.4 2003/06/08 03:04:50 brad Exp $ config/te-pc532mach.h \ config/te-pe.h \ config/te-ppcnw.h \ -@@ -678,7 +679,7 @@ install-exec-bindir: $(noinst_PROGRAMS) +@@ -690,7 +691,7 @@ install-exec-bindir: $(noinst_PROGRAMS) $(mkinstalldirs) $(DESTDIR)$(bindir) @list='$(noinst_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ diff --git a/devel/binutils/stable/patches/patch-gas_config_tc-alpha_c b/devel/binutils/stable/patches/patch-gas_config_tc-alpha_c index 9b4e0f7884e..f14bb662347 100644 --- a/devel/binutils/stable/patches/patch-gas_config_tc-alpha_c +++ b/devel/binutils/stable/patches/patch-gas_config_tc-alpha_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-gas_config_tc-alpha_c,v 1.2 2003/06/05 04:03:55 brad Exp $ ---- gas/config/tc-alpha.c.orig Wed Dec 4 10:11:10 2002 -+++ gas/config/tc-alpha.c Sun Mar 16 17:20:02 2003 -@@ -2390,7 +2390,7 @@ insert_operand (insn, operand, val, file +$OpenBSD: patch-gas_config_tc-alpha_c,v 1.3 2003/10/11 00:52:22 brad Exp $ +--- gas/config/tc-alpha.c.orig 2003-01-23 07:51:04.000000000 -0500 ++++ gas/config/tc-alpha.c 2003-09-04 02:03:36.000000000 -0400 +@@ -2395,7 +2395,7 @@ insert_operand (insn, operand, val, file insn = (*operand->insert) (insn, val, &errmsg); if (errmsg) diff --git a/devel/binutils/stable/patches/patch-gas_config_tc-arm_c b/devel/binutils/stable/patches/patch-gas_config_tc-arm_c index ce7e6656c54..86026eaee3b 100644 --- a/devel/binutils/stable/patches/patch-gas_config_tc-arm_c +++ b/devel/binutils/stable/patches/patch-gas_config_tc-arm_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-gas_config_tc-arm_c,v 1.4 2003/07/28 05:12:01 brad Exp $ ---- gas/config/tc-arm.c.orig Wed Jul 23 21:02:20 2003 -+++ gas/config/tc-arm.c Wed Jul 23 21:07:16 2003 -@@ -132,6 +132,18 @@ +$OpenBSD: patch-gas_config_tc-arm_c,v 1.5 2003/10/11 00:52:22 brad Exp $ +--- gas/config/tc-arm.c.orig 2003-04-02 18:31:25.000000000 -0500 ++++ gas/config/tc-arm.c 2003-09-04 02:03:36.000000000 -0400 +@@ -134,6 +134,18 @@ #endif #endif @@ -20,7 +20,7 @@ $OpenBSD: patch-gas_config_tc-arm_c,v 1.4 2003/07/28 05:12:01 brad Exp $ /* For backwards compatibility we default to the FPA. */ #ifndef FPU_DEFAULT #define FPU_DEFAULT FPU_ARCH_FPA -@@ -9208,10 +9220,16 @@ md_begin () +@@ -10185,10 +10197,16 @@ md_begin () } else if (mfpu_opt == -1) { diff --git a/devel/binutils/stable/patches/patch-gas_config_tc-i386_h b/devel/binutils/stable/patches/patch-gas_config_tc-i386_h index 5917f0cdd94..27db2312bee 100644 --- a/devel/binutils/stable/patches/patch-gas_config_tc-i386_h +++ b/devel/binutils/stable/patches/patch-gas_config_tc-i386_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-gas_config_tc-i386_h,v 1.5 2003/06/13 04:17:12 brad Exp $ ---- gas/config/tc-i386.h.orig Mon Sep 23 15:11:17 2002 -+++ gas/config/tc-i386.h Thu Jun 12 21:56:14 2003 -@@ -79,7 +79,7 @@ extern unsigned long i386_mach PARAMS (( +$OpenBSD: patch-gas_config_tc-i386_h,v 1.6 2003/10/11 00:52:22 brad Exp $ +--- gas/config/tc-i386.h.orig 2003-01-23 07:51:05.000000000 -0500 ++++ gas/config/tc-i386.h 2003-09-04 02:03:36.000000000 -0400 +@@ -41,7 +41,7 @@ extern unsigned long i386_mach PARAMS (( #ifdef TE_FreeBSD #define AOUT_TARGET_FORMAT "a.out-i386-freebsd" #endif @@ -10,7 +10,7 @@ $OpenBSD: patch-gas_config_tc-i386_h,v 1.5 2003/06/13 04:17:12 brad Exp $ #define AOUT_TARGET_FORMAT "a.out-i386-netbsd" #endif #ifdef TE_386BSD -@@ -515,7 +515,11 @@ arch_entry; +@@ -444,7 +444,11 @@ arch_entry; /* The name of the global offset table generated by the compiler. Allow this to be overridden if need be. */ #ifndef GLOBAL_OFFSET_TABLE_NAME @@ -21,4 +21,4 @@ $OpenBSD: patch-gas_config_tc-i386_h,v 1.5 2003/06/13 04:17:12 brad Exp $ +#endif #endif - #ifdef BFD_ASSEMBLER + #ifndef LEX_AT diff --git a/devel/binutils/stable/patches/patch-gas_config_tc-sparc_c b/devel/binutils/stable/patches/patch-gas_config_tc-sparc_c index 29923222cab..5ebc9643239 100644 --- a/devel/binutils/stable/patches/patch-gas_config_tc-sparc_c +++ b/devel/binutils/stable/patches/patch-gas_config_tc-sparc_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-gas_config_tc-sparc_c,v 1.1 2003/06/13 04:17:12 brad Exp $ ---- gas/config/tc-sparc.c.orig Thu Jun 12 22:28:54 2003 -+++ gas/config/tc-sparc.c Thu Jun 12 22:29:11 2003 -@@ -305,7 +305,7 @@ sparc_target_format () +$OpenBSD: patch-gas_config_tc-sparc_c,v 1.2 2003/10/11 00:52:22 brad Exp $ +--- gas/config/tc-sparc.c.orig 2003-01-24 18:44:44.000000000 -0500 ++++ gas/config/tc-sparc.c 2003-09-04 02:03:37.000000000 -0400 +@@ -307,7 +307,7 @@ sparc_target_format () init_default_arch (); #ifdef OBJ_AOUT diff --git a/devel/binutils/stable/patches/patch-gas_config_tc-vax_c b/devel/binutils/stable/patches/patch-gas_config_tc-vax_c index 640b3d015c0..8a72f2dea19 100644 --- a/devel/binutils/stable/patches/patch-gas_config_tc-vax_c +++ b/devel/binutils/stable/patches/patch-gas_config_tc-vax_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-gas_config_tc-vax_c,v 1.1 2003/06/13 04:17:12 brad Exp $ ---- gas/config/tc-vax.c.orig Thu Jun 12 22:45:36 2003 -+++ gas/config/tc-vax.c Thu Jun 12 22:45:41 2003 -@@ -3397,7 +3397,7 @@ void +$OpenBSD: patch-gas_config_tc-vax_c,v 1.2 2003/10/11 00:52:22 brad Exp $ +--- gas/config/tc-vax.c.orig 2002-09-28 16:01:43.000000000 -0400 ++++ gas/config/tc-vax.c 2003-09-04 02:03:37.000000000 -0400 +@@ -3396,7 +3396,7 @@ void tc_headers_hook(headers) object_headers *headers; { diff --git a/devel/binutils/stable/patches/patch-gas_configure_in b/devel/binutils/stable/patches/patch-gas_configure_in index 7179c38f395..a959bf3ec38 100644 --- a/devel/binutils/stable/patches/patch-gas_configure_in +++ b/devel/binutils/stable/patches/patch-gas_configure_in @@ -1,92 +1,106 @@ -$OpenBSD: patch-gas_configure_in,v 1.13 2003/07/28 05:12:01 brad Exp $ ---- gas/configure.in.orig Wed Oct 30 12:07:32 2002 -+++ gas/configure.in Mon Jul 21 16:22:49 2003 -@@ -193,7 +193,8 @@ changequote([,])dnl - arm*-*-linux-gnu* | arm*-*-uclinux*) - fmt=elf em=linux ;; +$OpenBSD: patch-gas_configure_in,v 1.14 2003/10/11 00:52:22 brad Exp $ +--- gas/configure.in.orig 2003-06-02 16:35:23.000000000 -0400 ++++ gas/configure.in 2003-09-04 20:17:26.000000000 -0400 +@@ -197,7 +197,8 @@ changequote([,])dnl + arm*-*-linux-gnu*) fmt=elf em=linux ;; + arm*-*-uclinux*) fmt=elf em=linux ;; arm-*-netbsdelf*) fmt=elf em=nbsd ;; -- arm-*-netbsd* | arm-*-openbsd*) fmt=aout em=nbsd ;; -+ arm-*-netbsd*) fmt=aout em=nbsd ;; -+ arm-*-openbsd*) fmt=elf em=obsd ;; - arm-*-oabi | thumb-*-oabi) fmt=elf ;; - arm-epoc-pe | thumb-epoc-pe) fmt=coff em=epoc-pe ;; - arm-*-wince) fmt=coff em=wince-pe ;; -@@ -222,7 +223,7 @@ changequote([,])dnl - hppa-*-*elf*) fmt=elf em=hppa ;; - hppa-*-lites*) fmt=elf em=hppa ;; - hppa-*-netbsd*) fmt=elf em=nbsd ;; -- hppa-*-openbsd*) fmt=elf em=hppa ;; -+ hppa-*-openbsd*) fmt=elf em=obsd ;; - hppa-*-osf*) fmt=som em=hppa ;; - hppa-*-rtems*) fmt=elf em=hppa ;; - hppa-*-hpux11*) case ${cpu} in -@@ -260,7 +261,19 @@ changequote([,])dnl - ;; - esac - ;; -- i386-*-openbsd*) fmt=aout em=nbsd bfd_gas=yes;; +- arm-*-*n*bsd*) fmt=aout em=nbsd ;; ++ arm-*-netbsd*) fmt=aout em=nbsd ;; ++ arm-*-openbsd*) fmt=elf em=obsd ;; + arm-**-nto*) fmt=elf ;; + arm-*-oabi | thumb-*-oabi) fmt=elf ;; + arm-epoc-pe | thumb-epoc-pe) fmt=coff em=epoc-pe ;; +@@ -224,7 +225,7 @@ changequote([,])dnl + hppa-*-*elf*) fmt=elf em=hppa ;; + hppa-*-lites*) fmt=elf em=hppa ;; + hppa-*-netbsd*) fmt=elf em=nbsd ;; +- hppa-*-openbsd*) fmt=elf em=hppa ;; ++ hppa-*-openbsd*) fmt=elf em=obsd ;; + hppa-*-osf*) fmt=som em=hppa ;; + hppa-*-rtems*) fmt=elf em=hppa ;; + hppa-*-hpux11*) case ${cpu} in +@@ -254,10 +255,23 @@ changequote([,])dnl + i386-*-netbsd0.8) fmt=aout em=386bsd ;; + i386-*-netbsdpe*) fmt=coff em=pe ;; + i386-*-netbsdelf*) fmt=elf em=nbsd ;; +- i386-*-*n*bsd*) case ${cpu} in ++ i386-*-netbsd*) case ${cpu} in + x86_64) fmt=elf em=nbsd ;; + *) fmt=aout em=nbsd ;; + esac ;; +changequote(,)dnl -+ i386-*-openbsd*) em=obsd bfd_gas=yes -+ case ${cpu} in -+ x86_64) fmt=elf ;; -+ *) case ${os} in -+ openbsd[0-2].* | openbsd3.[0-2]) -+ fmt=aout ;; -+ *) -+ fmt=elf ;; -+ esac -+ esac -+ ;; ++ i386-*-openbsd*) em=obsd bfd_gas=yes ++ 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 +357,7 @@ changequote([,])dnl - m68k-*-netbsdelf*) fmt=elf em=nbsd bfd_gas=yes ;; - m68k-*-netbsdaout* | m68k-*-netbsd*) - fmt=aout em=nbsd bfd_gas=yes ;; -- m68k-*-openbsd*) fmt=aout em=nbsd bfd_gas=yes ;; -+ m68k-*-openbsd*) fmt=aout em=obsd bfd_gas=yes ;; - m68k-apple-aux*) fmt=coff em=aux ;; - m68k-*-psos*) fmt=elf em=psos;; + i386-*-linux*aout*) fmt=aout em=linux ;; + i386-*-linux*oldld) fmt=aout em=linux ;; + i386-*-linux*coff*) fmt=coff em=linux ;; +@@ -344,7 +358,7 @@ changequote([,])dnl + m68k-*-lynxos*) fmt=coff em=lynx ;; + m68k-*-netbsdelf*) fmt=elf em=nbsd ;; + m68k-*-netbsd*) fmt=aout em=nbsd bfd_gas=yes ;; +- m68k-*-openbsd*) fmt=aout em=nbsd bfd_gas=yes ;; ++ m68k-*-openbsd*) fmt=aout em=obsd bfd_gas=yes ;; + m68k-apple-aux*) fmt=coff em=aux ;; + m68k-*-psos*) fmt=elf em=psos;; -@@ -355,7 +368,6 @@ changequote([,])dnl - mcore-*-pe) fmt=coff em=pe bfd_gas=yes ;; +@@ -355,7 +369,6 @@ changequote([,])dnl + mcore-*-pe) fmt=coff em=pe bfd_gas=yes ;; # don't change em like *-*-bsd does -- mips-dec-openbsd*) fmt=elf endian=little ;; - 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 +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 ;; -- ns32k-pc532-openbsd*) fmt=aout em=nbsd532 ;; +- mips-dec-openbsd*) fmt=elf endian=little ;; + mips-dec-bsd*) fmt=aout endian=little ;; + mips-sony-bsd*) fmt=ecoff ;; + mips-*-bsd*) +@@ -392,7 +405,8 @@ changequote([,])dnl + ppc-*-aix5*) fmt=coff em=aix5 ;; + ppc-*-aix*) fmt=coff ;; + ppc-*-beos*) fmt=coff ;; +- ppc-*-*n*bsd* | ppc-*-elf*) fmt=elf ;; ++ ppc-*-netbsd* | ppc-*-elf*) fmt=elf ;; ++ ppc-*-openbsd*) fmt=elf em=obsd ;; + ppc-*-eabi* | ppc-*-sysv4*) fmt=elf ;; + ppc-*-linux-gnu*) fmt=elf + case "$endian" in +@@ -439,7 +453,7 @@ changequote([,])dnl + ns32k-pc532-mach*) fmt=aout em=pc532mach ;; + ns32k-pc532-ux*) fmt=aout em=pc532mach ;; + ns32k-pc532-lites*) fmt=aout em=nbsd532 ;; +- ns32k-*-*n*bsd*) fmt=aout em=nbsd532 ;; ++ ns32k-*-netbsd*) fmt=aout em=nbsd532 ;; - sparc-*-rtemsaout*) fmt=aout ;; - sparc-*-rtemself*) fmt=elf ;; -@@ -458,12 +469,17 @@ changequote([,])dnl - sparc64) fmt=elf ;; - esac - ;; -- sparc-*-openbsd*) em=nbsd -- case ${cpu} in -- sparc) fmt=aout ;; -- sparc64) fmt=elf ;; -- esac -- ;; + sparc-*-rtemsaout*) fmt=aout ;; + sparc-*-rtemself*) fmt=elf ;; +@@ -455,10 +469,21 @@ changequote([,])dnl + sparc-*-sysv4*) fmt=elf ;; + sparc-*-solaris*) fmt=elf ;; + sparc-*-netbsdelf*) fmt=elf em=nbsd ;; +- sparc-*-*n*bsd*) case ${cpu} in ++ sparc-*-netbsd*) case ${cpu} in + sparc64) fmt=elf em=nbsd ;; + *) fmt=aout em=nbsd ;; + esac ;; +changequote(,)dnl + sparc-*-openbsd*) em=obsd bfd_gas=yes -+ case ${os} in -+ openbsd[0-2].* | openbsd3.[0-1]) -+ fmt=aout ;; -+ *) -+ fmt=elf ;; -+ esac ++ case ${os} in ++ openbsd[0-2].* | openbsd3.[0-1]) ++ fmt=aout ;; ++ *) ++ fmt=elf ;; ++ esac + ;; +changequote([,])dnl + sparc64-*-openbsd*) em=obsd bfd_gas=yes fmt=elf ;; - - strongarm-*-coff) fmt=coff ;; - strongarm-*-elf) fmt=elf ;; + strongarm-*-coff) fmt=coff ;; + strongarm-*-elf) fmt=elf ;; + strongarm-*-kaos*) fmt=elf ;; diff --git a/devel/binutils/stable/patches/patch-gprof_Makefile_in b/devel/binutils/stable/patches/patch-gprof_Makefile_in deleted file mode 100644 index 1a13eeffa00..00000000000 --- a/devel/binutils/stable/patches/patch-gprof_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ -$OpenBSD: patch-gprof_Makefile_in,v 1.3 2003/06/08 03:04:50 brad Exp $ ---- gprof/Makefile.in.orig Sat Jul 13 21:14:42 2002 -+++ gprof/Makefile.in Sun Mar 16 16:08:24 2003 -@@ -504,6 +504,7 @@ maintainer-clean-recursive: - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ -+ true; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ diff --git a/devel/binutils/stable/patches/patch-ld_Makefile_am b/devel/binutils/stable/patches/patch-ld_Makefile_am index b784db8b98e..0997d91e327 100644 --- a/devel/binutils/stable/patches/patch-ld_Makefile_am +++ b/devel/binutils/stable/patches/patch-ld_Makefile_am @@ -1,7 +1,7 @@ -$OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ ---- ld/Makefile.am.orig Wed Jan 1 19:56:31 2003 -+++ ld/Makefile.am Mon Jul 21 16:31:14 2003 -@@ -120,7 +120,9 @@ ALL_EMULATIONS = \ +$OpenBSD: patch-ld_Makefile_am,v 1.8 2003/10/11 00:52:22 brad Exp $ +--- ld/Makefile.am.orig 2003-04-24 08:36:07.000000000 -0400 ++++ ld/Makefile.am 2003-09-04 02:03:37.000000000 -0400 +@@ -121,7 +121,9 @@ ALL_EMULATIONS = \ earmelf_fbsd.o \ earmelf_linux.o \ earmelf_nbsd.o \ @@ -9,9 +9,9 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ earmelfb_nbsd.o \ + earmelfb_obsd.o \ earmelf_oabi.o \ + earmnto.o \ earmnbsd.o \ - earmpe.o \ -@@ -151,6 +153,7 @@ ALL_EMULATIONS = \ +@@ -153,6 +155,7 @@ ALL_EMULATIONS = \ eelf32_i960.o \ eelf32_i860.o \ eelf32_sparc.o \ @@ -19,15 +19,15 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ eelf32b4300.o \ eelf32bmip.o \ eelf32bmipn32.o \ -@@ -169,6 +172,7 @@ ALL_EMULATIONS = \ +@@ -177,6 +180,7 @@ ALL_EMULATIONS = \ eelf32openrisc.o \ eelf32ppc.o \ eelf32ppc_fbsd.o \ + eelf32ppc_obsd.o \ eelf32ppclinux.o \ + eelf32ppcnto.o \ eelf32ppcsim.o \ - eelf32ppcwindiss.o \ -@@ -178,6 +182,7 @@ ALL_EMULATIONS = \ +@@ -188,6 +192,7 @@ ALL_EMULATIONS = \ eelf_i386_be.o \ eelf_i386_chaos.o \ eelf_i386_fbsd.o \ @@ -35,7 +35,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ eelf_i386_ldso.o \ eelf_s390.o \ egld960.o \ -@@ -210,6 +215,7 @@ ALL_EMULATIONS = \ +@@ -224,6 +229,7 @@ ALL_EMULATIONS = \ ei386moss.o \ ei386msdos.o \ ei386nbsd.o \ @@ -43,7 +43,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ ei386nto.o \ ei386nw.o \ ei386pe.o \ -@@ -228,6 +234,7 @@ ALL_EMULATIONS = \ +@@ -242,6 +248,7 @@ ALL_EMULATIONS = \ em68klinux.o \ em68klynx.o \ em68knbsd.o \ @@ -51,7 +51,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ em68kpsos.o \ em88kbcs.o \ emcorepe.o \ -@@ -268,6 +275,7 @@ ALL_EMULATIONS = \ +@@ -326,6 +333,7 @@ ALL_EMULATIONS = \ esparclinux.o \ esparclynx.o \ esparcnbsd.o \ @@ -59,7 +59,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ est2000.o \ esun3.o \ esun4.o \ -@@ -293,11 +301,14 @@ ALL_64_EMULATIONS = \ +@@ -354,11 +362,14 @@ ALL_64_EMULATIONS = \ eshlelf64_nbsd.o \ eelf_x86_64.o \ eelf_x86_64_fbsd.o \ @@ -74,7 +74,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ eelf64alpha_nbsd.o \ eelf64bmip.o \ eelf64btsmip.o \ -@@ -415,6 +426,17 @@ earmelfb_nbsd.c: $(srcdir)/emulparams/ar +@@ -480,6 +491,17 @@ earmelfb_nbsd.c: $(srcdir)/emulparams/ar $(srcdir)/emultempl/elf32.em $(srcdir)/emultempl/armelf.em \ $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} armelfb_nbsd "$(tdir_armelfb_nbsd)" @@ -92,7 +92,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ earmaoutb.c: $(srcdir)/emulparams/armaoutb.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/armaout.sc ${GEN_DEPENDS} ${GENSCRIPTS} armaoutb "$(tdir_armaoutb)" -@@ -540,6 +562,10 @@ em32relf.c: $(srcdir)/emulparams/m32relf +@@ -614,6 +636,10 @@ em32relf.c: $(srcdir)/emulparams/m32relf eelf32_sparc.c: $(srcdir)/emulparams/elf32_sparc.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32_sparc "$(tdir_elf32_sparc)" @@ -103,8 +103,8 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ eelf32_i860.c: $(srcdir)/emulparams/elf32_i860.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32_i860 "$(tdir_elf32_i860)" -@@ -608,6 +634,10 @@ eelf32ppc_fbsd.c: $(srcdir)/emulparams/e - $(srcdir)/emulparams/elf32ppc.sh \ +@@ -700,6 +726,10 @@ eelf32ppc_fbsd.c: $(srcdir)/emulparams/e + $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emultempl/ppc32elf.em \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf32ppc_fbsd "$(tdir_elf32ppc_fbsd)" +eelf32ppc_obsd.c: $(srcdir)/emulparams/elf32ppc_obsd.sh \ @@ -112,9 +112,9 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ + $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} elf32ppc_obsd "$(tdir_elf32ppc_obsd)" eelf32ppcsim.c: $(srcdir)/emulparams/elf32ppcsim.sh \ - $(srcdir)/emulparams/elf32ppc.sh \ + $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emultempl/ppc32elf.em \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -@@ -633,6 +663,10 @@ eelf64alpha_fbsd.c: $(srcdir)/emulparams +@@ -734,6 +764,10 @@ eelf64alpha_fbsd.c: $(srcdir)/emulparams $(srcdir)/emulparams/elf64alpha.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf64alpha_fbsd "$(tdir_elf64alpha_fbsd)" @@ -125,7 +125,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ eelf64alpha_nbsd.c: $(srcdir)/emulparams/elf64alpha_nbsd.sh \ $(srcdir)/emulparams/elf64alpha.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -@@ -663,6 +697,10 @@ eelf64_sparc_fbsd.c: $(srcdir)/emulparam +@@ -764,6 +798,10 @@ eelf64_sparc_fbsd.c: $(srcdir)/emulparam $(srcdir)/emulparams/elf64_sparc.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf64_sparc_fbsd "$(tdir_elf64_sparc_fbsd)" @@ -136,7 +136,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ eelf64bmip.c: $(srcdir)/emulparams/elf64bmip.sh \ $(srcdir)/emulparams/elf32bmipn32.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} -@@ -693,6 +731,10 @@ eelf_x86_64_fbsd.c: $(srcdir)/emulparams +@@ -794,6 +832,10 @@ eelf_x86_64_fbsd.c: $(srcdir)/emulparams $(srcdir)/emulparams/elf_x86_64.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf_x86_64_fbsd "$(tdir_elf_x86_64_fbsd)" @@ -147,7 +147,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ eelf_i386_be.c: $(srcdir)/emulparams/elf_i386_be.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf_i386_be "$(tdir_elf_i386_be)" -@@ -703,6 +745,10 @@ eelf_i386_fbsd.c: $(srcdir)/emulparams/e +@@ -804,6 +846,10 @@ eelf_i386_fbsd.c: $(srcdir)/emulparams/e $(srcdir)/emulparams/elf_i386.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf_i386_fbsd "$(tdir_elf_i386_fbsd)" @@ -158,7 +158,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ eelf_i386_ldso.c: $(srcdir)/emulparams/elf_i386_ldso.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} elf_i386_ldso "$(tdir_elf_i386_ldso)" -@@ -809,6 +855,9 @@ ei386msdos.c: $(srcdir)/emulparams/i386m +@@ -924,6 +970,9 @@ ei386msdos.c: $(srcdir)/emulparams/i386m ei386nbsd.c: $(srcdir)/emulparams/i386nbsd.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} ${GENSCRIPTS} i386nbsd "$(tdir_i386nbsd)" @@ -168,7 +168,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ ei386nto.c: $(srcdir)/emulparams/i386nto.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} i386nto "$(tdir_i386nto)" -@@ -866,6 +915,9 @@ em68klynx.c: $(srcdir)/emulparams/m68kly +@@ -981,6 +1030,9 @@ em68klynx.c: $(srcdir)/emulparams/m68kly em68knbsd.c: $(srcdir)/emulparams/m68knbsd.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} ${GENSCRIPTS} m68knbsd "$(tdir_m68knbsd)" @@ -178,7 +178,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ em68kpsos.c: $(srcdir)/emulparams/m68kpsos.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/psos.sc ${GEN_DEPENDS} ${GENSCRIPTS} m68kpsos "$(tdir_m68kpsos)" -@@ -1025,6 +1077,9 @@ esparclynx.c: $(srcdir)/emulparams/sparc +@@ -1322,6 +1374,9 @@ esparclynx.c: $(srcdir)/emulparams/sparc esparcnbsd.c: $(srcdir)/emulparams/sparcnbsd.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/aout.sc ${GEN_DEPENDS} ${GENSCRIPTS} sparcnbsd "$(tdir_sparcnbsd)" @@ -188,7 +188,7 @@ $OpenBSD: patch-ld_Makefile_am,v 1.7 2003/07/28 05:12:01 brad Exp $ est2000.c: $(srcdir)/emulparams/st2000.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/st2000.sc ${GEN_DEPENDS} ${GENSCRIPTS} st2000 "$(tdir_st2000)" -@@ -1212,7 +1267,7 @@ install-exec-local: ld-new$(EXEEXT) +@@ -1518,7 +1573,7 @@ install-exec-local: ld-new$(EXEEXT) $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(tooldir)/bin @list='$(noinst_PROGRAMS)'; for p in $$list; do \ if test -f $$p; then \ diff --git a/devel/binutils/stable/patches/patch-ld_configure_host b/devel/binutils/stable/patches/patch-ld_configure_host index 8563cc398fa..003f2c0d892 100644 --- a/devel/binutils/stable/patches/patch-ld_configure_host +++ b/devel/binutils/stable/patches/patch-ld_configure_host @@ -1,7 +1,7 @@ -$OpenBSD: patch-ld_configure_host,v 1.2 2003/07/09 20:47:11 brad Exp $ ---- ld/configure.host.orig Wed Dec 4 10:13:10 2002 -+++ ld/configure.host Tue Jul 8 19:31:46 2003 -@@ -30,6 +30,11 @@ case "${host}" in +$OpenBSD: patch-ld_configure_host,v 1.3 2003/10/11 00:52:22 brad Exp $ +--- ld/configure.host.orig 2003-01-06 11:13:57.000000000 -0500 ++++ ld/configure.host 2003-09-04 02:03:37.000000000 -0400 +@@ -27,6 +27,11 @@ case "${host}" in HOSTING_LIBS='-L`dirname \`${CC} --print-file-name=libc.so\`` '"$HOSTING_LIBS"' `if [ -f ../gcc/crtend.o ]; then echo ../gcc/crtend.o; else ${CC} --print-file-name=crtend.o; fi` `${CC} --print-file-name=crtn.o`' ;; @@ -13,13 +13,13 @@ $OpenBSD: patch-ld_configure_host,v 1.2 2003/07/09 20:47:11 brad Exp $ *-*-linux*aout* | *-*-linux*oldld) HOSTING_CRT0=/usr/lib/crt0.o ;; -@@ -215,6 +220,9 @@ x86_64-*-linux-gnu*) +@@ -212,6 +217,9 @@ x86_64-*-linux-gnu*) + *-*-freebsd*) ;; - *-*-freebsd*) ++*-*-openbsd*) + ;; + -+*-*-openbsd*) + *-*-linux*) ;; - *-*-linux*) diff --git a/devel/binutils/stable/patches/patch-ld_configure_tgt b/devel/binutils/stable/patches/patch-ld_configure_tgt index 7e19aaa4f0a..15329df00f5 100644 --- a/devel/binutils/stable/patches/patch-ld_configure_tgt +++ b/devel/binutils/stable/patches/patch-ld_configure_tgt @@ -1,7 +1,7 @@ -$OpenBSD: patch-ld_configure_tgt,v 1.11 2003/07/28 05:12:01 brad Exp $ ---- ld/configure.tgt.orig Mon Oct 28 10:58:12 2002 -+++ ld/configure.tgt Mon Jul 21 16:46:42 2003 -@@ -70,12 +70,15 @@ sparc*-*-linux-gnu*) targ_emul=elf32_spa +$OpenBSD: patch-ld_configure_tgt,v 1.12 2003/10/11 00:52:22 brad Exp $ +--- ld/configure.tgt.orig 2003-06-12 10:25:52.000000000 -0400 ++++ ld/configure.tgt 2003-09-04 02:29:46.000000000 -0400 +@@ -72,12 +72,15 @@ sparc*-*-linux-gnu*) targ_emul=elf32_spa tdir_sun4=sparc-sun-sunos4 ;; sparc*-*-lynxos*) targ_emul=sparclynx ;; @@ -19,7 +19,7 @@ $OpenBSD: patch-ld_configure_tgt,v 1.11 2003/07/28 05:12:01 brad Exp $ sparc-*-solaris2.[0-6] | sparc-*-solaris2.[0-6].*) targ_emul=elf32_sparc ;; sparc-*-solaris2*) targ_emul=elf32_sparc -@@ -169,6 +172,14 @@ i[3456]86-*-netbsdpe*) targ_emul=i386pe +@@ -175,6 +178,14 @@ i[3456]86-*-netbsdpe*) targ_emul=i386pe i[3456]86-*-netbsd*) targ_emul=i386nbsd targ_extra_emuls=elf_i386 ;; @@ -34,10 +34,10 @@ $OpenBSD: patch-ld_configure_tgt,v 1.11 2003/07/28 05:12:01 brad Exp $ x86_64-*-netbsd*) targ_emul=elf_x86_64 targ_extra_emuls="elf_i386 i386nbsd" tdir_elf_i386=`echo ${targ_alias} | \ -@@ -229,7 +240,10 @@ arm-*-netbsdelf*) targ_emul=armelf_nbsd; - targ_extra_emuls="armelfb_nbsd armelf armnbsd" ;; +@@ -238,7 +249,10 @@ arm-*-netbsdelf*) targ_emul=armelf_nbsd; arm-*-netbsd*) targ_emul=armnbsd; targ_extra_emuls="armelf armelf_nbsd armelfb_nbsd" ;; + arm-*-nto*) targ_emul=armnto ;; -arm-*-openbsd*) targ_emul=armnbsd ;; +armeb-*-openbsd*) targ_emul=armelfb_obsd + targ_extra_emuls="armelf_obsd" ;; @@ -45,8 +45,8 @@ $OpenBSD: patch-ld_configure_tgt,v 1.11 2003/07/28 05:12:01 brad Exp $ + targ_extra_emuls="armelfb_obsd" ;; arm-*-rtems*) targ_emul=armelf ;; arm-*-elf) targ_emul=armelf ;; - arm9e-*-elf) targ_emul=armelf ;; -@@ -340,6 +354,7 @@ m68*-*-netbsdelf*) targ_emul=m68kelfnbsd + arm-*-kaos*) targ_emul=armelf ;; +@@ -361,6 +375,7 @@ m68*-*-netbsdelf*) targ_emul=m68kelfnbsd m68*-*-netbsdaout* | m68*-*-netbsd*) targ_emul=m68knbsd targ_extra_emuls="m68kelfnbsd m68k4knbsd" ;; @@ -54,7 +54,7 @@ $OpenBSD: patch-ld_configure_tgt,v 1.11 2003/07/28 05:12:01 brad Exp $ m68*-*-psos*) targ_emul=m68kpsos ;; m68*-*-rtemscoff*) targ_emul=m68kcoff ;; m68*-*-rtems*) targ_emul=m68kelf ;; -@@ -375,6 +390,8 @@ mips*el-*-netbsd*) targ_emul=elf32lmip +@@ -397,6 +412,8 @@ mips*el-*-netbsd*) targ_emul=elf32lmip mips*-*-netbsd*) targ_emul=elf32bmip targ_extra_emuls="elf32lmip" ;; @@ -63,7 +63,7 @@ $OpenBSD: patch-ld_configure_tgt,v 1.11 2003/07/28 05:12:01 brad Exp $ mips*-*-bsd*) targ_emul=mipsbig ;; mips*vr4300el-*-elf*) targ_emul=elf32l4300 ;; mips*vr4300-*-elf*) targ_emul=elf32b4300 ;; -@@ -415,7 +432,7 @@ alpha*-*-osf*) targ_emul=alpha ;; +@@ -445,7 +462,7 @@ alpha*-*-osf*) targ_emul=alpha ;; alpha*-*-gnu*) targ_emul=elf64alpha ;; alpha*-*-netware*) targ_emul=alpha ;; alpha*-*-netbsd*) targ_emul=elf64alpha_nbsd ;; @@ -72,7 +72,7 @@ $OpenBSD: patch-ld_configure_tgt,v 1.11 2003/07/28 05:12:01 brad Exp $ z8k-*-coff) targ_emul=z8002; targ_extra_emuls=z8001 ;; ns32k-pc532-mach* | ns32k-pc532-ux*) targ_emul=pc532macha ;; ns32k-*-netbsd* | ns32k-pc532-lites*) targ_emul=ns32knbsd ;; -@@ -431,6 +448,7 @@ powerpc-*-freebsd*) targ_emul=elf32ppc_f +@@ -461,6 +478,7 @@ powerpc-*-freebsd*) targ_emul=elf32ppc_f targ_extra_libpath=elf32ppc; tdir_elf32ppcsim=`echo ${targ_alias} | sed -e 's/ppc/ppcsim/'` ;; @@ -80,12 +80,12 @@ $OpenBSD: patch-ld_configure_tgt,v 1.11 2003/07/28 05:12:01 brad Exp $ powerpc*-*-linux*) case "${targ}" in *64*) targ_emul=elf64ppc -@@ -454,7 +472,7 @@ powerpc*le-*-elf* | powerpc*le-*-eabi* | +@@ -489,7 +507,7 @@ powerpc*le-*-elf* | powerpc*le-*-eabi* | targ_extra_emuls="elf32ppcsim" ;; esac ;; powerpc*-*-elf* | powerpc*-*-eabi* | powerpc*-*-sysv* \ -- | powerpc*-*-netbsd* | powerpc-*-openbsd* | powerpc*-*-vxworks*) -+ | powerpc*-*-netbsd* | powerpc*-*-vxworks*) +- | powerpc*-*-netbsd* | powerpc-*-openbsd* | powerpc*-*-vxworks* | powerpc*-*-kaos*) ++ | powerpc*-*-netbsd* | powerpc*-*-vxworks* | powerpc*-*-kaos*) case "${targ}" in *64*) targ_emul=elf64ppc targ_extra_emuls="elf32ppc elf32ppclinux elf32ppcsim" diff --git a/devel/binutils/stable/patches/patch-ld_emultempl_elf32_em b/devel/binutils/stable/patches/patch-ld_emultempl_elf32_em index acd1f7cc9e7..747b1092baf 100644 --- a/devel/binutils/stable/patches/patch-ld_emultempl_elf32_em +++ b/devel/binutils/stable/patches/patch-ld_emultempl_elf32_em @@ -1,7 +1,7 @@ -$OpenBSD: patch-ld_emultempl_elf32_em,v 1.3 2003/06/05 04:03:55 brad Exp $ ---- ld/emultempl/elf32.em.orig Sun Dec 15 14:41:07 2002 -+++ ld/emultempl/elf32.em Sun Mar 16 23:34:34 2003 -@@ -86,6 +86,159 @@ static char *gld${EMULATION_NAME}_get_sc +$OpenBSD: patch-ld_emultempl_elf32_em,v 1.4 2003/10/11 00:52:22 brad Exp $ +--- ld/emultempl/elf32.em.orig 2003-02-28 17:55:11.000000000 -0500 ++++ ld/emultempl/elf32.em 2003-09-04 02:03:38.000000000 -0400 +@@ -87,6 +87,159 @@ static char *gld${EMULATION_NAME}_get_sc PARAMS ((int *isfile)); EOF @@ -161,7 +161,7 @@ $OpenBSD: patch-ld_emultempl_elf32_em,v 1.3 2003/06/05 04:03:55 brad Exp $ # Import any needed special functions and/or overrides. # -@@ -265,7 +418,7 @@ gld${EMULATION_NAME}_try_needed (name, f +@@ -266,7 +419,7 @@ gld${EMULATION_NAME}_try_needed (name, f int force; { bfd *abfd; @@ -170,7 +170,7 @@ $OpenBSD: patch-ld_emultempl_elf32_em,v 1.3 2003/06/05 04:03:55 brad Exp $ abfd = bfd_openr (name, bfd_get_target (output_bfd)); if (abfd == NULL) -@@ -358,7 +511,7 @@ cat >>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <name, force)) - break; -- if (command_line.rpath_link == NULL -+ if (getenv("LD_RUN_PATH") != NULL -+ && command_line.rpath_link == NULL - && command_line.rpath == NULL) - { -- lib_path = (const char *) getenv ("LD_RUN_PATH"); -+ lib_path = getenv ("LD_RUN_PATH"); - if (gld${EMULATION_NAME}_search_needed (lib_path, l->name, - force)) - break; - } -- lib_path = (const char *) getenv ("LD_LIBRARY_PATH"); -+ -+ len = strlen(search_head->name); -+ lib_path = xstrdup(search_head->name); -+ for (search = search_head->next; search != NULL; -+ search = search->next) -+ { -+ size_t nlen; -+ -+ nlen = strlen(search->name); -+ lib_path = xrealloc(lib_path, len + nlen + 2); -+ lib_path[len] = ':'; -+ strcpy(lib_path + len + 1, search->name); -+ len += nlen + 1; -+ } -+ -+ if (gld${EMULATION_NAME}_search_needed (lib_path, l->name, force)) -+ { -+ free(lib_path); -+ break; -+ } -+ free(lib_path); -+ -+ lib_path = getenv ("LD_LIBRARY_PATH"); - if (gld${EMULATION_NAME}_search_needed (lib_path, l->name, force)) - break; - -@@ -929,7 +1106,15 @@ gld${EMULATION_NAME}_open_dynamic_archiv - return false; +@@ -976,7 +1129,15 @@ gld${EMULATION_NAME}_open_dynamic_archiv + return FALSE; filename = entry->filename; - @@ -264,7 +214,7 @@ $OpenBSD: patch-ld_emultempl_elf32_em,v 1.3 2003/06/05 04:03:55 brad Exp $ /* This allocates a few bytes too many when EXTRA_SHLIB_EXTENSION is defined, but it does not seem worth the headache to optimize away those two bytes of space. */ -@@ -943,6 +1128,10 @@ gld${EMULATION_NAME}_open_dynamic_archiv +@@ -990,6 +1151,10 @@ gld${EMULATION_NAME}_open_dynamic_archiv sprintf (string, "%s/lib%s%s.so", search->name, filename, arch); diff --git a/devel/binutils/stable/patches/patch-ld_genscripts_sh b/devel/binutils/stable/patches/patch-ld_genscripts_sh index 83de8d9be2e..410f916e1bb 100644 --- a/devel/binutils/stable/patches/patch-ld_genscripts_sh +++ b/devel/binutils/stable/patches/patch-ld_genscripts_sh @@ -1,26 +1,30 @@ -$OpenBSD: patch-ld_genscripts_sh,v 1.4 2003/07/09 20:47:11 brad Exp $ ---- ld/genscripts.sh.orig Sat Jul 13 21:14:44 2002 -+++ ld/genscripts.sh Wed Jul 9 15:47:49 2003 -@@ -60,9 +60,6 @@ if [ "x${LIB_PATH}" = "x" ] ; then - fi +$OpenBSD: patch-ld_genscripts_sh,v 1.5 2003/10/11 00:52:22 brad Exp $ +--- ld/genscripts.sh.orig 2003-09-04 20:58:32.000000000 -0400 ++++ ld/genscripts.sh 2003-09-04 20:54:36.000000000 -0400 +@@ -110,13 +110,6 @@ if [ "x${LIB_PATH}" = "x" ] && [ "x${USE + LIB_PATH=${LIB_PATH}${LIB_PATH2} fi --# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib. --LIB_PATH=${tool_lib}:${LIB_PATH} +- +-# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib, except for +-# sysrooted configurations. +-if [ "x${use_sysroot}" != "xyes" ] ; then +- LIB_PATH=${tool_lib}:${LIB_PATH} +-fi - LIB_SEARCH_DIRS=`echo ${LIB_PATH} | sed -e 's/:/ /g' -e 's/\([^ ][^ ]*\)/SEARCH_DIR(\\"\1\\");/g'` # Generate 5 or 6 script files from a master script template in -@@ -174,6 +171,12 @@ if test -n "$GENERATE_SHLIB_SCRIPT"; the - COMBRELOC= +@@ -229,6 +222,12 @@ if test -n "$GENERATE_SHLIB_SCRIPT"; the fi fi -+ + +LD_FLAG=Z +DATA_ALIGNMENT=${DATA_ALIGNMENT_} +RELOCATING=" " +(. ${srcdir}/scripttempl/${SCRIPT_NAME}.sc) | sed -e '/^ *$/d' > \ + ldscripts/${EMULATION_NAME}.xz - ++ case " $EMULATION_LIBPATH " in *" ${EMULATION_NAME} "*) COMPILE_IN=true;; + esac diff --git a/devel/binutils/stable/patches/patch-ld_ld_h b/devel/binutils/stable/patches/patch-ld_ld_h index cf521ad5fa4..73f63451a41 100644 --- a/devel/binutils/stable/patches/patch-ld_ld_h +++ b/devel/binutils/stable/patches/patch-ld_ld_h @@ -1,13 +1,13 @@ -$OpenBSD: patch-ld_ld_h,v 1.1 2003/06/05 04:03:56 brad Exp $ ---- ld/ld.h.orig Wed Mar 19 22:31:05 2003 -+++ ld/ld.h Wed Mar 19 22:31:35 2003 -@@ -195,6 +195,10 @@ typedef struct { +$OpenBSD: patch-ld_ld_h,v 1.2 2003/10/11 00:52:22 brad Exp $ +--- ld/ld.h.orig 2002-12-23 05:44:59.000000000 -0500 ++++ ld/ld.h 2003-09-05 10:40:46.000000000 -0400 +@@ -201,6 +201,10 @@ typedef struct { - boolean text_read_only; + bfd_boolean text_read_only; + /* Classic ELF executable which has data and bss next to each + other with no padding for GOT/PLT. */ -+ boolean data_bss_contig; ++ bfd_boolean data_bss_contig; + char *map_filename; FILE *map_file; diff --git a/devel/binutils/stable/patches/patch-ld_ldmain_c b/devel/binutils/stable/patches/patch-ld_ldmain_c index 5b4310800e0..bbf118ebd32 100644 --- a/devel/binutils/stable/patches/patch-ld_ldmain_c +++ b/devel/binutils/stable/patches/patch-ld_ldmain_c @@ -1,11 +1,11 @@ -$OpenBSD: patch-ld_ldmain_c,v 1.1 2003/06/05 04:03:56 brad Exp $ ---- ld/ldmain.c.orig Wed Mar 19 22:32:54 2003 -+++ ld/ldmain.c Wed Mar 19 22:33:27 2003 -@@ -272,6 +272,7 @@ main (argc, argv) - force_make_executable = false; - config.magic_demand_paged = true; - config.text_read_only = true; -+ config.data_bss_contig = false; +$OpenBSD: patch-ld_ldmain_c,v 1.2 2003/10/11 00:52:22 brad Exp $ +--- ld/ldmain.c.orig 2003-05-03 12:07:00.000000000 -0400 ++++ ld/ldmain.c 2003-09-04 21:05:32.000000000 -0400 +@@ -337,6 +337,7 @@ main (argc, argv) + force_make_executable = FALSE; + config.magic_demand_paged = TRUE; + config.text_read_only = TRUE; ++ config.data_bss_contig = FALSE; emulation = get_emulation (argc, argv); ldemul_choose_mode (emulation); diff --git a/devel/binutils/stable/patches/patch-ld_lexsup_c b/devel/binutils/stable/patches/patch-ld_lexsup_c index 8523ce721bd..645321ca0bd 100644 --- a/devel/binutils/stable/patches/patch-ld_lexsup_c +++ b/devel/binutils/stable/patches/patch-ld_lexsup_c @@ -1,23 +1,23 @@ -$OpenBSD: patch-ld_lexsup_c,v 1.1 2003/06/05 04:03:56 brad Exp $ ---- ld/lexsup.c.orig Wed Mar 19 22:27:11 2003 -+++ ld/lexsup.c Wed Mar 19 22:30:13 2003 -@@ -217,6 +217,9 @@ static const struct ld_option ld_options +$OpenBSD: patch-ld_lexsup_c,v 1.2 2003/10/11 00:52:22 brad Exp $ +--- ld/lexsup.c.orig 2003-03-31 13:12:52.000000000 -0500 ++++ ld/lexsup.c 2003-09-05 10:42:22.000000000 -0400 +@@ -223,6 +223,9 @@ static const struct ld_option ld_options { {"omagic", no_argument, NULL, 'N'}, 'N', NULL, N_("Do not page align data, do not make text readonly"), EXACTLY_TWO_DASHES }, + { {"Zmagic", no_argument, NULL, 'Z'}, + 'Z', NULL, N_("Do not page align got/plt, old style executable"), + EXACTLY_TWO_DASHES }, + { {"no-omagic", no_argument, NULL, OPTION_NO_OMAGIC}, + '\0', NULL, N_("Page align data, make text readonly"), EXACTLY_TWO_DASHES }, { {"output", required_argument, NULL, 'o'}, - 'o', N_("FILE"), N_("Set output file name"), EXACTLY_TWO_DASHES }, - { {NULL, required_argument, NULL, '\0'}, -@@ -748,6 +751,9 @@ parse_args (argc, argv) - case 'n': - config.magic_demand_paged = false; - config.dynamic_link = false; -+ break; -+ case 'Z': -+ config.data_bss_contig = true; +@@ -784,6 +787,9 @@ parse_args (argc, argv) + config.magic_demand_paged = FALSE; + config.dynamic_link = FALSE; break; ++ case 'Z': ++ config.data_bss_contig = TRUE; ++ break; case OPTION_NO_DEFINE_COMMON: - command_line.inhibit_common_definition = true; + command_line.inhibit_common_definition = TRUE; + break; diff --git a/devel/binutils/stable/patches/patch-ld_scripttempl_elf_sc b/devel/binutils/stable/patches/patch-ld_scripttempl_elf_sc index bd89131c959..2089f99157d 100644 --- a/devel/binutils/stable/patches/patch-ld_scripttempl_elf_sc +++ b/devel/binutils/stable/patches/patch-ld_scripttempl_elf_sc @@ -1,6 +1,6 @@ -$OpenBSD: patch-ld_scripttempl_elf_sc,v 1.1 2003/06/05 04:03:56 brad Exp $ ---- ld/scripttempl/elf.sc.orig Sat Jul 13 21:14:48 2002 -+++ ld/scripttempl/elf.sc Thu Apr 24 16:08:13 2003 +$OpenBSD: patch-ld_scripttempl_elf_sc,v 1.2 2003/10/11 00:52:22 brad Exp $ +--- ld/scripttempl/elf.sc.orig 2003-04-14 09:03:17.000000000 -0400 ++++ ld/scripttempl/elf.sc 2003-09-19 22:29:09.000000000 -0400 @@ -114,6 +114,14 @@ if test -z "${NO_SMALL_DATA}"; then REL_SBSS2=".rel.sbss2 ${RELOCATING-0} : { *(.rel.sbss2${RELOCATING+ .rel.sbss2.* .rel.gnu.linkonce.sb2.*}) } .rela.sbss2 ${RELOCATING-0} : { *(.rela.sbss2${RELOCATING+ .rela.sbss2.* .rela.gnu.linkonce.sb2.*}) }" @@ -24,18 +24,23 @@ $OpenBSD: patch-ld_scripttempl_elf_sc,v 1.1 2003/06/05 04:03:56 brad Exp $ ${WRITABLE_RODATA-${RODATA}} .rodata1 ${RELOCATING-0} : { *(.rodata1) } ${CREATE_SHLIB-${SDATA2}} -@@ -320,9 +329,15 @@ cat <