Update to 2.25

Changelog:
Not available?
As far as I know:
* Add Andes NDS32 architecture support.
* Improve Solaris support.
This commit is contained in:
ryoon 2015-06-09 20:24:39 +00:00
parent a0550cc054
commit a0f89fa59c
13 changed files with 76 additions and 244 deletions

View file

@ -1,7 +1,6 @@
# $NetBSD: Makefile,v 1.68 2015/03/20 22:46:09 joerg Exp $
# $NetBSD: Makefile,v 1.69 2015/06/09 20:24:39 ryoon Exp $
DISTNAME= binutils-2.24
PKGREVISION= 3
DISTNAME= binutils-2.25
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=binutils/}
@ -21,6 +20,7 @@ REPLACE_LOCALEDIR_PATTERNS+= Make-in
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_TOOLS+= gmake
# PR pkg/48504, ksh is sufficient for NetBSD 5.2 and NetBSD 6.1
.include "../../mk/bsd.prefs.mk"
@ -44,7 +44,7 @@ INSTALLATION_DIRS= ${PKGGNUDIR}bin ${PKGGNUDIR}${PKGMANDIR}/man1
# gprof (XXX: and others?) cannot be built on all platforms
#
PLIST_VARS+= gprof ld gold
PLIST_VARS+= gprof ld gold SunOS
.include "../../mk/bsd.prefs.mk"
@ -58,6 +58,10 @@ PLIST.ld= yes
EXTRA_FILES+= ld
.endif
.if ${OPSYS} == SunOS
PLIST.SunOS= yes
.endif
.if ${OPSYS} == DragonFly \
|| (${OPSYS} == FreeBSD && empty(OS_VERSION:M[12345678].*)) \
|| (${OPSYS} == OpenBSD && empty(OS_VERSION:M[1234].*)) \

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST.common,v 1.23 2014/05/12 12:49:59 marino Exp $
@comment $NetBSD: PLIST.common,v 1.24 2015/06/09 20:24:39 ryoon Exp $
${MACHINE_GNU_PLATFORM}/bin/ar
${MACHINE_GNU_PLATFORM}/bin/as
${MACHINE_GNU_PLATFORM}/bin/ld
@ -70,6 +70,7 @@ include/bfd.h
include/bfdlink.h
include/dis-asm.h
${PLIST.gold}include/plugin-api.h
${PLIST.SunOS}include/plugin-api.h
include/symcat.h
info/as.info
info/bfd.info
@ -132,6 +133,7 @@ ${PLIST.gprof}share/locale/ga/LC_MESSAGES/gprof.mo
share/locale/ga/LC_MESSAGES/ld.mo
share/locale/ga/LC_MESSAGES/opcodes.mo
share/locale/hr/LC_MESSAGES/binutils.mo
${PLIST.gprof}share/locale/hu/LC_MESSAGES/gprof.mo
${PLIST.gprof}share/locale/id/LC_MESSAGES/gprof.mo
share/locale/id/LC_MESSAGES/bfd.mo
share/locale/id/LC_MESSAGES/binutils.mo
@ -168,6 +170,7 @@ share/locale/rw/LC_MESSAGES/gas.mo
${PLIST.gprof}share/locale/rw/LC_MESSAGES/gprof.mo
share/locale/sk/LC_MESSAGES/binutils.mo
${PLIST.gprof}share/locale/sr/LC_MESSAGES/gprof.mo
share/locale/sr/LC_MESSAGES/binutils.mo
share/locale/sv/LC_MESSAGES/bfd.mo
share/locale/sv/LC_MESSAGES/binutils.mo
${PLIST.gprof}share/locale/sv/LC_MESSAGES/gprof.mo
@ -182,6 +185,7 @@ share/locale/tr/LC_MESSAGES/opcodes.mo
share/locale/uk/LC_MESSAGES/bfd.mo
share/locale/uk/LC_MESSAGES/binutils.mo
${PLIST.gprof}share/locale/uk/LC_MESSAGES/gprof.mo
share/locale/uk/LC_MESSAGES/gas.mo
share/locale/uk/LC_MESSAGES/ld.mo
share/locale/uk/LC_MESSAGES/opcodes.mo
share/locale/vi/LC_MESSAGES/bfd.mo

View file

@ -1,21 +1,17 @@
$NetBSD: distinfo,v 1.21 2015/03/24 14:23:14 joerg Exp $
$NetBSD: distinfo,v 1.22 2015/06/09 20:24:39 ryoon Exp $
SHA1 (binutils-2.24.tar.bz2) = 7ac75404ddb3c4910c7594b51ddfc76d4693debb
RMD160 (binutils-2.24.tar.bz2) = b4aa3ea5ba9d0d9f817b2cf136e7f911f692af8d
Size (binutils-2.24.tar.bz2) = 22716802 bytes
SHA1 (binutils-2.25.tar.bz2) = b46cc90ebaba7ffcf6c6d996d60738881b14e50d
RMD160 (binutils-2.25.tar.bz2) = af6f54aa304d4840e1b1a3bd8a4cd165b30f9c1e
Size (binutils-2.25.tar.bz2) = 24049133 bytes
SHA1 (patch-aa) = 1a127f82c807cbd1ac6fee073c618f3fb48667f6
SHA1 (patch-bfd_cache.c) = 5f98b965514286c8110516dd665924709708e78c
SHA1 (patch-bfd_cache.c) = db48182cee9f0bf16fbefca260b542171f0ef596
SHA1 (patch-configure.ac) = 7bd7b90e57d850705286f2cc6464ecc45e0657c0
SHA1 (patch-gas_config_tc-i386.c) = 16b04ee6c3c46db375c883b4338bf5d796174458
SHA1 (patch-gas_configure) = 2365091529f5444c8c3a0615304cd4a2b043625c
SHA1 (patch-gold_Makefile.in) = ca87f7589025752713127110cbf9738f1080b62a
SHA1 (patch-gold_options.h) = 3a1f9f59a1ce105f8f8d5a09fe60e0fe673b61a9
SHA1 (patch-gold_resolve.cc) = 7e6c45cafddc73a4195c4bdacc43102a0fde3c13
SHA1 (patch-gold_stringpool.cc) = 16b624c8ffba07f5fb6dc1c787a9b35ffa8d89c3
SHA1 (patch-gold_system.h) = ae922300660cd9f1105d7fa69cfd4a5d29b8bfd9
SHA1 (patch-gold_system.h) = 68655247b884cd520daf6a98cbc3f365396049bd
SHA1 (patch-include_safe-ctype.h) = 480c46b1528f623435e9b52b7ba8247745e4e254
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

View file

@ -1,11 +1,11 @@
$NetBSD: patch-bfd_cache.c,v 1.2 2014/05/12 13:17:01 jperkin Exp $
$NetBSD: patch-bfd_cache.c,v 1.3 2015/06/09 20:24:39 ryoon Exp $
Fix sign-compare on SunOS.
Handle 256 file descriptor limit in 32-bit SunOS environment.
--- bfd/cache.c.orig 2013-11-04 15:33:37.000000000 +0000
--- bfd/cache.c.orig 2014-10-14 07:32:02.000000000 +0000
+++ bfd/cache.c
@@ -51,6 +51,10 @@ SUBSECTION
@@ -50,6 +50,10 @@ SUBSECTION
#include <sys/mman.h>
#endif
@ -16,21 +16,7 @@ Handle 256 file descriptor limit in 32-bit SunOS environment.
/* In some cases we can optimize cache operation when reopening files.
For instance, a flush is entirely unnecessary if the file is already
closed, so a flush would use CACHE_NO_OPEN. Similarly, a seek using
@@ -81,8 +85,13 @@ bfd_cache_max_open (void)
int max;
#ifdef HAVE_GETRLIMIT
struct rlimit rlim;
+#ifdef __sun
+ if (getrlimit (RLIMIT_NOFILE, &rlim) == 0
+ && rlim.rlim_cur != (rlim_t)RLIM_INFINITY)
+#else
if (getrlimit (RLIMIT_NOFILE, &rlim) == 0
&& rlim.rlim_cur != RLIM_INFINITY)
+#endif
max = rlim.rlim_cur / 8;
else
#endif /* HAVE_GETRLIMIT */
@@ -91,6 +100,9 @@ bfd_cache_max_open (void)
@@ -90,6 +94,9 @@ bfd_cache_max_open (void)
#else
max = 10;
#endif /* _SC_OPEN_MAX */

View file

@ -1,18 +0,0 @@
$NetBSD: patch-gas_config_tc-i386.c,v 1.1 2014/01/06 14:58:41 wiz Exp $
Comment out unused variables (-Wno-unused complains about them,
and with -Werror build fails).
--- gas/config/tc-i386.c.orig 2013-11-26 11:37:33.000000000 +0000
+++ gas/config/tc-i386.c
@@ -1665,8 +1665,8 @@ static const i386_operand_type imm16_32
static const i386_operand_type imm16_32s = OPERAND_TYPE_IMM16_32S;
static const i386_operand_type imm16_32_32s = OPERAND_TYPE_IMM16_32_32S;
static const i386_operand_type vec_imm4 = OPERAND_TYPE_VEC_IMM4;
-static const i386_operand_type regbnd = OPERAND_TYPE_REGBND;
-static const i386_operand_type vec_disp8 = OPERAND_TYPE_VEC_DISP8;
+//static const i386_operand_type regbnd = OPERAND_TYPE_REGBND;
+//static const i386_operand_type vec_disp8 = OPERAND_TYPE_VEC_DISP8;
enum operand_type
{

View file

@ -0,0 +1,49 @@
$NetBSD: patch-gas_configure,v 1.1 2015/06/09 20:24:39 ryoon Exp $
--- gas/configure.orig 2014-12-23 14:22:05.000000000 +0000
+++ gas/configure
@@ -12331,7 +12331,7 @@ $as_echo "$with_arch" >&6; }
# Decide features one by one.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-dx-regs" >&5
$as_echo_n "checking for default configuration of --enable-dx-regs... " >&6; }
- if test "x${enable_dx_regs}" == xyes; then
+ if test "x${enable_dx_regs}" = xyes; then
$as_echo "#define NDS32_DEFAULT_DX_REGS 1" >>confdefs.h
@@ -12345,7 +12345,7 @@ $as_echo "$enable_dx_regs" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-perf-ext" >&5
$as_echo_n "checking for default configuration of --enable-perf-ext... " >&6; }
- if test "x${enable_perf_ext}" == xno; then
+ if test "x${enable_perf_ext}" = xno; then
$as_echo "#define NDS32_DEFAULT_PERF_EXT 0" >>confdefs.h
@@ -12359,7 +12359,7 @@ $as_echo "$enable_perf_ext" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-perf-ext2" >&5
$as_echo_n "checking for default configuration of --enable-perf-ext2... " >&6; }
- if test "x${enable_perf_ext2}" == xno; then
+ if test "x${enable_perf_ext2}" = xno; then
$as_echo "#define NDS32_DEFAULT_PERF_EXT2 0" >>confdefs.h
@@ -12373,7 +12373,7 @@ $as_echo "$enable_perf_ext2" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-string-ext" >&5
$as_echo_n "checking for default configuration of --enable-string-ext... " >&6; }
- if test "x${enable_string_ext}" == xno; then
+ if test "x${enable_string_ext}" = xno; then
$as_echo "#define NDS32_DEFAULT_STRING_EXT 0" >>confdefs.h
@@ -12387,7 +12387,7 @@ $as_echo "$enable_string_ext" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for default configuration of --enable-audio-ext" >&5
$as_echo_n "checking for default configuration of --enable-audio-ext... " >&6; }
- if test "x${enable_audio_ext}" == xno; then
+ if test "x${enable_audio_ext}" = xno; then
$as_echo "#define NDS32_DEFAULT_AUDIO_EXT 0" >>confdefs.h

View file

@ -1,16 +0,0 @@
$NetBSD: patch-gold_stringpool.cc,v 1.1 2015/03/24 14:23:14 joerg Exp $
--- gold/stringpool.cc.orig 2015-03-23 13:45:40.000000000 +0000
+++ gold/stringpool.cc
@@ -73,7 +73,10 @@ Stringpool_template<Stringpool_char>::re
{
this->key_to_offset_.reserve(n);
-#if defined(HAVE_TR1_UNORDERED_MAP)
+#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
+ this->string_set_.rehash(this->string_set_.size() + n);
+ return;
+#elif defined(HAVE_TR1_UNORDERED_MAP)
// rehash() implementation is broken in gcc 4.0.3's stl
//this->string_set_.rehash(this->string_set_.size() + n);
//return;

View file

@ -1,28 +1,8 @@
$NetBSD: patch-gold_system.h,v 1.2 2015/03/24 14:23:14 joerg Exp $
$NetBSD: patch-gold_system.h,v 1.3 2015/06/09 20:24:39 ryoon Exp $
--- gold/system.h.orig 2013-11-04 15:33:39.000000000 +0000
--- gold/system.h.orig 2014-10-14 07:32:04.000000000 +0000
+++ gold/system.h
@@ -56,8 +56,18 @@
#endif
// Figure out how to get a hash set and a hash map.
+#include <cstddef>
+#if __cplusplus >= 201103L || defined(_LIBCPP_VERSION)
+#include <unordered_set>
+#include <unordered_map>
+
+#define Unordered_set std::unordered_set
+#define Unordered_map std::unordered_map
+#define Unordered_multimap std::unordered_multimap
-#if defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \
+#define reserve_unordered_map(map, n) ((map)->rehash(n))
+
+#elif defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \
&& defined(HAVE_TR1_UNORDERED_MAP_REHASH)
#include <tr1/unordered_set>
@@ -105,7 +115,7 @@ struct hash<std::string>
@@ -118,7 +118,7 @@ struct hash<std::string>
{
size_t
operator()(std::string s) const

View file

@ -1,42 +0,0 @@
$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}

View file

@ -1,58 +0,0 @@
$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}

View file

@ -1,17 +0,0 @@
$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} | \

View file

@ -1,29 +0,0 @@
$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

View file

@ -1,7 +0,0 @@
$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