sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

eglibc-2.15: Update SRCREV 

Get new patches and remove the one that got merged upstream

(From OE-Core rev: 0e1a843a1f0c54f00736170de39a8a8f62d26879)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj 2012-03-22 19:56:57 -07:00 committed by Richard Purdie
parent 241140d0eb
commit 016cf3fc0b
4 changed files with 131 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
meta/recipes-core/eglibc/eglibc-2.15/GLRO_dl_debug_mask.patch Normal file
View File

@ -0,0 +1,108 @@
Its controlled by __OPTION_EGLIBC_RTLD_DEBUG
so we should use GLRO_dl_debug_mask
Singed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: libc/elf/dl-open.c
===================================================================
--- libc.orig/elf/dl-open.c 2012-03-09 08:54:34.691443995 -0800
+++ libc/elf/dl-open.c 2012-03-09 08:55:31.275446730 -0800
@@ -154,7 +154,7 @@
ns->_ns_main_searchlist->r_list[new_nlist++] = map;
/* We modify the global scope. Report this. */
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0))
+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0))
_dl_debug_printf ("\nadd %s [%lu] to global scope\n",
map->l_name, map->l_ns);
}
@@ -294,7 +294,7 @@
_dl_debug_state ();
/* Print scope information. */
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0))
+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0))
_dl_show_scope (new, 0);
/* Only do lazy relocation if `LD_BIND_NOW' is not set. */
@@ -438,7 +438,7 @@
}
/* Print scope information. */
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0))
+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0))
_dl_show_scope (imap, from_scope);
}
Index: libc/ports/sysdeps/mips/dl-lookup.c
===================================================================
--- libc.orig/ports/sysdeps/mips/dl-lookup.c 2012-03-09 08:54:34.707443996 -0800
+++ libc/ports/sysdeps/mips/dl-lookup.c 2012-03-09 09:02:36.903467324 -0800
@@ -111,7 +111,7 @@
continue;
/* Print some debugging info if wanted. */
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SYMBOLS, 0))
+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SYMBOLS, 0))
_dl_debug_printf ("symbol=%s; lookup in file=%s [%lu]\n",
undef_name,
map->l_name[0] ? map->l_name : rtld_progname,
@@ -432,7 +432,7 @@
hash table. */
if (__builtin_expect (tab->size, 0))
{
- assert (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK);
+ assert (GLRO_dl_debug_mask & DL_DEBUG_PRELINK);
__rtld_lock_unlock_recursive (tab->lock);
goto success;
}
@@ -681,7 +681,7 @@
}
/* Display information if we are debugging. */
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0))
_dl_debug_printf ("\
\nfile=%s [%lu]; needed by %s [%lu] (relocation dependency)\n\n",
map->l_name[0] ? map->l_name : rtld_progname,
@@ -860,7 +860,7 @@
if (__builtin_expect (current_value.m->l_used == 0, 0))
current_value.m->l_used = 1;
- if (__builtin_expect (GLRO(dl_debug_mask)
+ if (__builtin_expect (GLRO_dl_debug_mask
& (DL_DEBUG_BINDINGS|DL_DEBUG_PRELINK), 0))
_dl_debug_bindings (undef_name, undef_map, ref,
&current_value, version, type_class, protected);
@@ -925,7 +925,7 @@
{
const char *reference_name = undef_map->l_name;
- if (GLRO(dl_debug_mask) & DL_DEBUG_BINDINGS)
+ if (GLRO_dl_debug_mask & DL_DEBUG_BINDINGS)
{
_dl_debug_printf ("binding file %s [%lu] to %s [%lu]: %s symbol `%s'",
(reference_name[0]
@@ -941,7 +941,7 @@
_dl_debug_printf_c ("\n");
}
#ifdef SHARED
- if (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK)
+ if (GLRO_dl_debug_mask & DL_DEBUG_PRELINK)
{
int conflict = 0;
struct sym_val val = { NULL, NULL };
Index: libc/elf/rtld.c
===================================================================
--- libc.orig/elf/rtld.c 2012-03-09 09:01:35.159464344 -0800
+++ libc/elf/rtld.c 2012-03-09 09:01:56.247465364 -0800
@@ -2198,7 +2198,7 @@
GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
/* Print scope information. */
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0))
+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0))
{
_dl_debug_printf ("\nInitial object scopes\n");

25
meta/recipes-core/eglibc/eglibc-2.15/armv4-eabi-compile-fix.patch
View File

@ -1,25 +0,0 @@
Source: http://sourceware.org/bugzilla/show_bug.cgi?id=12097
Upstream-Status: Submitted
The patch should be merged into glibc-ports
-Khem
Index: libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
===================================================================
--- libc.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
+++ libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
@@ -16,6 +16,8 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
+#if defined(__thumb__)
+
#include <sysdep.h>
/* Out-of-line syscall stub. We expect the system call number in ip
@@ -41,3 +43,5 @@ ENTRY (__libc_do_syscall)
pop {r7, pc}
.fnend
END (__libc_do_syscall)
+
+#endif /* __thumb__ */

20
meta/recipes-core/eglibc/eglibc-2.15/initgroups_keys.patch Normal file
View File

@ -0,0 +1,20 @@
This is needed since initgroups belongs to NET group
so when NET is disabled in eglibc build then it reports
as undefined symbol
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: libc/nss/getent.c
===================================================================
--- libc.orig/nss/getent.c 2012-03-09 09:41:57.099581559 -0800
+++ libc/nss/getent.c 2012-03-09 09:42:13.095582334 -0800
@@ -898,7 +898,7 @@
D(group)
D(gshadow)
DN(hosts)
-D(initgroups)
+DN(initgroups)
DN(netgroup)
DN(networks)
D(passwd)

5
meta/recipes-core/eglibc/eglibc_2.15.bb
View File

@ -1,6 +1,6 @@
require eglibc.inc
SRCREV = "16540"
SRCREV = "17386"
DEPENDS += "gperf-native"
PR = "r2"
@ -12,7 +12,6 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http
file://IO-acquire-lock-fix.patch \
file://mips-rld-map-check.patch \
file://stack-protector-test.patch \
file://armv4-eabi-compile-fix.patch \
file://etc/ld.so.conf \
file://generate-supported.mk \
file://ppc-sqrt.patch \
@ -22,6 +21,8 @@ SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http
file://use-sysroot-cxx-headers.patch \
file://x86_fenv.patch \
file://ppc-sqrt_finite.patch \
file://GLRO_dl_debug_mask.patch \
file://initgroups_keys.patch \
"
LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \