From b914de55a45029658116f729ffda3abead654c90 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 22 Jun 2011 23:49:42 +0100 Subject: Revert "eglibc: Upgrade recipes from 2.13 -> 2.14" This reverts commit 16837d4cc39415709f744afa9532d53e0382d6bd. 2.14 isn't ready for prime time :( (A load of files no longer seem to get installed for example) --- .../eglibc/eglibc-2.13/IO-acquire-lock-fix.patch | 17 +++++ .../eglibc-svn-arm-lowlevellock-include-tls.patch | 21 ++++++ .../recipes-core/eglibc/eglibc-2.13/etc/ld.so.conf | 0 .../eglibc/eglibc-2.13/generate-supported.mk | 11 +++ .../eglibc/eglibc-2.13/ld-search-order.patch | 56 +++++++++++++++ .../eglibc/eglibc-2.13/mips-rld-map-check.patch | 26 +++++++ .../eglibc-2.13/shorten-build-commands.patch | 83 ++++++++++++++++++++++ .../eglibc/eglibc-2.13/stack-protector-test.patch | 35 +++++++++ 8 files changed, 249 insertions(+) create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/etc/ld.so.conf create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/generate-supported.mk create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch create mode 100644 meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch (limited to 'meta/recipes-core/eglibc/eglibc-2.13') diff --git a/meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch b/meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch new file mode 100644 index 0000000000..cf5803585c --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch @@ -0,0 +1,17 @@ +import http://sourceware.org/ml/libc-ports/2007-12/msg00000.html + +Upstream-Status: Pending + +Index: libc/bits/stdio-lock.h +=================================================================== +--- libc.orig/bits/stdio-lock.h 2009-10-28 14:34:19.000000000 -0700 ++++ libc/bits/stdio-lock.h 2009-10-28 14:34:54.000000000 -0700 +@@ -50,6 +50,8 @@ __libc_lock_define_recursive (typedef, _ + _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \ + _IO_flockfile (_fp) + ++# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp) ++ + # define _IO_release_lock(_fp) \ + _IO_funlockfile (_fp); \ + _IO_cleanup_region_end (0) diff --git a/meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch new file mode 100644 index 0000000000..4313aa5197 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch @@ -0,0 +1,21 @@ +In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21: +../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private': +../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: warning: implicit declaration of function 'THREAD_GETMEM' +../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'THREAD_SELF' undeclared (first use in this function) +../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: (Each undeclared identifier is reported only once +../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: for each function it appears in.) +../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'header' undeclared (first use in this function) +make[4]: *** [/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os] Error 1 + +Upstream-Status: Pending + +--- libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h.orig ++++ libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #define FUTEX_WAIT 0 + #define FUTEX_WAKE 1 diff --git a/meta/recipes-core/eglibc/eglibc-2.13/etc/ld.so.conf b/meta/recipes-core/eglibc/eglibc-2.13/etc/ld.so.conf new file mode 100644 index 0000000000..e69de29bb2 diff --git a/meta/recipes-core/eglibc/eglibc-2.13/generate-supported.mk b/meta/recipes-core/eglibc/eglibc-2.13/generate-supported.mk new file mode 100644 index 0000000000..d2a28c2dc6 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.13/generate-supported.mk @@ -0,0 +1,11 @@ +#!/usr/bin/make + +include $(IN) + +all: + rm -f $(OUT) + touch $(OUT) + for locale in $(SUPPORTED-LOCALES); do \ + [ $$locale = true ] && continue; \ + echo $$locale | sed 's,/, ,' >> $(OUT); \ + done diff --git a/meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch b/meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch new file mode 100644 index 0000000000..40ae6d37f4 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch @@ -0,0 +1,56 @@ +Upstream-Status: Inappropriate [embedded specific] + +The default lib search path order is: + + 1) LD_LIBRARY_PATH + 2) RPATH from the binary + 3) ld.so.cache + 4) default search paths embedded in the linker + +For nativesdk binaries which are being used alongside binaries on a host system, we +need the search paths to firstly search the shipped nativesdk libs but then also +cover the host system. For example we want the host system's libGL and this may be +in a non-standard location like /usr/lib/mesa. The only place the location is know +about is in the ld.so.cache of the host system. + +Since nativesdk has a simple structure and doesn't need to use a cache itself, we +repurpose the cache for use as a last resort in finding host system binaries. This +means we need to switch the order of 3 and 4 above to make this work effectively. + +RP 14/10/2010 + +Index: libc/elf/dl-load.c +=================================================================== +--- libc.orig/elf/dl-load.c ++++ libc/elf/dl-load.c +@@ -2107,6 +2107,15 @@ _dl_map_object (struct link_map *loader, + &loader->l_runpath_dirs, &realname, &fb, loader, + LA_SER_RUNPATH, &found_other_class); + ++ /* try the default path. */ ++ if (fd == -1 ++ && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL ++ || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1)) ++ && rtld_search_dirs.dirs != (void *) -1) ++ fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs, ++ &realname, &fb, l, LA_SER_DEFAULT, &found_other_class); ++ ++ /* Finally try ld.so.cache */ + if (fd == -1 + && (__builtin_expect (! (mode & __RTLD_SECURE), 1) + || ! INTUSE(__libc_enable_secure))) +@@ -2169,14 +2178,6 @@ _dl_map_object (struct link_map *loader, + } + } + +- /* Finally, try the default path. */ +- if (fd == -1 +- && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL +- || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1)) +- && rtld_search_dirs.dirs != (void *) -1) +- fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs, +- &realname, &fb, l, LA_SER_DEFAULT, &found_other_class); +- + /* Add another newline when we are tracing the library loading. */ + if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_LIBS, 0)) + _dl_debug_printf ("\n"); diff --git a/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch b/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch new file mode 100644 index 0000000000..7772e6ffa8 --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch @@ -0,0 +1,26 @@ +Upstream-Status: Pending + +On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic +section if a --version-script sets _RLD_MAP to local. This is apparently +a binutils bug, but libc shouldn't segfault in this case. + +see also: http://sourceware.org/bugilla/show_bug.cgi?id=11615 + +9/19/2010 - added by Qing He + +Upstream-Status: Pending + +--- +diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h +--- glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h 2009-05-16 16:36:20.000000000 +0800 ++++ glibc-2.10.1/ports/sysdeps/mips/dl-machine.h 2010-09-19 09:11:53.000000000 +0800 +@@ -70,7 +70,8 @@ + /* If there is a DT_MIPS_RLD_MAP entry in the dynamic section, fill it in + with the run-time address of the r_debug structure */ + #define ELF_MACHINE_DEBUG_SETUP(l,r) \ +-do { if ((l)->l_info[DT_MIPS (RLD_MAP)]) \ ++do { if ((l)->l_info[DT_MIPS (RLD_MAP)] && \ ++ (l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) \ + *(ElfW(Addr) *)((l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) = \ + (ElfW(Addr)) (r); \ + } while (0) diff --git a/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch b/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch new file mode 100644 index 0000000000..c17d58b28b --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.13/shorten-build-commands.patch @@ -0,0 +1,83 @@ +Upstream-Status: Pending + +Source: http://sourceware.org/ml/libc-alpha/2010-03/msg00064.html + +This patch scratches an itch. Each individual gcc command in the +glibc build is over 1K, which means it takes up a good chunk of my +terminal. Most of that is include paths. Any version of GCC new +enough to build glibc supports response files, which were added in +2005. So use a response file for the static list of include paths. +Now the build commands are a lot shorter, and easier to use when +developing glibc. + +Tested on x86_64-linux-gnu. Please apply if acceptable. + +-- +Daniel Jacobowitz +CodeSourcery + +2010-03-30 Daniel Jacobowitz + + * Makeconfig (+common-includes): Define. + (+includes): Use @$(common-objpfx)includes. + * Makefile (postclean): Remove includes and includes.mk. + * Makerules ($(common-objpfx)includes.mk): Include and create + includes.mk. Create includes. + +Upstream-Status: Pending + +Index: libc/Makeconfig +=================================================================== +--- libc.orig/Makeconfig 2009-10-13 22:55:12.000000000 -0700 ++++ libc/Makeconfig 2010-03-31 16:02:37.120489733 -0700 +@@ -678,9 +678,10 @@ endif # $(+cflags) == "" + # library source directory, in the include directory, and in the + # current directory. + +sysdep-includes = $(addprefix -I,$(+sysdep_dirs)) +++common-includes = $(+sysdep-includes) $(includes) $(sysincludes) + +includes = -I$(..)include $(if $(subdir),$(objpfx:%/=-I%)) \ +- $(+sysdep-includes) $(includes) \ +- $(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes) ++ @$(common-objpfx)includes \ ++ $(patsubst %/,-I%,$(..)) $(libio-include) -I. + + # Since libio has several internal header files, we use a -I instead + # of many little headers in the include directory. +Index: libc/Makefile +=================================================================== +--- libc.orig/Makefile 2009-12-09 12:06:28.000000000 -0800 ++++ libc/Makefile 2010-03-31 16:02:37.132481508 -0700 +@@ -247,7 +247,7 @@ parent-mostlyclean: common-mostlyclean # + parent-clean: parent-mostlyclean common-clean + + postclean = $(addprefix $(common-objpfx),$(postclean-generated)) \ +- $(addprefix $(objpfx),sysd-dirs sysd-rules) \ ++ $(addprefix $(objpfx),sysd-dirs sysd-rules includes includes.mk) \ + $(addprefix $(objpfx),sysd-sorted soversions.mk soversions.i) + + clean: parent-clean +Index: libc/Makerules +=================================================================== +--- libc.orig/Makerules 2009-12-09 12:06:28.000000000 -0800 ++++ libc/Makerules 2010-03-31 16:02:37.140481645 -0700 +@@ -254,6 +254,20 @@ ifndef sysd-rules-done + no_deps=t + endif + ++-include $(common-objpfx)includes.mk ++ifneq ($(+common-includes),$(saved-includes)) ++# Recreate includes.mk (and includes). ++includes-force = FORCE ++FORCE: ++endif ++$(common-objpfx)includes.mk: $(includes-force) ++ -@rm -f $@T $(common-objpfx)includesT ++ for inc in $(+common-includes); do echo "$$inc"; done \ ++ > $(common-objpfx)includesT ++ mv -f $(common-objpfx)includesT $(common-objpfx)includes ++ echo 'saved-includes := $(+common-includes)' > $@T ++ mv -f $@T $@ ++ + define o-iterator-doit + $(objpfx)%$o: %.S $(before-compile); $$(compile-command.S) + endef diff --git a/meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch b/meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch new file mode 100644 index 0000000000..dbf70a974f --- /dev/null +++ b/meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch @@ -0,0 +1,35 @@ +Test for -fstack-protector is compile only test. One might have the option but +might have build the compiler with --disable-ssp which means ssp should not be +enabled. Therefore we change the test to a link time test. It will fail if +libssp is not available. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj + +Index: libc/configure +=================================================================== +--- libc.orig/configure ++++ libc/configure +@@ -6937,7 +6937,7 @@ if test "${libc_cv_ssp+set}" = set; then + $as_echo_n "(cached) " >&6 + else + if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -Werror -fstack-protector +- -o /dev/null -c -x c /dev/null 1>&5' ++ -o /dev/null -x c /dev/null 1>&5' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? +Index: libc/configure.in +=================================================================== +--- libc.orig/configure.in ++++ libc/configure.in +@@ -1787,7 +1787,7 @@ AC_SUBST(fno_unit_at_a_time) + + AC_CACHE_CHECK(for -fstack-protector, libc_cv_ssp, [dnl + if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -Werror -fstack-protector +- -o /dev/null -c -x c /dev/null 1>&AS_MESSAGE_LOG_FD]) ++ -o /dev/null -x c /dev/null 1>&AS_MESSAGE_LOG_FD]) + then + libc_cv_ssp=yes + else -- cgit v1.2.3-54-g00ecf