summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/binutils
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-15 23:15:00 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-06-22 09:16:00 +0100
commit4c2d0b1205be2c0e42cafea1de18e46edf4a374b (patch)
tree929918f4745764c3b5618f1489e540cf0645eeb4 /meta/recipes-devtools/binutils
parent39df3561d8cb0d6d86d492bb462640cf2f0a760a (diff)
downloadpoky-4c2d0b1205be2c0e42cafea1de18e46edf4a374b.tar.gz
meta: Remove further uclibc remnants (inc. patches and site files)
Some of these are clearly dead, e.g. one binutils patch reverts the effects of the earlier one. This also removes the uclibc site files. We now have mechanisms to allow these to be extended from another layer should someone ever wish to do that. (From OE-Core rev: e01e7c543a559c8926d72159b5cd55db0c661434) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/binutils')
-rw-r--r--meta/recipes-devtools/binutils/binutils-2.28.inc2
-rw-r--r--meta/recipes-devtools/binutils/binutils/0003-gprof-add-uclibc-support-to-configure.patch31
-rw-r--r--meta/recipes-devtools/binutils/binutils/0006-Explicitly-link-with-libm-on-uclibc.patch52
-rw-r--r--meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch12
4 files changed, 0 insertions, 97 deletions
diff --git a/meta/recipes-devtools/binutils/binutils-2.28.inc b/meta/recipes-devtools/binutils/binutils-2.28.inc
index b37bb0e03a..47bfa1aa98 100644
--- a/meta/recipes-devtools/binutils/binutils-2.28.inc
+++ b/meta/recipes-devtools/binutils/binutils-2.28.inc
@@ -21,10 +21,8 @@ UPSTREAM_CHECK_GITTAGREGEX = "binutils-(?P<pver>\d+_(\d_?)*)"
21SRCREV = "cb44d42ce6ef0c7a4eed7e2a3c272ac102166850" 21SRCREV = "cb44d42ce6ef0c7a4eed7e2a3c272ac102166850"
22SRC_URI = "\ 22SRC_URI = "\
23 git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \ 23 git://sourceware.org/git/binutils-gdb.git;branch=binutils-${BINUPV}-branch;protocol=git \
24 file://0003-gprof-add-uclibc-support-to-configure.patch \
25 file://0004-Point-scripts-location-to-libdir.patch \ 24 file://0004-Point-scripts-location-to-libdir.patch \
26 file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \ 25 file://0005-Only-generate-an-RPATH-entry-if-LD_RUN_PATH-is-not-e.patch \
27 file://0006-Explicitly-link-with-libm-on-uclibc.patch \
28 file://0007-Use-libtool-2.4.patch \ 26 file://0007-Use-libtool-2.4.patch \
29 file://0008-Add-the-armv5e-architecture-to-binutils.patch \ 27 file://0008-Add-the-armv5e-architecture-to-binutils.patch \
30 file://0009-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \ 28 file://0009-don-t-let-the-distro-compiler-point-to-the-wrong-ins.patch \
diff --git a/meta/recipes-devtools/binutils/binutils/0003-gprof-add-uclibc-support-to-configure.patch b/meta/recipes-devtools/binutils/binutils/0003-gprof-add-uclibc-support-to-configure.patch
deleted file mode 100644
index eddb42b4e3..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0003-gprof-add-uclibc-support-to-configure.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 7893d2b24d0303bda3a0049846489619ffd1387b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:07:33 +0000
4Subject: [PATCH 03/15] gprof: add uclibc support to configure
5
6Upstream-Status: Pending
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9---
10 gprof/configure | 5 +++++
11 1 file changed, 5 insertions(+)
12
13diff --git a/gprof/configure b/gprof/configure
14index 9e6b8f3525..38a4c0b0e5 100755
15--- a/gprof/configure
16+++ b/gprof/configure
17@@ -5874,6 +5874,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
18 lt_cv_deplibs_check_method=pass_all
19 ;;
20
21+linux-uclibc*)
22+ lt_cv_deplibs_check_method=pass_all
23+ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
24+ ;;
25+
26 netbsd*)
27 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
28 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
29--
302.12.0
31
diff --git a/meta/recipes-devtools/binutils/binutils/0006-Explicitly-link-with-libm-on-uclibc.patch b/meta/recipes-devtools/binutils/binutils/0006-Explicitly-link-with-libm-on-uclibc.patch
deleted file mode 100644
index 9770ca7f0f..0000000000
--- a/meta/recipes-devtools/binutils/binutils/0006-Explicitly-link-with-libm-on-uclibc.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From 6a46bf151d7e53df8b5e7645a2d241967688368a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:32:49 +0000
4Subject: [PATCH 06/15] Explicitly link with libm on uclibc
5
6Description:
7
8We do not need to have the libtool patch anymore for binutils after
9libtool has been updated upstream it include support for it. However
10for building gas natively on uclibc systems we have to link it with
11-lm so that it picks up missing symbols.
12
13/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o):
14In function `floatformat_from_double':
15floatformat.c:(.text+0x1ec): undefined reference to `frexp'
16floatformat.c:(.text+0x2f8): undefined reference to `ldexp'
17/local/build_area/BUILD/arm_v5t_le_uclibc/binutils-2.17.50/objdir/libiberty/pic/libiberty.a(floatformat.o):
18In function `floatformat_to_double':
19floatformat.c:(.text+0x38a): undefined reference to `ldexp'
20floatformat.c:(.text+0x3d2): undefined reference to `ldexp'
21floatformat.c:(.text+0x43e): undefined reference to `ldexp'
22floatformat.c:(.text+0x4e2): undefined reference to `ldexp'
23collect2: ld returned 1 exit status
24make[4]: *** [as-new] Error 1
25
26Upstream-Status: Pending
27
28Signed-off-by: Khem Raj <raj.khem@gmail.com>
29---
30 gas/configure.tgt | 6 ++++++
31 1 file changed, 6 insertions(+)
32
33diff --git a/gas/configure.tgt b/gas/configure.tgt
34index 711d537e95..7cd2dc176a 100644
35--- a/gas/configure.tgt
36+++ b/gas/configure.tgt
37@@ -494,6 +494,12 @@ case ${generic_target} in
38 *-*-netware) fmt=elf em=netware ;;
39 esac
40
41+case ${generic_target} in
42+ arm-*-*uclibc*)
43+ need_libm=yes
44+ ;;
45+esac
46+
47 case ${cpu_type} in
48 aarch64 | alpha | arm | i386 | ia64 | microblaze | mips | ns32k | or1k | or1knd | pdp11 | ppc | riscv | sparc | z80 | z8k)
49 bfd_gas=yes
50--
512.12.0
52
diff --git a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
index 6b7f753891..4f0ef101db 100644
--- a/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
+++ b/meta/recipes-devtools/binutils/binutils/0007-Use-libtool-2.4.patch
@@ -5894,18 +5894,6 @@ index 38a4c0b0e5..38d1f699c7 100755
5894 lt_cv_file_magic_cmd='$OBJDUMP -f' 5894 lt_cv_file_magic_cmd='$OBJDUMP -f'
5895 fi 5895 fi
5896 ;; 5896 ;;
5897@@ -5874,11 +5960,6 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
5898 lt_cv_deplibs_check_method=pass_all
5899 ;;
5900
5901-linux-uclibc*)
5902- lt_cv_deplibs_check_method=pass_all
5903- lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
5904- ;;
5905-
5906 netbsd*)
5907 if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
5908 lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
5909@@ -5956,6 +6037,21 @@ esac 5897@@ -5956,6 +6037,21 @@ esac
5910 fi 5898 fi
5911 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5 5899 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5