From 009407e6be898abedb308247a82e4dee525e6570 Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 31 Dec 2010 08:39:01 -0300 Subject: binutils: make it a proper package * Convert binutils to a proper autotargets package * Add version 2.21 and drop version 2.17 * Hook up packaged binutils for target gcc * Build tools are on HOST_DIR now so change it * Move cross/host gcc to HOST_DIR * Drop kludge from commit 3c77bab2eeace3ee675bd745ca335fa3dd1630bb This is fixed in the next commit "gcc: install copies of libgcc, libstdc++ and libgcj to the sysroot" - tested for arm & x86_64 targets. * TARGET_CROSS now pointed to HOST_DIR too [Peter: Config.in tweaks] Signed-off-by: Gustavo Zacarias Signed-off-by: Peter Korsgaard --- .../binutils-2.18/100-makeinfo-version.patch | 32 ++++++++++++++++++++++ .../binutils/binutils-2.18/110-arm-eabi-conf.patch | 24 ++++++++++++++++ .../binutils-2.18/300-001_ld_makefile_patch.patch | 24 ++++++++++++++++ .../300-012_check_ldrunpath_length.patch | 21 ++++++++++++++ 4 files changed, 101 insertions(+) create mode 100644 package/binutils/binutils-2.18/100-makeinfo-version.patch create mode 100644 package/binutils/binutils-2.18/110-arm-eabi-conf.patch create mode 100644 package/binutils/binutils-2.18/300-001_ld_makefile_patch.patch create mode 100644 package/binutils/binutils-2.18/300-012_check_ldrunpath_length.patch (limited to 'package/binutils/binutils-2.18') diff --git a/package/binutils/binutils-2.18/100-makeinfo-version.patch b/package/binutils/binutils-2.18/100-makeinfo-version.patch new file mode 100644 index 000000000..d911d6236 --- /dev/null +++ b/package/binutils/binutils-2.18/100-makeinfo-version.patch @@ -0,0 +1,32 @@ +diff -u binutils-2.18-orig/configure binutils-2.18/configure +--- binutils-2.18-orig/configure 2007-08-06 16:29:40.000000000 -0400 ++++ binutils-2.18/configure 2007-09-27 22:41:51.000000000 -0400 +@@ -6125,10 +6125,10 @@ + *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; + *) + +- # For an installed makeinfo, we require it to be from texinfo 4.4 or ++ # For an installed makeinfo, we require it to be from texinfo 4.6 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" +diff -u binutils-2.18-orig/configure.ac binutils-2.18/configure.ac +--- binutils-2.18-orig/configure.ac 2007-08-28 16:24:26.000000000 -0400 ++++ binutils-2.18/configure.ac 2007-09-27 22:41:00.000000000 -0400 +@@ -2400,10 +2400,10 @@ + *" texinfo "*) MAKEINFO='$$r/$(BUILD_SUBDIR)/texinfo/makeinfo/makeinfo' ;; + *) + changequote(,) +- # For an installed makeinfo, we require it to be from texinfo 4.4 or ++ # For an installed makeinfo, we require it to be from texinfo 4.6 or + # higher, else we use the "missing" dummy. + if ${MAKEINFO} --version \ +- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then ++ | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then + : + else + MAKEINFO="$MISSING makeinfo" diff --git a/package/binutils/binutils-2.18/110-arm-eabi-conf.patch b/package/binutils/binutils-2.18/110-arm-eabi-conf.patch new file mode 100644 index 000000000..04e19bea3 --- /dev/null +++ b/package/binutils/binutils-2.18/110-arm-eabi-conf.patch @@ -0,0 +1,24 @@ +diff -u binutils-2.17.50.0.17.oorig/configure binutils-2.17.50.0.17/configure +--- binutils-2.17.50.0.17.oorig/configure 2007-06-18 19:29:28.000000000 +0200 ++++ binutils-2.17.50.0.17/configure 2007-06-25 09:58:36.000000000 +0200 +@@ -2224,7 +2224,7 @@ + arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + noconfigdirs="$noconfigdirs target-libjava target-libobjc" + ;; +diff -u binutils-2.17.50.0.17.oorig/configure.ac binutils-2.17.50.0.17/configure.ac +--- binutils-2.17.50.0.17.oorig/configure.ac 2007-06-18 19:29:28.000000000 +0200 ++++ binutils-2.17.50.0.17/configure.ac 2007-06-25 09:58:36.000000000 +0200 +@@ -513,7 +513,7 @@ + arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* ) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + ;; +- arm*-*-linux-gnueabi) ++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) + noconfigdirs="$noconfigdirs target-libffi target-qthreads" + noconfigdirs="$noconfigdirs target-libjava target-libobjc" + ;; diff --git a/package/binutils/binutils-2.18/300-001_ld_makefile_patch.patch b/package/binutils/binutils-2.18/300-001_ld_makefile_patch.patch new file mode 100644 index 000000000..5cb0f614d --- /dev/null +++ b/package/binutils/binutils-2.18/300-001_ld_makefile_patch.patch @@ -0,0 +1,24 @@ +diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am +--- binutils-2.17.50.0.17.oorig/ld/Makefile.am 2007-06-18 19:29:29.000000000 +0200 ++++ binutils-2.17.50.0.17/ld/Makefile.am 2007-06-25 10:00:36.000000000 +0200 +@@ -18,7 +18,7 @@ + # 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@ +diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in +--- binutils-2.17.50.0.17.oorig/ld/Makefile.in 2007-06-18 19:29:29.000000000 +0200 ++++ binutils-2.17.50.0.17/ld/Makefile.in 2007-06-25 10:00:36.000000000 +0200 +@@ -287,7 +287,7 @@ + # 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 diff --git a/package/binutils/binutils-2.18/300-012_check_ldrunpath_length.patch b/package/binutils/binutils-2.18/300-012_check_ldrunpath_length.patch new file mode 100644 index 000000000..6e809213d --- /dev/null +++ b/package/binutils/binutils-2.18/300-012_check_ldrunpath_length.patch @@ -0,0 +1,21 @@ +diff -u binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em binutils-2.17.50.0.17/ld/emultempl/elf32.em +--- binutils-2.17.50.0.17.oorig/ld/emultempl/elf32.em 2007-06-18 19:31:40.000000000 +0200 ++++ binutils-2.17.50.0.17/ld/emultempl/elf32.em 2007-06-25 10:01:25.000000000 +0200 +@@ -1007,6 +1007,8 @@ + && command_line.rpath == NULL) + { + lib_path = (const char *) getenv ("LD_RUN_PATH"); ++ if ((lib_path) && (strlen (lib_path) == 0)) ++ lib_path = NULL; + if (gld${EMULATION_NAME}_search_needed (lib_path, &n, + force)) + break; +@@ -1191,6 +1193,8 @@ + rpath = command_line.rpath; + if (rpath == NULL) + rpath = (const char *) getenv ("LD_RUN_PATH"); ++ if ((rpath) && (strlen (rpath) == 0)) ++ rpath = NULL; + if (! (bfd_elf_size_dynamic_sections + (output_bfd, command_line.soname, rpath, + command_line.filter_shlib, -- cgit v1.2.3