Add OpenBSD/amd64 5.4 support

7 files changed, 162 insertions, 2 deletions

diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile
index 5526caaa928..67bbd68ec32 100644
--- a/devel/binutils/Makefile
+++ b/devel/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2014/01/13 15:06:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.57 2014/01/26 03:49:01 ryoon Exp $
 
 DISTNAME=	binutils-2.24
 CATEGORIES=	devel
@@ -58,6 +58,8 @@ PLIST.ld=	yes
 EXTRA_FILES+=	ld
 .endif
 
+CFLAGS.OpenBSD+=	-Wno-bounded
+
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mclang)
 CFLAGS+=	-Wno-unused-value -Wno-format-security \
diff --git a/devel/binutils/distinfo b/devel/binutils/distinfo
index 64bb366dfa0..d417acd66ea 100644
--- a/devel/binutils/distinfo
+++ b/devel/binutils/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2014/01/08 21:04:14 jperkin Exp $
+$NetBSD: distinfo,v 1.15 2014/01/26 03:49:01 ryoon Exp $
 
 SHA1 (binutils-2.24.tar.bz2) = 7ac75404ddb3c4910c7594b51ddfc76d4693debb
 RMD160 (binutils-2.24.tar.bz2) = b4aa3ea5ba9d0d9f817b2cf136e7f911f692af8d
@@ -7,4 +7,9 @@ SHA1 (patch-aa) = 1a127f82c807cbd1ac6fee073c618f3fb48667f6
 SHA1 (patch-bfd_cache.c) = 14848eb2bfafb0eddd3328bded305131dec42488
 SHA1 (patch-configure.ac) = 7bd7b90e57d850705286f2cc6464ecc45e0657c0
 SHA1 (patch-gas_config_tc-i386.c) = 16b04ee6c3c46db375c883b4338bf5d796174458
+SHA1 (patch-ld_Makefile.am) = 908d0e0e366d08929d27416a3361e1869abd0076
+SHA1 (patch-ld_Makefile.in) = 68eba0b8a12211915a1eb99770011090f5c21ff2
+SHA1 (patch-ld_configure.tgt) = 7809d739e9a681c0ebe3d60f30dc759accdff6b9
+SHA1 (patch-ld_emulparams_elf__i386__obsd.sh) = 09857049f8681c5c94f98185d9dce1bcc02a45b6
+SHA1 (patch-ld_emulparams_elf__x86__64__obsd.sh) = 4b06302b989520d3b162dea141b0a4dcaf8c56f0
 SHA1 (patch-libiberty_Makefile.in) = fd07f4fafe6c25e9ab65c65ec3807c89bfd9f0b5
diff --git a/devel/binutils/patches/patch-ld_Makefile.am b/devel/binutils/patches/patch-ld_Makefile.am
new file mode 100644
index 00000000000..31d77ed281f
--- /dev/null
+++ b/devel/binutils/patches/patch-ld_Makefile.am
@@ -0,0 +1,42 @@
+$NetBSD: patch-ld_Makefile.am,v 1.1 2014/01/26 03:49:01 ryoon Exp $
+
+--- ld/Makefile.am.orig	2013-11-26 11:37:33.000000000 +0000
++++ ld/Makefile.am
+@@ -268,6 +268,7 @@ ALL_EMULATION_SOURCES = \
+ 	eelf_i386_fbsd.c \
+ 	eelf_i386_ldso.c \
+ 	eelf_i386_nacl.c \
++	eelf_i386_obsd.c \
+ 	eelf_i386_sol2.c \
+ 	eelf_i386_vxworks.c \
+ 	eelf_s390.c \
+@@ -525,6 +526,7 @@ ALL_64_EMULATION_SOURCES = \
+ 	eelf_x86_64.c \
+ 	eelf_x86_64_fbsd.c \
+ 	eelf_x86_64_nacl.c \
++	eelf_x86_64_obsd.c \
+ 	eelf_x86_64_sol2.c \
+ 	ehppa64linux.c \
+ 	emmo.c \
+@@ -1268,6 +1270,10 @@ eelf32xtensa.c: $(srcdir)/emulparams/elf
+ eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \
+   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 	${GENSCRIPTS} elf_i386 "$(tdir_elf_i386)"
++eelf_x86_64_obsd.c: $(srcdir)/emulparams/elf_x86_64_obsd.sh \
++  $(srcdir)/emulparams/elf_x86_64.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} elf_x86_64_obsd "$(tdir_elf_x86_64_obsd)"
+ eelf_i386_be.c: $(srcdir)/emulparams/elf_i386_be.sh \
+   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 	${GENSCRIPTS} elf_i386_be "$(tdir_elf_i386_be)"
+@@ -1291,6 +1297,10 @@ eelf_i386_sol2.c: $(srcdir)/emulparams/e
+   $(srcdir)/emultempl/solaris2.em \
+   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 	${GENSCRIPTS} elf_i386_sol2 "$(tdir_elf_i386_sol2)"
++eelf_i386_obsd.c: $(srcdir)/emulparams/elf_i386_obsd.sh \
++  $(srcdir)/emulparams/elf_i386.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} elf_i386_obsd "$(tdir_elf_i386_obsd)"
+ eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \
+   $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \
+   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
diff --git a/devel/binutils/patches/patch-ld_Makefile.in b/devel/binutils/patches/patch-ld_Makefile.in
new file mode 100644
index 00000000000..d7fa9817b08
--- /dev/null
+++ b/devel/binutils/patches/patch-ld_Makefile.in
@@ -0,0 +1,58 @@
+$NetBSD: patch-ld_Makefile.in,v 1.1 2014/01/26 03:49:01 ryoon Exp $
+
+--- ld/Makefile.in.orig	2013-11-26 11:37:33.000000000 +0000
++++ ld/Makefile.in
+@@ -576,6 +576,7 @@ ALL_EMULATION_SOURCES = \
+ 	eelf_i386_fbsd.c \
+ 	eelf_i386_ldso.c \
+ 	eelf_i386_nacl.c \
++	eelf_i386_obsd.c \
+ 	eelf_i386_sol2.c \
+ 	eelf_i386_vxworks.c \
+ 	eelf_s390.c \
+@@ -832,6 +833,7 @@ ALL_64_EMULATION_SOURCES = \
+ 	eelf_x86_64.c \
+ 	eelf_x86_64_fbsd.c \
+ 	eelf_x86_64_nacl.c \
++	eelf_x86_64_obsd.c \
+ 	eelf_x86_64_sol2.c \
+ 	ehppa64linux.c \
+ 	emmo.c \
+@@ -1260,6 +1262,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_fbsd.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_ldso.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_nacl.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_obsd.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_sol2.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_vxworks.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_k1om.Po@am__quote@
+@@ -1270,6 +1273,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_nacl.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_obsd.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/egld960.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/egld960coff.Po@am__quote@
+@@ -2752,6 +2756,10 @@ eelf32xtensa.c: $(srcdir)/emulparams/elf
+ eelf_i386.c: $(srcdir)/emulparams/elf_i386.sh \
+   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 	${GENSCRIPTS} elf_i386 "$(tdir_elf_i386)"
++eelf_x86_64_obsd.c: $(srcdir)/emulparams/elf_x86_64_obsd.sh \
++  $(srcdir)/emulparams/elf_x86_64.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} elf_x86_64_obsd "$(tdir_elf_x86_64_obsd)"
+ eelf_i386_be.c: $(srcdir)/emulparams/elf_i386_be.sh \
+   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 	${GENSCRIPTS} elf_i386_be "$(tdir_elf_i386_be)"
+@@ -2775,6 +2783,10 @@ eelf_i386_sol2.c: $(srcdir)/emulparams/e
+   $(srcdir)/emultempl/solaris2.em \
+   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+ 	${GENSCRIPTS} elf_i386_sol2 "$(tdir_elf_i386_sol2)"
++eelf_i386_obsd.c: $(srcdir)/emulparams/elf_i386_obsd.sh \
++  $(srcdir)/emulparams/elf_i386.sh \
++  $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
++	${GENSCRIPTS} elf_i386_obsd "$(tdir_elf_i386_obsd)"
+ eelf_i386_vxworks.c: $(srcdir)/emulparams/elf_i386_vxworks.sh \
+   $(srcdir)/emulparams/vxworks.sh $(srcdir)/emultempl/vxworks.em \
+   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
diff --git a/devel/binutils/patches/patch-ld_configure.tgt b/devel/binutils/patches/patch-ld_configure.tgt
new file mode 100644
index 00000000000..095c7e93d14
--- /dev/null
+++ b/devel/binutils/patches/patch-ld_configure.tgt
@@ -0,0 +1,17 @@
+$NetBSD: patch-ld_configure.tgt,v 1.1 2014/01/26 03:49:01 ryoon Exp $
+
+--- ld/configure.tgt.orig	2013-11-26 11:37:33.000000000 +0000
++++ ld/configure.tgt
+@@ -268,6 +268,12 @@ i[3-7]86-*-netbsdpe*)	targ_emul=i386pe
+ 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
+ i[3-7]86-*-netbsd*)	targ_emul=i386nbsd
+ 			targ_extra_emuls=elf_i386 ;;
++i[3-7]86-*-openbsd*)	targ_emul=elf_i386_obsd ;;
++x86_64-*-openbsd*)	targ_emul=elf_x86_64_obsd
++			targ_extra_emuls="elf_i386_obsd elf_i386"
++			tdir_elf_i386_obsd=`echo ${targ_alias} | \
++			sed -e 's/x86_64/i386/'`
++			;;
+ x86_64-*-netbsd*)	targ_emul=elf_x86_64
+ 			targ_extra_emuls="elf_i386 i386nbsd elf_l1om elf_k1om"
+ 			tdir_elf_i386=`echo ${targ_alias} | \
diff --git a/devel/binutils/patches/patch-ld_emulparams_elf__i386__obsd.sh b/devel/binutils/patches/patch-ld_emulparams_elf__i386__obsd.sh
new file mode 100644
index 00000000000..b83c604361f
--- /dev/null
+++ b/devel/binutils/patches/patch-ld_emulparams_elf__i386__obsd.sh
@@ -0,0 +1,29 @@
+$NetBSD: patch-ld_emulparams_elf__i386__obsd.sh,v 1.1 2014/01/26 03:49:01 ryoon Exp $
+
+--- ld/emulparams/elf_i386_obsd.sh.orig	2014-01-26 00:08:31.000000000 +0000
++++ ld/emulparams/elf_i386_obsd.sh
+@@ -0,0 +1,24 @@
++. ${srcdir}/emulparams/elf_i386.sh
++. ${srcdir}/emulparams/elf_obsd.sh
++
++if test "${LD_FLAG#"${LD_FLAG%pie}"}" = "pie"; then
++  TEXT_START_ADDR=0x0
++  if test "${LD_FLAG%%(cpie|pie)}" = "Z"; then
++    RODATA_PADSIZE=${MAXPAGESIZE}
++  else
++    RODATA_PADSIZE=0x20000000
++  fi
++else
++  if test "${LD_FLAG%%(cpie|pie)}" = "Z"; then
++    TEXT_START_ADDR=0x08048000
++    RODATA_PADSIZE=${MAXPAGESIZE}
++  else
++    TEXT_START_ADDR=0x1C000000
++    RODATA_PADSIZE=0x20000000
++  fi
++fi
++
++RODATA_ALIGN=". = ALIGN(${RODATA_PADSIZE})"
++RODATA_ALIGN_ADD="${TEXT_START_ADDR}"
++
++unset PAD_PLT
diff --git a/devel/binutils/patches/patch-ld_emulparams_elf__x86__64__obsd.sh b/devel/binutils/patches/patch-ld_emulparams_elf__x86__64__obsd.sh
new file mode 100644
index 00000000000..cc03fa09de7
--- /dev/null
+++ b/devel/binutils/patches/patch-ld_emulparams_elf__x86__64__obsd.sh
@@ -0,0 +1,7 @@
+$NetBSD: patch-ld_emulparams_elf__x86__64__obsd.sh,v 1.1 2014/01/26 03:49:01 ryoon Exp $
+
+--- ld/emulparams/elf_x86_64_obsd.sh.orig	2014-01-26 00:08:31.000000000 +0000
++++ ld/emulparams/elf_x86_64_obsd.sh
+@@ -0,0 +1,2 @@
++. ${srcdir}/emulparams/elf_x86_64.sh
++. ${srcdir}/emulparams/elf_obsd.sh