mirror of https://github.com/hak5/openwrt-owl.git
parent
81e28be824
commit
aba071d818
|
@ -22,6 +22,11 @@ choice
|
||||||
bool "ARC binutils 2.28"
|
bool "ARC binutils 2.28"
|
||||||
select BINUTILS_VERSION_2_28_ARC
|
select BINUTILS_VERSION_2_28_ARC
|
||||||
|
|
||||||
|
config BINUTILS_USE_VERSION_2_29_1
|
||||||
|
depends on !arc
|
||||||
|
bool "Binutils 2.29.1"
|
||||||
|
select BINUTILS_VERSION_2_29_1
|
||||||
|
|
||||||
endchoice
|
endchoice
|
||||||
|
|
||||||
config EXTRA_BINUTILS_CONFIG_OPTIONS
|
config EXTRA_BINUTILS_CONFIG_OPTIONS
|
||||||
|
|
|
@ -9,8 +9,12 @@ config BINUTILS_VERSION_2_28_ARC
|
||||||
default y if (!TOOLCHAINOPTS && arc)
|
default y if (!TOOLCHAINOPTS && arc)
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
config BINUTILS_VERSION_2_29_1
|
||||||
|
bool
|
||||||
|
|
||||||
config BINUTILS_VERSION
|
config BINUTILS_VERSION
|
||||||
string
|
string
|
||||||
default "2.27" if BINUTILS_VERSION_2_27
|
default "2.27" if BINUTILS_VERSION_2_27
|
||||||
default "2.28" if BINUTILS_VERSION_2_28
|
default "2.28" if BINUTILS_VERSION_2_28
|
||||||
|
default "2.29.1" if BINUTILS_VERSION_2_29_1
|
||||||
default "arc-2017.03" if BINUTILS_VERSION_2_28_ARC
|
default "arc-2017.03" if BINUTILS_VERSION_2_28_ARC
|
||||||
|
|
|
@ -21,6 +21,10 @@ ifeq ($(PKG_VERSION),2.28)
|
||||||
PKG_HASH:=6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72
|
PKG_HASH:=6297433ee120b11b4b0a1c8f3512d7d73501753142ab9e2daa13c5a3edd32a72
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifeq ($(PKG_VERSION),2.29.1)
|
||||||
|
PKG_HASH:=1509dff41369fb70aed23682351b663b56db894034773e6dbf7d5d6071fc55cc
|
||||||
|
endif
|
||||||
|
|
||||||
ifneq ($(CONFIG_BINUTILS_VERSION_2_28_ARC),)
|
ifneq ($(CONFIG_BINUTILS_VERSION_2_28_ARC),)
|
||||||
PKG_REV:=arc-2017.03-release
|
PKG_REV:=arc-2017.03-release
|
||||||
PKG_SOURCE_URL:=https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/archive/$(PKG_REV)/
|
PKG_SOURCE_URL:=https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb/archive/$(PKG_REV)/
|
||||||
|
|
|
@ -0,0 +1,22 @@
|
||||||
|
--- a/ld/Makefile.am
|
||||||
|
+++ b/ld/Makefile.am
|
||||||
|
@@ -57,7 +57,7 @@ endif
|
||||||
|
# We put the scripts in the directory $(scriptdir)/ldscripts.
|
||||||
|
# We can't put the scripts in $(datadir) because the SEARCH_DIR
|
||||||
|
# directives need to be different for native and cross linkers.
|
||||||
|
-scriptdir = $(tooldir)/lib
|
||||||
|
+scriptdir = $(libdir)
|
||||||
|
|
||||||
|
EMUL = @EMUL@
|
||||||
|
EMULATION_OFILES = @EMULATION_OFILES@
|
||||||
|
--- a/ld/Makefile.in
|
||||||
|
+++ b/ld/Makefile.in
|
||||||
|
@@ -446,7 +446,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS)
|
||||||
|
# We put the scripts in the directory $(scriptdir)/ldscripts.
|
||||||
|
# We can't put the scripts in $(datadir) because the SEARCH_DIR
|
||||||
|
# directives need to be different for native and cross linkers.
|
||||||
|
-scriptdir = $(tooldir)/lib
|
||||||
|
+scriptdir = $(libdir)
|
||||||
|
BASEDIR = $(srcdir)/..
|
||||||
|
BFDDIR = $(BASEDIR)/bfd
|
||||||
|
INCDIR = $(BASEDIR)/include
|
|
@ -0,0 +1,20 @@
|
||||||
|
--- a/ld/emultempl/elf32.em
|
||||||
|
+++ b/ld/emultempl/elf32.em
|
||||||
|
@@ -1463,6 +1463,8 @@ fragment <<EOF
|
||||||
|
&& command_line.rpath == NULL)
|
||||||
|
{
|
||||||
|
path = (const char *) getenv ("LD_RUN_PATH");
|
||||||
|
+ if ((path) && (strlen (path) == 0))
|
||||||
|
+ path = NULL;
|
||||||
|
if (path
|
||||||
|
&& gld${EMULATION_NAME}_search_needed (path, &n, force))
|
||||||
|
break;
|
||||||
|
@@ -1740,6 +1742,8 @@ gld${EMULATION_NAME}_before_allocation (
|
||||||
|
rpath = command_line.rpath;
|
||||||
|
if (rpath == NULL)
|
||||||
|
rpath = (const char *) getenv ("LD_RUN_PATH");
|
||||||
|
+ if ((rpath) && (strlen (rpath) == 0))
|
||||||
|
+ rpath = NULL;
|
||||||
|
|
||||||
|
for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
|
||||||
|
if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
|
|
@ -0,0 +1,18 @@
|
||||||
|
--- a/bfd/elfxx-mips.c
|
||||||
|
+++ b/bfd/elfxx-mips.c
|
||||||
|
@@ -7871,6 +7871,7 @@ _bfd_mips_elf_create_dynamic_sections (b
|
||||||
|
|
||||||
|
name = SGI_COMPAT (abfd) ? "_DYNAMIC_LINK" : "_DYNAMIC_LINKING";
|
||||||
|
bh = NULL;
|
||||||
|
+ if (0) {
|
||||||
|
if (!(_bfd_generic_link_add_one_symbol
|
||||||
|
(info, abfd, name, BSF_GLOBAL, bfd_abs_section_ptr, 0,
|
||||||
|
NULL, FALSE, get_elf_backend_data (abfd)->collect, &bh)))
|
||||||
|
@@ -7883,6 +7884,7 @@ _bfd_mips_elf_create_dynamic_sections (b
|
||||||
|
|
||||||
|
if (! bfd_elf_link_record_dynamic_symbol (info, h))
|
||||||
|
return FALSE;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (! mips_elf_hash_table (info)->use_rld_obj_head)
|
||||||
|
{
|
|
@ -0,0 +1,37 @@
|
||||||
|
--- a/bfd/config.bfd
|
||||||
|
+++ b/bfd/config.bfd
|
||||||
|
@@ -1186,12 +1186,12 @@ case "${targ}" in
|
||||||
|
targ_selvecs="mips_elf32_le_vec mips_elf64_be_vec mips_elf64_le_vec mips_ecoff_be_vec mips_ecoff_le_vec"
|
||||||
|
;;
|
||||||
|
mips64*el-*-linux*)
|
||||||
|
- targ_defvec=mips_elf32_ntrad_le_vec
|
||||||
|
- targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_le_vec mips_elf64_trad_be_vec"
|
||||||
|
+ targ_defvec=mips_elf64_trad_le_vec
|
||||||
|
+ targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_ntrad_be_vec mips_elf32_trad_le_vec mips_elf32_trad_be_vec mips_elf64_trad_be_vec"
|
||||||
|
;;
|
||||||
|
mips64*-*-linux*)
|
||||||
|
- targ_defvec=mips_elf32_ntrad_be_vec
|
||||||
|
- targ_selvecs="mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_be_vec mips_elf64_trad_le_vec"
|
||||||
|
+ targ_defvec=mips_elf64_trad_be_vec
|
||||||
|
+ targ_selvecs="mips_elf32_ntrad_be_vec mips_elf32_ntrad_le_vec mips_elf32_trad_be_vec mips_elf32_trad_le_vec mips_elf64_trad_le_vec"
|
||||||
|
;;
|
||||||
|
mips*el-*-linux*)
|
||||||
|
targ_defvec=mips_elf32_trad_le_vec
|
||||||
|
--- a/ld/configure.tgt
|
||||||
|
+++ b/ld/configure.tgt
|
||||||
|
@@ -530,11 +530,11 @@ mips*el-*-vxworks*) targ_emul=elf32elmip
|
||||||
|
mips*-*-vxworks*) targ_emul=elf32ebmipvxworks
|
||||||
|
targ_extra_emuls="elf32elmipvxworks" ;;
|
||||||
|
mips*-*-windiss) targ_emul=elf32mipswindiss ;;
|
||||||
|
-mips64*el-*-linux-*) targ_emul=elf32ltsmipn32
|
||||||
|
- targ_extra_emuls="elf32btsmipn32 elf32ltsmip elf32btsmip elf64ltsmip elf64btsmip"
|
||||||
|
+mips64*el-*-linux-*) targ_emul=elf64ltsmip
|
||||||
|
+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32ltsmip elf32btsmip elf64btsmip"
|
||||||
|
targ_extra_libpath=$targ_extra_emuls ;;
|
||||||
|
-mips64*-*-linux-*) targ_emul=elf32btsmipn32
|
||||||
|
- targ_extra_emuls="elf32ltsmipn32 elf32btsmip elf32ltsmip elf64btsmip elf64ltsmip"
|
||||||
|
+mips64*-*-linux-*) targ_emul=elf64btsmip
|
||||||
|
+ targ_extra_emuls="elf32btsmipn32 elf32ltsmipn32 elf32btsmip elf32ltsmip elf64ltsmip"
|
||||||
|
targ_extra_libpath=$targ_extra_emuls ;;
|
||||||
|
mips*el-*-linux-*) targ_emul=elf32ltsmip
|
||||||
|
targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip"
|
Loading…
Reference in New Issue