summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2013-01-03 23:28:20 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-28 12:29:31 +0000
commitd7b8ad5c294e371eee7630840269a6df10511695 (patch)
tree6e3d3af850f79404e3bc388c96473e5167446dac /meta
parentb71a16e8ac18b5633ac3a52c60ad78dde37ede7b (diff)
downloadpoky-d7b8ad5c294e371eee7630840269a6df10511695.tar.gz
eglibc: Upgrade recipes 2.16 -> 2.17
Drop patches that are applied upstream Fix the license checksums for changes in LICENSES file the new changes add more copyright notices that were missing earlier Moving ports is no longer needed since ports is now part of libc proper Refresh tzselect-sh.patch to accomodate upstream changes C++ headers discovery relative to target sysroot is fixed differently upstream hence we drop use-sysroot-cxx-headers.patch aarch64 support is already available in 2.17 hence drop the local patches (From OE-Core rev: 83b6fe6d91b924be5a7676e6ee973ce26b5eefc5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/tcmode-default.inc2
-rw-r--r--meta/recipes-core/eglibc/cross-localedef-native_2.17.bb (renamed from meta/recipes-core/eglibc/cross-localedef-native_2.16.bb)12
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.16/0001-Add-ARM-specific-static-stubs.c.patch27
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.16/0001-Add-name_to_handle_at-open_by_handle-etc.-to-PowerPC.patch65
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.16/0001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch343
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.16/use-sysroot-cxx-headers.patch42
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/0001-R_ARM_TLS_DTPOFF32.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/0001-R_ARM_TLS_DTPOFF32.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/0001-eglibc-menuconfig-support.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/0001-eglibc-menuconfig-support.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/0002-eglibc-menuconfig-hex-string-options.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/0002-eglibc-menuconfig-hex-string-options.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/0003-eglibc-menuconfig-build-instructions.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/0003-eglibc-menuconfig-build-instructions.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/GLRO_dl_debug_mask.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/GLRO_dl_debug_mask.patch)55
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/IO-acquire-lock-fix.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/IO-acquire-lock-fix.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/add_resource_h_to_wait_h.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/add_resource_h_to_wait_h.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/eglibc-svn-arm-lowlevellock-include-tls.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/eglibc-svn-arm-lowlevellock-include-tls.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/eglibc_fix_findidx_parameters.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/eglibc_fix_findidx_parameters.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/etc/ld.so.conf (renamed from meta/recipes-core/eglibc/eglibc-2.16/etc/ld.so.conf)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/fileops-without-wchar-io.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/fileops-without-wchar-io.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/fix_for_centos_5.8.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/fix_for_centos_5.8.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/fsl-ppc-no-fsqrt.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/fsl-ppc-no-fsqrt.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/generate-supported.mk (renamed from meta/recipes-core/eglibc/eglibc-2.16/generate-supported.mk)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/glibc.fix_sqrt2.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/glibc.fix_sqrt2.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/initgroups_keys.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/initgroups_keys.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/ld-search-order.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/ld-search-order.patch)20
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/mips-rld-map-check.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/mips-rld-map-check.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/multilib_readlib.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/multilib_readlib.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/ppc-sqrt_finite.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/ppc-sqrt_finite.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/ppc_slow_ieee754_sqrt.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/ppc_slow_ieee754_sqrt.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/relocatable_sdk.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/relocatable_sdk.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/tzselect-awk.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/tzselect-awk.patch)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.17/tzselect-sh.patch (renamed from meta/recipes-core/eglibc/eglibc-2.16/tzselect-sh.patch)54
-rw-r--r--meta/recipes-core/eglibc/eglibc-initial_2.17.bb (renamed from meta/recipes-core/eglibc/eglibc-initial_2.16.bb)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-locale.inc2
-rw-r--r--meta/recipes-core/eglibc/eglibc-locale_2.17.bb (renamed from meta/recipes-core/eglibc/eglibc-locale_2.16.bb)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-mtrace.inc1
-rw-r--r--meta/recipes-core/eglibc/eglibc-mtrace_2.17.bb (renamed from meta/recipes-core/eglibc/eglibc-mtrace_2.16.bb)0
-rw-r--r--meta/recipes-core/eglibc/eglibc-scripts_2.17.bb (renamed from meta/recipes-core/eglibc/eglibc-scripts_2.16.bb)0
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.17.bb (renamed from meta/recipes-core/eglibc/eglibc_2.16.bb)37
38 files changed, 79 insertions, 581 deletions
diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 81f50916fa..6e282df420 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -20,7 +20,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
20GCCVERSION ?= "4.7%" 20GCCVERSION ?= "4.7%"
21SDKGCCVERSION ?= "${GCCVERSION}" 21SDKGCCVERSION ?= "${GCCVERSION}"
22BINUVERSION ?= "2.23.1" 22BINUVERSION ?= "2.23.1"
23EGLIBCVERSION ?= "2.16" 23EGLIBCVERSION ?= "2.17"
24UCLIBCVERSION ?= "0.9.33+git%" 24UCLIBCVERSION ?= "0.9.33+git%"
25LINUXLIBCVERSION ?= "3.7" 25LINUXLIBCVERSION ?= "3.7"
26 26
diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.17.bb
index 11970e70c0..0fedfad641 100644
--- a/meta/recipes-core/eglibc/cross-localedef-native_2.16.bb
+++ b/meta/recipes-core/eglibc/cross-localedef-native_2.17.bb
@@ -4,7 +4,7 @@ SECTION = "libs"
4LICENSE = "LGPL-2.1" 4LICENSE = "LGPL-2.1"
5 5
6LIC_DIR = "${WORKDIR}/eglibc-${PV}/libc" 6LIC_DIR = "${WORKDIR}/eglibc-${PV}/libc"
7LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9\ 7LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
8 file://${LIC_DIR}/COPYING;md5=393a5ca445f6965873eca0259a17f833 \ 8 file://${LIC_DIR}/COPYING;md5=393a5ca445f6965873eca0259a17f833 \
9 file://${LIC_DIR}/posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ 9 file://${LIC_DIR}/posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
10 file://${LIC_DIR}/COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff " 10 file://${LIC_DIR}/COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff "
@@ -13,16 +13,14 @@ LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=98a1128c4b58120182cbea3b1752d
13inherit native 13inherit native
14inherit autotools 14inherit autotools
15 15
16# pick up an eglibc-2.16 patch 16# pick up an eglibc patch
17FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}" 17FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}"
18 18
19PR = "r2" 19SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr22064.tar.bz2 \
20SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr21224.tar.bz2 \
21 file://fix_for_centos_5.8.patch;patchdir=.. \ 20 file://fix_for_centos_5.8.patch;patchdir=.. \
22 " 21 "
23 22SRC_URI[md5sum] = "1464af54779c2c7d1078df9ce2e41791"
24SRC_URI[md5sum] = "88894fa6e10e58e85fbd8134b8e486a8" 23SRC_URI[sha256sum] = "97c3991a3772f513cf704841d20c275ac48895fad2e27802dda557c0196cba6b"
25SRC_URI[sha256sum] = "460a45f422da6eb1fd909baab6a64b5ae4c8ba18ea05a1491ed1024c8b98eeaa"
26 24
27S = "${WORKDIR}/eglibc-${PV}/localedef" 25S = "${WORKDIR}/eglibc-${PV}/localedef"
28 26
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/0001-Add-ARM-specific-static-stubs.c.patch b/meta/recipes-core/eglibc/eglibc-2.16/0001-Add-ARM-specific-static-stubs.c.patch
deleted file mode 100644
index 7186f898ee..0000000000
--- a/meta/recipes-core/eglibc/eglibc-2.16/0001-Add-ARM-specific-static-stubs.c.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1Upstream-Status: Backport
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4
5From c57a67e03368687fc0d2ae8354cd1b347a61ea44 Mon Sep 17 00:00:00 2001
6From: Joseph Myers <joseph@codesourcery.com>
7Date: Thu, 5 Jul 2012 22:16:03 +0000
8Subject: [PATCH] Add ARM-specific static-stubs.c.
9
10---
11 ports/ChangeLog.arm | 4 ++++
12 ports/sysdeps/arm/static-stubs.c | 7 +++++++
13 2 files changed, 11 insertions(+)
14 create mode 100644 ports/sysdeps/arm/static-stubs.c
15
16Index: libc/ports/sysdeps/arm/static-stubs.c
17===================================================================
18--- /dev/null 1970-01-01 00:00:00.000000000 +0000
19+++ libc/ports/sysdeps/arm/static-stubs.c 2012-08-15 15:04:59.687669241 -0700
20@@ -0,0 +1,7 @@
21+/* When building with GCC with static-only libgcc, the dummy
22+ _Unwind_Resume from static-stubs.c needs to be used together with
23+ the dummy __aeabi_unwind_cpp_pr* from aeabi_unwind_cpp_pr1.c
24+ instead of the copies from libgcc. */
25+
26+#include <elf/static-stubs.c>
27+#include <aeabi_unwind_cpp_pr1.c>
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/0001-Add-name_to_handle_at-open_by_handle-etc.-to-PowerPC.patch b/meta/recipes-core/eglibc/eglibc-2.16/0001-Add-name_to_handle_at-open_by_handle-etc.-to-PowerPC.patch
deleted file mode 100644
index 48b3c56158..0000000000
--- a/meta/recipes-core/eglibc/eglibc-2.16/0001-Add-name_to_handle_at-open_by_handle-etc.-to-PowerPC.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1Upstream-Status: Submitted
2
3
4From 4b2716f902c117490285e39deb6ef7925fdc846e Mon Sep 17 00:00:00 2001
5From: Khem Raj <raj.khem@gmail.com>
6Date: Sat, 8 Sep 2012 19:54:03 -0700
7Subject: [PATCH] Add name_to_handle_at, open_by_handle etc. to PowerPC
8 bits/fcntl.h.
9
10---
11 ChangeLog | 7 +++++++
12 sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h | 28 +++++++++++++++++++++++++-
13 2 files changed, 34 insertions(+), 1 deletion(-)
14
15Index: libc/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h
16===================================================================
17--- libc.orig/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h 2012-09-08 10:27:08.000000000 -0700
18+++ libc/sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h 2012-09-08 19:57:44.219191560 -0700
19@@ -1,5 +1,5 @@
20 /* O_*, F_*, FD_* bit values for Linux/PowerPC.
21- Copyright (C) 1995-1998, 2000, 2003, 2004, 2006, 2007, 2009, 2010, 2011
22+ Copyright (C) 1995-2012
23 Free Software Foundation, Inc.
24 This file is part of the GNU C Library.
25
26@@ -232,6 +232,19 @@
27 we splice from/to). */
28 # define SPLICE_F_MORE 4 /* Expect more data. */
29 # define SPLICE_F_GIFT 8 /* Pages passed in are a gift. */
30+
31+
32+/* File handle structure. */
33+struct file_handle
34+{
35+ unsigned int handle_bytes;
36+ int handle_type;
37+ /* File identifier. */
38+ unsigned char f_handle[0];
39+};
40+
41+/* Maximum handle size (for now). */
42+# define MAX_HANDLE_SZ 128
43 #endif
44
45 __BEGIN_DECLS
46@@ -278,6 +291,19 @@
47 __off64_t __len);
48 # endif
49
50+
51+/* Map file name to file handle. */
52+extern int name_to_handle_at (int __dfd, const char *__name,
53+ struct file_handle *__handle, int *__mnt_id,
54+ int __flags) __THROW;
55+
56+/* Open file using the file handle.
57+
58+ This function is a possible cancellation point and therefore not
59+ marked with __THROW. */
60+extern int open_by_handle_at (int __mountdirfd, struct file_handle *__handle,
61+ int __flags);
62+
63 #endif
64
65 __END_DECLS
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/0001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch b/meta/recipes-core/eglibc/eglibc-2.16/0001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch
deleted file mode 100644
index dc35b9bd4a..0000000000
--- a/meta/recipes-core/eglibc/eglibc-2.16/0001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch
+++ /dev/null
@@ -1,343 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Khem Raj <raj.khem@gmail.com>
3
4From 95f5a9a866695da4e038aa4e6ccbbfd5d9cf63b7 Mon Sep 17 00:00:00 2001
5From: Joseph Myers <joseph@codesourcery.com>
6Date: Tue, 3 Jul 2012 19:14:59 +0000
7Subject: [PATCH] Avoid use of libgcc_s and libgcc_eh when building glibc.
8
9---
10 ChangeLog | 47 ++++++++++++++++++++++++++++++
11 Makeconfig | 68 ++++++++++++++++++++++++++++++++++++++------
12 Rules | 45 ++++++++++++++++++++++-------
13 elf/Makefile | 6 +++-
14 elf/static-stubs.c | 46 ++++++++++++++++++++++++++++++
15 ports/ChangeLog.arm | 7 +++++
16 ports/sysdeps/arm/Makefile | 8 ++++++
17 7 files changed, 206 insertions(+), 21 deletions(-)
18 create mode 100644 elf/static-stubs.c
19
20Index: libc/Makeconfig
21===================================================================
22--- libc.orig/Makeconfig 2012-07-04 18:26:22.000000000 -0700
23+++ libc/Makeconfig 2012-08-14 20:16:10.197093639 -0700
24@@ -415,9 +415,9 @@
25 LDFLAGS-rtld += $(hashstyle-LDFLAGS)
26 endif
27
28-# Command for linking programs with the C library.
29+# Commands for linking programs with the C library.
30 ifndef +link
31-+link = $(CC) -nostdlib -nostartfiles -o $@ \
32++link-before-libc = $(CC) -nostdlib -nostartfiles -o $@ \
33 $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
34 $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
35 $(addprefix $(csu-objpfx),$(start-installed-name)) \
36@@ -426,7 +426,10 @@
37 $(start-installed-name))\
38 $(+preinit) $(link-extra-libs) \
39 $(common-objpfx)libc% $(+postinit),$^) \
40- $(link-extra-libs) $(link-libc) $(+postctor) $(+postinit)
41+ $(link-extra-libs)
42++link-after-libc = $(+postctor) $(+postinit)
43++link = $(+link-before-libc) $(link-libc) $(+link-after-libc)
44++link-tests = $(+link-before-libc) $(link-libc-tests) $(+link-after-libc)
45 endif
46 # Command for linking PIE programs with the C library.
47 ifndef +link-pie
48@@ -443,7 +446,7 @@
49 endif
50 # Command for statically linking programs with the C library.
51 ifndef +link-static
52-+link-static = $(CC) -nostdlib -nostartfiles -static -o $@ \
53++link-static-before-libc = $(CC) -nostdlib -nostartfiles -static -o $@ \
54 $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
55 $(addprefix $(csu-objpfx),$(static-start-installed-name)) \
56 $(+preinit) $(+prector) \
57@@ -451,7 +454,12 @@
58 $(start-installed-name))\
59 $(+preinit) $(link-extra-libs-static) \
60 $(common-objpfx)libc% $(+postinit),$^) \
61- $(link-extra-libs-static) $(link-libc-static) $(+postctor) $(+postinit)
62+ $(link-extra-libs-static) $(link-libc-static)
63++link-static-after-libc = $(+postctor) $(+postinit)
64++link-static = $(+link-static-before-libc) $(link-libc-static) \
65+ $(+link-static-after-libc)
66++link-static-tests = $(+link-static-before-libc) $(link-libc-static-tests) \
67+ $(+link-static-after-libc)
68 endif
69 # Command for statically linking bounded-pointer programs with the C library.
70 ifndef +link-bounded
71@@ -475,10 +483,12 @@
72 # We need the versioned name of libc.so in the deps of $(others) et al
73 # so that the symlink to libc.so is created before anything tries to
74 # run the linked programs.
75-link-libc = -Wl,-rpath-link=$(rpath-link) \
76+link-libc-before-gnulib = -Wl,-rpath-link=$(rpath-link) \
77 $(common-objpfx)libc.so$(libc.so-version) \
78 $(common-objpfx)$(patsubst %,$(libtype.oS),c) \
79- $(as-needed) $(common-objpfx)elf/ld.so $(no-as-needed) $(gnulib)
80+ $(as-needed) $(common-objpfx)elf/ld.so $(no-as-needed)
81+link-libc = $(link-libc-before-gnulib) $(gnulib)
82+link-libc-tests = $(link-libc-before-gnulib) $(gnulib-tests)
83 # This is how to find at build-time things that will be installed there.
84 rpath-dirs = math elf dlfcn nss nis rt resolv crypt
85 rpath-link = \
86@@ -488,6 +498,7 @@
87 nssobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)nss)
88 resolvobjdir := $(patsubst ../$(subdir),.,$(common-objpfx)resolv)
89 link-libc = $(common-objpfx)libc.a $(otherlibs) $(gnulib) $(common-objpfx)libc.a $(gnulib)
90+link-libc-tests = $(common-objpfx)libc.a $(otherlibs) $(gnulib-tests) $(common-objpfx)libc.a $(gnulib-tests)
91 endif
92 endif
93
94@@ -513,8 +524,43 @@
95
96 # The static libraries.
97 link-libc-static = -Wl,--start-group $(common-objpfx)libc.a $(static-gnulib) -Wl,--end-group
98+link-libc-static-tests = -Wl,--start-group $(common-objpfx)libc.a $(static-gnulib-tests) -Wl,--end-group
99 link-libc-bounded = $(common-objpfx)libc_b.a $(gnulib) $(common-objpfx)libc_b.a
100
101+# How to link against libgcc. Some libgcc functions, such as those
102+# for "long long" arithmetic or software floating point, can always be
103+# built without use of C library headers and do not have any global
104+# state so can safely be linked statically into any executable or
105+# shared library requiring them; these functions are in libgcc.a.
106+# Other functions, relating to exception handling, may require C
107+# library headers to build and it may not be safe to have more than
108+# one copy of them in a process; these functions are only in
109+# libgcc_s.so and libgcc_eh.a.
110+#
111+# To avoid circular dependencies when bootstrapping, it is desirable
112+# to avoid use of libgcc_s and libgcc_eh in building glibc. Where any
113+# glibc functionality (in particular, thread cancellation) requires
114+# exception handling, this is implemented through dlopen of libgcc_s
115+# to avoid unnecessary dependencies on libgcc_s by programs not using
116+# that functionality; executables built with glibc do not use
117+# exception handling other than through thread cancellation.
118+#
119+# Undefined references to functions from libgcc_eh or libgcc_s may
120+# arise for code built with -fexceptions. In the case of statically
121+# linked programs installed by glibc, unwinding will never actually
122+# occur at runtime and the use of elf/static-stubs.c to resolve these
123+# references is safe. In the case of statically linked test programs
124+# and test programs built with -fexceptions, unwinding may occur in
125+# some cases and it is preferable to link with libgcc_eh or libgcc_s
126+# so that the testing is as similar as possible to how programs will
127+# be built with the installed glibc.
128+#
129+# Some architectures have architecture-specific systems for exception
130+# handling that may involve undefined references to
131+# architecture-specific functions. On those architectures,
132+# gnulib-arch and static-gnulib-arch may be defined in sysdeps
133+# makefiles to use additional libraries for linking executables and
134+# shared libraries built by glibc.
135 ifndef gnulib
136 ifneq ($(have-cc-with-libunwind),yes)
137 libunwind =
138@@ -522,8 +568,12 @@
139 libunwind = -lunwind
140 endif
141 libgcc_eh := -Wl,--as-needed -lgcc_s $(libunwind) -Wl,--no-as-needed
142-gnulib := -lgcc $(libgcc_eh)
143-static-gnulib := -lgcc -lgcc_eh $(libunwind)
144+gnulib-arch =
145+gnulib = -lgcc $(gnulib-arch)
146+gnulib-tests := -lgcc $(libgcc_eh)
147+static-gnulib-arch =
148+static-gnulib = -lgcc $(static-gnulib-arch)
149+static-gnulib-tests := -lgcc -lgcc_eh $(libunwind)
150 libc.so-gnulib := -lgcc
151 endif
152 +preinit = $(addprefix $(csu-objpfx),crti.o)
153Index: libc/Rules
154===================================================================
155--- libc.orig/Rules 2012-07-04 18:25:47.000000000 -0700
156+++ libc/Rules 2012-08-14 20:16:10.197093639 -0700
157@@ -1,5 +1,4 @@
158-# Copyright (C) 1991-2000,2002,2003,2004,2005,2006,2011
159-# Free Software Foundation, Inc.
160+# Copyright (C) 1991-2012 Free Software Foundation, Inc.
161 # This file is part of the GNU C Library.
162
163 # The GNU C Library is free software; you can redistribute it and/or
164@@ -103,29 +102,46 @@
165 # eglibc: endif
166
167 ifeq ($(build-programs),yes)
168-binaries-all = $(others) $(sysdep-others) $(tests) $(xtests) $(test-srcs)
169-binaries-static = $(others-static) $(tests-static) $(xtests-static)
170+binaries-all-notests = $(others) $(sysdep-others)
171+binaries-all-tests = $(tests) $(xtests) $(test-srcs)
172+binaries-all = $(binaries-all-notests) $(binaries-all-tests)
173+binaries-static-notests = $(others-static)
174+binaries-static-tests = $(tests-static) $(xtests-static)
175+binaries-static = $(binaries-static-notests) $(binaries-static-tests)
176 ifeq (yesyes,$(have-fpie)$(build-shared))
177 binaries-pie = $(others-pie) $(tests-pie) $(xtests-pie)
178 else
179 binaries-pie =
180 endif
181 else
182-binaries-all = $(tests) $(xtests) $(test-srcs)
183+binaries-all-notests =
184+binaries-all-tests = $(tests) $(xtests) $(test-srcs)
185+binaries-all = $(binaries-all-tests)
186+binaries-static-notests =
187+binaries-static-tests =
188 binaries-static =
189 binaries-pie =
190 endif
191
192-binaries-shared = $(filter-out $(binaries-pie) $(binaries-static), \
193- $(binaries-all))
194+binaries-shared-tests = $(filter-out $(binaries-pie) $(binaries-static), \
195+ $(binaries-all-tests))
196+binaries-shared-notests = $(filter-out $(binaries-pie) $(binaries-static), \
197+ $(binaries-all-notests))
198
199-ifneq "$(strip $(binaries-shared))" ""
200-$(addprefix $(objpfx),$(binaries-shared)): %: %.o \
201+ifneq "$(strip $(binaries-shared-notests))" ""
202+$(addprefix $(objpfx),$(binaries-shared-notests)): %: %.o \
203 $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
204 $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
205 $(+link)
206 endif
207
208+ifneq "$(strip $(binaries-shared-tests))" ""
209+$(addprefix $(objpfx),$(binaries-shared-tests)): %: %.o \
210+ $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
211+ $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
212+ $(+link-tests)
213+endif
214+
215 ifneq "$(strip $(binaries-pie))" ""
216 $(addprefix $(objpfx),$(binaries-pie)): %: %.o \
217 $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
218@@ -133,13 +149,20 @@
219 $(+link-pie)
220 endif
221
222-ifneq "$(strip $(binaries-static))" ""
223-$(addprefix $(objpfx),$(binaries-static)): %: %.o \
224+ifneq "$(strip $(binaries-static-notests))" ""
225+$(addprefix $(objpfx),$(binaries-static-notests)): %: %.o \
226 $(sort $(filter $(common-objpfx)lib%,$(link-libc-static))) \
227 $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
228 $(+link-static)
229 endif
230
231+ifneq "$(strip $(binaries-static-tests))" ""
232+$(addprefix $(objpfx),$(binaries-static-tests)): %: %.o \
233+ $(sort $(filter $(common-objpfx)lib%,$(link-libc-static-tests))) \
234+ $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
235+ $(+link-static-tests)
236+endif
237+
238 ifeq ($(build-bounded),yes)
239 binaries-bounded = $(addsuffix -bp,$(tests) $(xtests) $(test-srcs))
240 $(addprefix $(objpfx),$(binaries-bounded)): %-bp: %.ob \
241Index: libc/elf/Makefile
242===================================================================
243--- libc.orig/elf/Makefile 2012-07-04 18:26:34.000000000 -0700
244+++ libc/elf/Makefile 2012-08-14 20:16:10.197093639 -0700
245@@ -71,6 +71,8 @@
246 install-bin = sprof pldd
247 others-static = sln
248 install-rootsbin = sln
249+sln-modules := static-stubs
250+extra-objs += $(sln-modules:=.o)
251
252 ifeq (yes,$(use-ldconfig))
253 ifeq (yes,$(build-shared))
254@@ -78,7 +80,7 @@
255 others += ldconfig
256 install-rootsbin += ldconfig
257
258-ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon
259+ldconfig-modules := cache readlib xmalloc xstrdup chroot_canon static-stubs
260 extra-objs += $(ldconfig-modules:=.o)
261 endif
262 endif
263@@ -417,6 +419,8 @@
264
265 $(objpfx)sprof: $(libdl)
266
267+$(objpfx)sln: $(sln-modules:%=$(objpfx)%.o)
268+
269 $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o)
270
271 $(objpfx)pldd: $(pldd-modules:%=$(objpfx)%.o)
272Index: libc/elf/static-stubs.c
273===================================================================
274--- /dev/null 1970-01-01 00:00:00.000000000 +0000
275+++ libc/elf/static-stubs.c 2012-08-14 20:16:10.197093639 -0700
276@@ -0,0 +1,46 @@
277+/* Stub implementations of functions to link into statically linked
278+ programs without needing libgcc_eh.
279+ Copyright (C) 2012 Free Software Foundation, Inc.
280+ This file is part of the GNU C Library.
281+
282+ The GNU C Library is free software; you can redistribute it and/or
283+ modify it under the terms of the GNU Lesser General Public
284+ License as published by the Free Software Foundation; either
285+ version 2.1 of the License, or (at your option) any later version.
286+
287+ The GNU C Library is distributed in the hope that it will be useful,
288+ but WITHOUT ANY WARRANTY; without even the implied warranty of
289+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
290+ Lesser General Public License for more details.
291+
292+ You should have received a copy of the GNU Lesser General Public
293+ License along with the GNU C Library; if not, see
294+ <http://www.gnu.org/licenses/>. */
295+
296+/* Avoid backtrace (and so _Unwind_Backtrace) dependencies from
297+ sysdeps/unix/sysv/linux/libc_fatal.c. */
298+#include <sysdeps/posix/libc_fatal.c>
299+
300+#include <stdlib.h>
301+#include <unwind.h>
302+
303+/* These programs do not use thread cancellation, so _Unwind_Resume
304+ and the personality routine are never actually called. */
305+
306+void
307+_Unwind_Resume (struct _Unwind_Exception *exc __attribute__ ((unused)))
308+{
309+ abort ();
310+}
311+
312+_Unwind_Reason_Code
313+__gcc_personality_v0 (int version __attribute__ ((unused)),
314+ _Unwind_Action actions __attribute__ ((unused)),
315+ _Unwind_Exception_Class exception_class
316+ __attribute__ ((unused)),
317+ struct _Unwind_Exception *ue_header
318+ __attribute__ ((unused)),
319+ struct _Unwind_Context *context __attribute__ ((unused)))
320+{
321+ abort ();
322+}
323Index: libc/ports/sysdeps/arm/Makefile
324===================================================================
325--- libc.orig/ports/sysdeps/arm/Makefile 2012-07-04 18:25:41.000000000 -0700
326+++ libc/ports/sysdeps/arm/Makefile 2012-08-14 20:16:10.201093638 -0700
327@@ -1,8 +1,16 @@
328+gnulib-arch = $(elfobjdir)/libgcc-stubs.a
329+static-gnulib-arch = $(elfobjdir)/libgcc-stubs.a
330+
331 ifeq ($(subdir),elf)
332 sysdep-dl-routines += tlsdesc dl-tlsdesc
333 sysdep_routines += aeabi_unwind_cpp_pr1 find_exidx tlsdesc dl-tlsdesc
334 sysdep-rtld-routines += aeabi_unwind_cpp_pr1 tlsdesc dl-tlsdesc
335 shared-only-routines += aeabi_unwind_cpp_pr1
336+
337+$(objpfx)libgcc-stubs.a: $(objpfx)aeabi_unwind_cpp_pr1.os
338+ $(build-extra-lib)
339+
340+lib-noranlib: $(objpfx)libgcc-stubs.a
341 endif
342
343 ifeq ($(subdir),csu)
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/use-sysroot-cxx-headers.patch b/meta/recipes-core/eglibc/eglibc-2.16/use-sysroot-cxx-headers.patch
deleted file mode 100644
index 7f8225371c..0000000000
--- a/meta/recipes-core/eglibc/eglibc-2.16/use-sysroot-cxx-headers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1build system of glibc currently adds the cxx headers path by detecting
2it using provided CXX and expects that they are installed w.r.t to standard
3installation location but in OE we install and use cxx headers from target
4sysroot therefore that code needs to be adapted for OE
5
6Upstream-Status: Inappropriate [OE-specific]
7
8-Khem
9
10
11--- a/configure.in
12+++ b/configure.in
13@@ -1094,11 +1094,10 @@ if test -n "$sysheaders"; then
14 -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
15 if test -n "$CXX"; then
16 CXX_SYSINCLUDES=
17- cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
18 cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` &&
19 for d in include "$cxxmachine/include"; do
20- i=../../../../$d/c++/$cxxversion
21- cxxheaders=`$CXX -print-file-name="$i"` &&
22+ i="$prefix/$d/c++"
23+ cxxheaders=`$CXX -print-sysroot`"$i" &&
24 test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
25 CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
26 -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
27--- a/configure
28+++ b/configure
29@@ -5618,11 +5618,10 @@ if test -n "$sysheaders"; then
30 -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
31 if test -n "$CXX"; then
32 CXX_SYSINCLUDES=
33- cxxversion=`$CXX -dumpversion 2>&5` &&
34 cxxmachine=`$CXX -dumpmachine 2>&5` &&
35 for d in include "$cxxmachine/include"; do
36- i=../../../../$d/c++/$cxxversion
37- cxxheaders=`$CXX -print-file-name="$i"` &&
38+ i="$prefix/$d/c++"
39+ cxxheaders=`$CXX -print-sysroot`"$i" &&
40 test "x$cxxheaders" != x && test "x$i" != "x$cxxheaders" &&
41 CXX_SYSINCLUDES="$CXX_SYSINCLUDES -isystem $cxxheaders \
42 -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/0001-R_ARM_TLS_DTPOFF32.patch b/meta/recipes-core/eglibc/eglibc-2.17/0001-R_ARM_TLS_DTPOFF32.patch
index b4489e9ae9..b4489e9ae9 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/0001-R_ARM_TLS_DTPOFF32.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/0001-R_ARM_TLS_DTPOFF32.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/0001-eglibc-menuconfig-support.patch b/meta/recipes-core/eglibc/eglibc-2.17/0001-eglibc-menuconfig-support.patch
index 624392666a..624392666a 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/0001-eglibc-menuconfig-support.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/0001-eglibc-menuconfig-support.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/meta/recipes-core/eglibc/eglibc-2.17/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
index a8463ea915..a8463ea915 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/0002-eglibc-menuconfig-hex-string-options.patch b/meta/recipes-core/eglibc/eglibc-2.17/0002-eglibc-menuconfig-hex-string-options.patch
index 7caba48112..7caba48112 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/0002-eglibc-menuconfig-hex-string-options.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/0002-eglibc-menuconfig-hex-string-options.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/0003-eglibc-menuconfig-build-instructions.patch b/meta/recipes-core/eglibc/eglibc-2.17/0003-eglibc-menuconfig-build-instructions.patch
index d137f5b318..d137f5b318 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/0003-eglibc-menuconfig-build-instructions.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/0003-eglibc-menuconfig-build-instructions.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/GLRO_dl_debug_mask.patch b/meta/recipes-core/eglibc/eglibc-2.17/GLRO_dl_debug_mask.patch
index 99cd812bc9..7258c82418 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/GLRO_dl_debug_mask.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/GLRO_dl_debug_mask.patch
@@ -6,9 +6,9 @@ Singed-off-by: Khem Raj <raj.khem@gmail.com>
6Upstream-Status: Pending 6Upstream-Status: Pending
7Index: libc/elf/dl-open.c 7Index: libc/elf/dl-open.c
8=================================================================== 8===================================================================
9--- libc.orig/elf/dl-open.c 2012-07-04 18:26:34.000000000 -0700 9--- libc.orig/elf/dl-open.c 2012-10-25 10:18:12.000000000 -0700
10+++ libc/elf/dl-open.c 2012-07-23 22:55:10.700072511 -0700 10+++ libc/elf/dl-open.c 2013-01-09 11:49:02.635577870 -0800
11@@ -153,7 +153,7 @@ 11@@ -155,7 +155,7 @@
12 ns->_ns_main_searchlist->r_list[new_nlist++] = map; 12 ns->_ns_main_searchlist->r_list[new_nlist++] = map;
13 13
14 /* We modify the global scope. Report this. */ 14 /* We modify the global scope. Report this. */
@@ -17,8 +17,8 @@ Index: libc/elf/dl-open.c
17 _dl_debug_printf ("\nadd %s [%lu] to global scope\n", 17 _dl_debug_printf ("\nadd %s [%lu] to global scope\n",
18 map->l_name, map->l_ns); 18 map->l_name, map->l_ns);
19 } 19 }
20@@ -293,7 +293,7 @@ 20@@ -298,7 +298,7 @@
21 _dl_debug_state (); 21 LIBC_PROBE (map_complete, 3, args->nsid, r, new);
22 22
23 /* Print scope information. */ 23 /* Print scope information. */
24- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0)) 24- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0))
@@ -26,7 +26,7 @@ Index: libc/elf/dl-open.c
26 _dl_show_scope (new, 0); 26 _dl_show_scope (new, 0);
27 27
28 /* Only do lazy relocation if `LD_BIND_NOW' is not set. */ 28 /* Only do lazy relocation if `LD_BIND_NOW' is not set. */
29@@ -501,7 +501,7 @@ 29@@ -515,7 +515,7 @@
30 } 30 }
31 31
32 /* Print scope information. */ 32 /* Print scope information. */
@@ -37,9 +37,9 @@ Index: libc/elf/dl-open.c
37 37
38Index: libc/ports/sysdeps/mips/dl-lookup.c 38Index: libc/ports/sysdeps/mips/dl-lookup.c
39=================================================================== 39===================================================================
40--- libc.orig/ports/sysdeps/mips/dl-lookup.c 2012-07-04 18:25:46.000000000 -0700 40--- libc.orig/ports/sysdeps/mips/dl-lookup.c 2012-08-17 12:39:53.000000000 -0700
41+++ libc/ports/sysdeps/mips/dl-lookup.c 2012-07-24 00:04:45.496274559 -0700 41+++ libc/ports/sysdeps/mips/dl-lookup.c 2013-01-09 11:49:02.635577870 -0800
42@@ -110,7 +110,7 @@ 42@@ -111,7 +111,7 @@
43 continue; 43 continue;
44 44
45 /* Print some debugging info if wanted. */ 45 /* Print some debugging info if wanted. */
@@ -48,7 +48,7 @@ Index: libc/ports/sysdeps/mips/dl-lookup.c
48 _dl_debug_printf ("symbol=%s; lookup in file=%s [%lu]\n", 48 _dl_debug_printf ("symbol=%s; lookup in file=%s [%lu]\n",
49 undef_name, 49 undef_name,
50 map->l_name[0] ? map->l_name : rtld_progname, 50 map->l_name[0] ? map->l_name : rtld_progname,
51@@ -431,7 +431,7 @@ 51@@ -432,7 +432,7 @@
52 hash table. */ 52 hash table. */
53 if (__builtin_expect (tab->size, 0)) 53 if (__builtin_expect (tab->size, 0))
54 { 54 {
@@ -57,7 +57,7 @@ Index: libc/ports/sysdeps/mips/dl-lookup.c
57 __rtld_lock_unlock_recursive (tab->lock); 57 __rtld_lock_unlock_recursive (tab->lock);
58 goto success; 58 goto success;
59 } 59 }
60@@ -680,7 +680,7 @@ 60@@ -681,7 +681,7 @@
61 } 61 }
62 62
63 /* Display information if we are debugging. */ 63 /* Display information if we are debugging. */
@@ -66,7 +66,7 @@ Index: libc/ports/sysdeps/mips/dl-lookup.c
66 _dl_debug_printf ("\ 66 _dl_debug_printf ("\
67 \nfile=%s [%lu]; needed by %s [%lu] (relocation dependency)\n\n", 67 \nfile=%s [%lu]; needed by %s [%lu] (relocation dependency)\n\n",
68 map->l_name[0] ? map->l_name : rtld_progname, 68 map->l_name[0] ? map->l_name : rtld_progname,
69@@ -787,7 +787,7 @@ 69@@ -788,7 +788,7 @@
70 { 70 {
71 if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK) 71 if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK)
72 && skip_map == NULL 72 && skip_map == NULL
@@ -75,7 +75,7 @@ Index: libc/ports/sysdeps/mips/dl-lookup.c
75 { 75 {
76 /* We could find no value for a strong reference. */ 76 /* We could find no value for a strong reference. */
77 const char *reference_name = undef_map ? undef_map->l_name : ""; 77 const char *reference_name = undef_map ? undef_map->l_name : "";
78@@ -860,7 +860,7 @@ 78@@ -861,7 +861,7 @@
79 if (__builtin_expect (current_value.m->l_used == 0, 0)) 79 if (__builtin_expect (current_value.m->l_used == 0, 0))
80 current_value.m->l_used = 1; 80 current_value.m->l_used = 1;
81 81
@@ -84,7 +84,7 @@ Index: libc/ports/sysdeps/mips/dl-lookup.c
84 & (DL_DEBUG_BINDINGS|DL_DEBUG_PRELINK), 0)) 84 & (DL_DEBUG_BINDINGS|DL_DEBUG_PRELINK), 0))
85 _dl_debug_bindings (undef_name, undef_map, ref, 85 _dl_debug_bindings (undef_name, undef_map, ref,
86 &current_value, version, type_class, protected); 86 &current_value, version, type_class, protected);
87@@ -925,7 +925,7 @@ 87@@ -926,7 +926,7 @@
88 { 88 {
89 const char *reference_name = undef_map->l_name; 89 const char *reference_name = undef_map->l_name;
90 90
@@ -93,7 +93,7 @@ Index: libc/ports/sysdeps/mips/dl-lookup.c
93 { 93 {
94 _dl_debug_printf ("binding file %s [%lu] to %s [%lu]: %s symbol `%s'", 94 _dl_debug_printf ("binding file %s [%lu] to %s [%lu]: %s symbol `%s'",
95 (reference_name[0] 95 (reference_name[0]
96@@ -941,7 +941,7 @@ 96@@ -942,7 +942,7 @@
97 _dl_debug_printf_c ("\n"); 97 _dl_debug_printf_c ("\n");
98 } 98 }
99 #ifdef SHARED 99 #ifdef SHARED
@@ -104,9 +104,9 @@ Index: libc/ports/sysdeps/mips/dl-lookup.c
104 struct sym_val val = { NULL, NULL }; 104 struct sym_val val = { NULL, NULL };
105Index: libc/elf/rtld.c 105Index: libc/elf/rtld.c
106=================================================================== 106===================================================================
107--- libc.orig/elf/rtld.c 2012-07-04 18:26:34.000000000 -0700 107--- libc.orig/elf/rtld.c 2012-10-10 08:35:46.000000000 -0700
108+++ libc/elf/rtld.c 2012-07-23 22:55:10.700072511 -0700 108+++ libc/elf/rtld.c 2013-01-09 11:49:02.635577870 -0800
109@@ -2214,7 +2214,7 @@ 109@@ -2118,7 +2118,7 @@
110 GLRO(dl_init_all_dirs) = GL(dl_all_dirs); 110 GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
111 111
112 /* Print scope information. */ 112 /* Print scope information. */
@@ -117,9 +117,9 @@ Index: libc/elf/rtld.c
117 117
118Index: libc/elf/dl-lookup.c 118Index: libc/elf/dl-lookup.c
119=================================================================== 119===================================================================
120--- libc.orig/elf/dl-lookup.c 2012-07-04 18:26:35.000000000 -0700 120--- libc.orig/elf/dl-lookup.c 2012-08-17 12:39:53.000000000 -0700
121+++ libc/elf/dl-lookup.c 2012-07-24 00:04:14.680273070 -0700 121+++ libc/elf/dl-lookup.c 2013-01-09 11:49:02.635577870 -0800
122@@ -770,7 +770,7 @@ 122@@ -771,7 +771,7 @@
123 { 123 {
124 if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK) 124 if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK)
125 && skip_map == NULL 125 && skip_map == NULL
@@ -128,3 +128,16 @@ Index: libc/elf/dl-lookup.c
128 { 128 {
129 /* We could find no value for a strong reference. */ 129 /* We could find no value for a strong reference. */
130 const char *reference_name = undef_map ? undef_map->l_name : ""; 130 const char *reference_name = undef_map ? undef_map->l_name : "";
131Index: libc/elf/get-dynamic-info.h
132===================================================================
133--- libc.orig/elf/get-dynamic-info.h 2012-12-02 13:11:45.000000000 -0800
134+++ libc/elf/get-dynamic-info.h 2013-01-09 12:53:51.015657653 -0800
135@@ -157,7 +157,7 @@
136 them. Therefore to avoid breaking existing applications the
137 best we can do is add a warning during debugging with the
138 intent of notifying the user of the problem. */
139- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)
140+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0)
141 && l->l_flags_1 & ~DT_1_SUPPORTED_MASK)
142 _dl_debug_printf ("\nWARNING: Unsupported flag value(s) of 0x%x in DT_FLAGS_1.\n",
143 l->l_flags_1 & ~DT_1_SUPPORTED_MASK);
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/IO-acquire-lock-fix.patch b/meta/recipes-core/eglibc/eglibc-2.17/IO-acquire-lock-fix.patch
index cf5803585c..cf5803585c 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/IO-acquire-lock-fix.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/IO-acquire-lock-fix.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/add_resource_h_to_wait_h.patch b/meta/recipes-core/eglibc/eglibc-2.17/add_resource_h_to_wait_h.patch
index f5023c08d4..f5023c08d4 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/add_resource_h_to_wait_h.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/add_resource_h_to_wait_h.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/eglibc-svn-arm-lowlevellock-include-tls.patch b/meta/recipes-core/eglibc/eglibc-2.17/eglibc-svn-arm-lowlevellock-include-tls.patch
index 4313aa5197..4313aa5197 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/eglibc-svn-arm-lowlevellock-include-tls.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/eglibc-svn-arm-lowlevellock-include-tls.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/eglibc_fix_findidx_parameters.patch b/meta/recipes-core/eglibc/eglibc-2.17/eglibc_fix_findidx_parameters.patch
index bbf4605505..bbf4605505 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/eglibc_fix_findidx_parameters.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/eglibc_fix_findidx_parameters.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/etc/ld.so.conf b/meta/recipes-core/eglibc/eglibc-2.17/etc/ld.so.conf
index e69de29bb2..e69de29bb2 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/etc/ld.so.conf
+++ b/meta/recipes-core/eglibc/eglibc-2.17/etc/ld.so.conf
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/fileops-without-wchar-io.patch b/meta/recipes-core/eglibc/eglibc-2.17/fileops-without-wchar-io.patch
index 2ca0bca248..2ca0bca248 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/fileops-without-wchar-io.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/fileops-without-wchar-io.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/fix_for_centos_5.8.patch b/meta/recipes-core/eglibc/eglibc-2.17/fix_for_centos_5.8.patch
index 7618c99534..7618c99534 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/fix_for_centos_5.8.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/fix_for_centos_5.8.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/fsl-ppc-no-fsqrt.patch b/meta/recipes-core/eglibc/eglibc-2.17/fsl-ppc-no-fsqrt.patch
index 511ee9d19e..511ee9d19e 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/fsl-ppc-no-fsqrt.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/fsl-ppc-no-fsqrt.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/generate-supported.mk b/meta/recipes-core/eglibc/eglibc-2.17/generate-supported.mk
index d2a28c2dc6..d2a28c2dc6 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/generate-supported.mk
+++ b/meta/recipes-core/eglibc/eglibc-2.17/generate-supported.mk
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/glibc.fix_sqrt2.patch b/meta/recipes-core/eglibc/eglibc-2.17/glibc.fix_sqrt2.patch
index a66972998c..a66972998c 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/glibc.fix_sqrt2.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/glibc.fix_sqrt2.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/initgroups_keys.patch b/meta/recipes-core/eglibc/eglibc-2.17/initgroups_keys.patch
index be29856b03..be29856b03 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/initgroups_keys.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/initgroups_keys.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/ld-search-order.patch b/meta/recipes-core/eglibc/eglibc-2.17/ld-search-order.patch
index 40ae6d37f4..e83a0ad6d2 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/ld-search-order.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/ld-search-order.patch
@@ -21,27 +21,27 @@ RP 14/10/2010
21 21
22Index: libc/elf/dl-load.c 22Index: libc/elf/dl-load.c
23=================================================================== 23===================================================================
24--- libc.orig/elf/dl-load.c 24--- libc.orig/elf/dl-load.c 2012-12-02 13:11:45.000000000 -0800
25+++ libc/elf/dl-load.c 25+++ libc/elf/dl-load.c 2013-01-09 07:00:59.135223084 -0800
26@@ -2107,6 +2107,15 @@ _dl_map_object (struct link_map *loader, 26@@ -2215,7 +2215,14 @@
27 fd = open_path (name, namelen, mode & __RTLD_SECURE,
27 &loader->l_runpath_dirs, &realname, &fb, loader, 28 &loader->l_runpath_dirs, &realname, &fb, loader,
28 LA_SER_RUNPATH, &found_other_class); 29 LA_SER_RUNPATH, &found_other_class);
29 30-
30+ /* try the default path. */ 31+ /* try the default path. */
31+ if (fd == -1 32+ if (fd == -1
32+ && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL 33+ && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
33+ || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1)) 34+ || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
34+ && rtld_search_dirs.dirs != (void *) -1) 35+ && rtld_search_dirs.dirs != (void *) -1)
35+ fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs, 36+ fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
36+ &realname, &fb, l, LA_SER_DEFAULT, &found_other_class); 37+ &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
37+
38+ /* Finally try ld.so.cache */ 38+ /* Finally try ld.so.cache */
39 #ifdef USE_LDCONFIG
39 if (fd == -1 40 if (fd == -1
40 && (__builtin_expect (! (mode & __RTLD_SECURE), 1) 41 && (__builtin_expect (! (mode & __RTLD_SECURE), 1)
41 || ! INTUSE(__libc_enable_secure))) 42@@ -2283,14 +2290,6 @@
42@@ -2169,14 +2178,6 @@ _dl_map_object (struct link_map *loader,
43 }
44 } 43 }
44 #endif
45 45
46- /* Finally, try the default path. */ 46- /* Finally, try the default path. */
47- if (fd == -1 47- if (fd == -1
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/mips-rld-map-check.patch b/meta/recipes-core/eglibc/eglibc-2.17/mips-rld-map-check.patch
index 9b646fea95..9b646fea95 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/mips-rld-map-check.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/mips-rld-map-check.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/multilib_readlib.patch b/meta/recipes-core/eglibc/eglibc-2.17/multilib_readlib.patch
index 1542b1b519..1542b1b519 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/multilib_readlib.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/multilib_readlib.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/ppc-sqrt_finite.patch b/meta/recipes-core/eglibc/eglibc-2.17/ppc-sqrt_finite.patch
index 6ea666b1d6..6ea666b1d6 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/ppc-sqrt_finite.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/ppc-sqrt_finite.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/ppc_slow_ieee754_sqrt.patch b/meta/recipes-core/eglibc/eglibc-2.17/ppc_slow_ieee754_sqrt.patch
index 60532cbd03..60532cbd03 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/ppc_slow_ieee754_sqrt.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/ppc_slow_ieee754_sqrt.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/relocatable_sdk.patch b/meta/recipes-core/eglibc/eglibc-2.17/relocatable_sdk.patch
index ca5f17ba58..ca5f17ba58 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/relocatable_sdk.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/relocatable_sdk.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/tzselect-awk.patch b/meta/recipes-core/eglibc/eglibc-2.17/tzselect-awk.patch
index dc9949bec9..dc9949bec9 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/tzselect-awk.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/tzselect-awk.patch
diff --git a/meta/recipes-core/eglibc/eglibc-2.16/tzselect-sh.patch b/meta/recipes-core/eglibc/eglibc-2.17/tzselect-sh.patch
index c173ae2f84..e9a3691bbb 100644
--- a/meta/recipes-core/eglibc/eglibc-2.16/tzselect-sh.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.17/tzselect-sh.patch
@@ -8,43 +8,39 @@ Upstream-Status: Pending
8 8
9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> 9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
10 10
11--- libc/timezone/tzselect.ksh 11Index: libc/timezone/tzselect.ksh
12+++ libc/timezone/tzselect.ksh 12===================================================================
13@@ -1,6 +1,6 @@ 13--- libc.orig/timezone/tzselect.ksh 2012-11-17 09:50:14.000000000 -0800
14-#! @KSH@ 14+++ libc/timezone/tzselect.ksh 2013-01-03 22:46:26.423844259 -0800
15@@ -1,4 +1,4 @@
16-#!/bin/bash
15+#!/bin/sh 17+#!/bin/sh
16 18
17-VERSION='@(#)tzselect.ksh 8.2' 19 PKGVERSION='(tzcode) '
18+VERSION='@(#)tzselect.sh 8.2' 20 TZVERSION=see_Makefile
19 PKGVERSION='@PKGVERSION@' 21@@ -11,23 +11,80 @@
20 REPORT_BUGS_TO='@REPORT_BUGS_TO@'
21
22@@ -11,19 +11,10 @@ REPORT_BUGS_TO='@REPORT_BUGS_TO@'
23 22
24 # Porting notes: 23 # Porting notes:
25 # 24 #
26-# This script requires several features of the Korn shell. 25-# This script requires a Posix-like shell with the extension of a
27-# If your host lacks the Korn shell, 26-# 'select' statement. The 'select' statement was introduced in the
28-# you can use either of the following free programs instead: 27-# Korn shell and is available in Bash and other shell implementations.
28-# If your host lacks both Bash and the Korn shell, you can get their
29-# source from one of these locations:
29+# func_select allows this script to run on shells (such as busybox ash) 30+# func_select allows this script to run on shells (such as busybox ash)
30+# which lack the ksh "select" builtin. 31+# which lack the ksh "select" builtin.
31 # 32 #
32-# <a href=ftp://ftp.gnu.org/pub/gnu/> 33-# Bash <http://www.gnu.org/software/bash/bash.html>
33-# Bourne-Again shell (bash) 34-# Korn Shell <http://www.kornshell.com/>
34-# </a> 35-# Public Domain Korn Shell <http://www.cs.mun.ca/~michael/pdksh/>
35-#
36-# <a href=ftp://ftp.cs.mun.ca/pub/pdksh/pdksh.tar.gz>
37-# Public domain ksh
38-# </a>
39-# 36-#
40-# This script also uses several features of modern awk programs. 37-# This script also uses several features of modern awk programs.
41+# This script uses several features of modern awk programs. 38+# This script uses several features of modern awk programs.
42 # If your host lacks awk, or has an old awk that does not conform to Posix.2, 39 # If your host lacks awk, or has an old awk that does not conform to Posix,
43 # you can use either of the following free programs instead: 40 # you can use either of the following free programs instead:
44 # 41 #
45@@ -35,6 +26,70 @@ REPORT_BUGS_TO='@REPORT_BUGS_TO@' 42 # Gawk (GNU awk) <http://www.gnu.org/software/gawk/>
46 # mawk 43 # mawk <http://invisible-island.net/mawk/>
47 # </a>
48 44
49+# Implement ksh-style select in POSIX shell 45+# Implement ksh-style select in POSIX shell
50+ 46+
@@ -113,7 +109,7 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
113 109
114 # Specify default values for environment variables if they are unset. 110 # Specify default values for environment variables if they are unset.
115 : ${AWK=awk} 111 : ${AWK=awk}
116@@ -80,7 +135,7 @@ IFS=$newline 112@@ -72,7 +129,7 @@
117 113
118 114
119 # Work around a bug in bash 1.14.7 and earlier, where $PS3 is sent to stdout. 115 # Work around a bug in bash 1.14.7 and earlier, where $PS3 is sent to stdout.
@@ -122,7 +118,7 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
122 ?*) PS3= 118 ?*) PS3=
123 esac 119 esac
124 120
125@@ -100,7 +155,7 @@ while 121@@ -92,7 +149,7 @@
126 122
127 echo >&2 'Please select a continent or ocean.' 123 echo >&2 'Please select a continent or ocean.'
128 124
@@ -131,7 +127,7 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
131 Africa \ 127 Africa \
132 Americas \ 128 Americas \
133 Antarctica \ 129 Antarctica \
134@@ -180,7 +235,7 @@ while 130@@ -172,7 +229,7 @@
135 case $countries in 131 case $countries in
136 *"$newline"*) 132 *"$newline"*)
137 echo >&2 'Please select a country.' 133 echo >&2 'Please select a country.'
@@ -140,7 +136,7 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
140 do 136 do
141 case $country in 137 case $country in
142 '') echo >&2 'Please enter a number in range.';; 138 '') echo >&2 'Please enter a number in range.';;
143@@ -219,7 +274,7 @@ while 139@@ -211,7 +268,7 @@
144 *"$newline"*) 140 *"$newline"*)
145 echo >&2 'Please select one of the following' \ 141 echo >&2 'Please select one of the following' \
146 'time zone regions.' 142 'time zone regions.'
@@ -149,7 +145,7 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
149 do 145 do
150 case $region in 146 case $region in
151 '') echo >&2 'Please enter a number in range.';; 147 '') echo >&2 'Please enter a number in range.';;
152@@ -296,7 +351,7 @@ Universal Time is now: $UTdate." 148@@ -288,7 +345,7 @@
153 echo >&2 "Is the above information OK?" 149 echo >&2 "Is the above information OK?"
154 150
155 ok= 151 ok=
diff --git a/meta/recipes-core/eglibc/eglibc-initial_2.16.bb b/meta/recipes-core/eglibc/eglibc-initial_2.17.bb
index de45079603..de45079603 100644
--- a/meta/recipes-core/eglibc/eglibc-initial_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc-initial_2.17.bb
diff --git a/meta/recipes-core/eglibc/eglibc-locale.inc b/meta/recipes-core/eglibc/eglibc-locale.inc
index d2b23ded59..41cbf48dd3 100644
--- a/meta/recipes-core/eglibc/eglibc-locale.inc
+++ b/meta/recipes-core/eglibc/eglibc-locale.inc
@@ -20,8 +20,6 @@ BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips mips64"
20# set "0" for qemu emulation of native localedef for locale generation 20# set "0" for qemu emulation of native localedef for locale generation
21LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1" 21LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
22 22
23PR = "r23"
24
25PROVIDES = "virtual/libc-locale" 23PROVIDES = "virtual/libc-locale"
26 24
27PACKAGES = "localedef ${PN}-dbg" 25PACKAGES = "localedef ${PN}-dbg"
diff --git a/meta/recipes-core/eglibc/eglibc-locale_2.16.bb b/meta/recipes-core/eglibc/eglibc-locale_2.17.bb
index ce6c1d2320..ce6c1d2320 100644
--- a/meta/recipes-core/eglibc/eglibc-locale_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc-locale_2.17.bb
diff --git a/meta/recipes-core/eglibc/eglibc-mtrace.inc b/meta/recipes-core/eglibc/eglibc-mtrace.inc
index 1ec93ac19b..d68783e439 100644
--- a/meta/recipes-core/eglibc/eglibc-mtrace.inc
+++ b/meta/recipes-core/eglibc/eglibc-mtrace.inc
@@ -1,6 +1,5 @@
1include eglibc-collateral.inc 1include eglibc-collateral.inc
2 2
3PR = "r1"
4SUMMARY = "mtrace utility provided by eglibc" 3SUMMARY = "mtrace utility provided by eglibc"
5DESCRIPTION = "mtrace utility provided by eglibc" 4DESCRIPTION = "mtrace utility provided by eglibc"
6RDEPENDS_${PN} = "perl" 5RDEPENDS_${PN} = "perl"
diff --git a/meta/recipes-core/eglibc/eglibc-mtrace_2.16.bb b/meta/recipes-core/eglibc/eglibc-mtrace_2.17.bb
index 6fa2be9cc9..6fa2be9cc9 100644
--- a/meta/recipes-core/eglibc/eglibc-mtrace_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc-mtrace_2.17.bb
diff --git a/meta/recipes-core/eglibc/eglibc-scripts_2.16.bb b/meta/recipes-core/eglibc/eglibc-scripts_2.17.bb
index 31133621d1..31133621d1 100644
--- a/meta/recipes-core/eglibc/eglibc-scripts_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc-scripts_2.17.bb
diff --git a/meta/recipes-core/eglibc/eglibc_2.16.bb b/meta/recipes-core/eglibc/eglibc_2.17.bb
index 2dcaceba9c..b2585bc943 100644
--- a/meta/recipes-core/eglibc/eglibc_2.16.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.17.bb
@@ -1,9 +1,8 @@
1require eglibc.inc 1require eglibc.inc
2 2
3DEPENDS += "gperf-native kconfig-frontends-native" 3DEPENDS += "gperf-native kconfig-frontends-native"
4PR = "r20"
5 4
6SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr21224.tar.bz2;name=tarball \ 5SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr22064.tar.bz2 \
7 file://eglibc-svn-arm-lowlevellock-include-tls.patch \ 6 file://eglibc-svn-arm-lowlevellock-include-tls.patch \
8 file://IO-acquire-lock-fix.patch \ 7 file://IO-acquire-lock-fix.patch \
9 file://mips-rld-map-check.patch \ 8 file://mips-rld-map-check.patch \
@@ -11,7 +10,6 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr21
11 file://generate-supported.mk \ 10 file://generate-supported.mk \
12 file://glibc.fix_sqrt2.patch \ 11 file://glibc.fix_sqrt2.patch \
13 file://multilib_readlib.patch \ 12 file://multilib_readlib.patch \
14 file://use-sysroot-cxx-headers.patch \
15 file://ppc-sqrt_finite.patch \ 13 file://ppc-sqrt_finite.patch \
16 file://GLRO_dl_debug_mask.patch \ 14 file://GLRO_dl_debug_mask.patch \
17 file://initgroups_keys.patch \ 15 file://initgroups_keys.patch \
@@ -19,35 +17,19 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr21
19 file://ppc_slow_ieee754_sqrt.patch \ 17 file://ppc_slow_ieee754_sqrt.patch \
20 file://fileops-without-wchar-io.patch \ 18 file://fileops-without-wchar-io.patch \
21 file://add_resource_h_to_wait_h.patch \ 19 file://add_resource_h_to_wait_h.patch \
22 file://0001-Avoid-use-of-libgcc_s-and-libgcc_eh-when-building-gl.patch \
23 file://0001-Add-ARM-specific-static-stubs.c.patch \
24 file://0001-eglibc-menuconfig-support.patch \ 20 file://0001-eglibc-menuconfig-support.patch \
25 file://0002-eglibc-menuconfig-hex-string-options.patch \ 21 file://0002-eglibc-menuconfig-hex-string-options.patch \
26 file://0003-eglibc-menuconfig-build-instructions.patch \ 22 file://0003-eglibc-menuconfig-build-instructions.patch \
27 file://0001-Add-name_to_handle_at-open_by_handle-etc.-to-PowerPC.patch \
28 file://fsl-ppc-no-fsqrt.patch \ 23 file://fsl-ppc-no-fsqrt.patch \
29 file://0001-R_ARM_TLS_DTPOFF32.patch \ 24 file://0001-R_ARM_TLS_DTPOFF32.patch \
30 http://people.linaro.org/~toolchain/openembedded/patches/eglibc/aarch64-0001-glibc-fsf-v1-eaf6f205.patch;name=patch1 \
31 http://people.linaro.org/~toolchain/openembedded/patches/eglibc/aarch64-0002-Synchronize-with-linux-elf.h.patch;name=patch2 \
32 http://people.linaro.org/~toolchain/openembedded/patches/eglibc/aarch64-0003-Adding-AArch64-support-to-elf-elf.h.patch;name=patch3 \
33 file://tzselect-sh.patch \ 25 file://tzselect-sh.patch \
34 file://tzselect-awk.patch \ 26 file://tzselect-awk.patch \
35 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \ 27 file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
36 " 28 "
29SRC_URI[md5sum] = "1464af54779c2c7d1078df9ce2e41791"
30SRC_URI[sha256sum] = "97c3991a3772f513cf704841d20c275ac48895fad2e27802dda557c0196cba6b"
37 31
38SRC_URI[tarball.md5sum] = "88894fa6e10e58e85fbd8134b8e486a8" 32LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
39SRC_URI[tarball.sha256sum] = "460a45f422da6eb1fd909baab6a64b5ae4c8ba18ea05a1491ed1024c8b98eeaa"
40
41SRC_URI[patch1.md5sum] = "5e52bf8fd9ac390b665d86a57ab7dba7"
42SRC_URI[patch1.sha256sum] = "b7eea76e72675a6ed3066952a9e08389c99838d74a58b736d527c82c34e754eb"
43
44SRC_URI[patch2.md5sum] = "e1ae1c416c01e2c991c7ca7e169c577b"
45SRC_URI[patch2.sha256sum] = "6093bb80a187081090cb14412f466c08fcaf39ccd62b751e3d871a8c5af03b0d"
46
47SRC_URI[patch3.md5sum] = "6d1d84e14f7abfe9ee3237d0ec6fe9ca"
48SRC_URI[patch3.sha256sum] = "03e79ace9eade0d57a3684cb0dc6b415ea52e4f152bfb380684b08445f125410"
49
50LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
51 file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \ 33 file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
52 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \ 34 file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
53 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff " 35 file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff "
@@ -102,17 +84,6 @@ EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
102 84
103EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" 85EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
104 86
105do_unpack_append() {
106 bb.build.exec_func('do_move_ports', d)
107}
108
109do_move_ports() {
110 if test -d ${WORKDIR}/eglibc-${PV}/ports ; then
111 rm -rf ${S}/ports
112 mv ${WORKDIR}/eglibc-${PV}/ports ${S}/
113 fi
114}
115
116do_patch_append() { 87do_patch_append() {
117 bb.build.exec_func('do_fix_readlib_c', d) 88 bb.build.exec_func('do_fix_readlib_c', d)
118} 89}