patches/glibc/ports-2.12.1/630-mips_shn_undef-hack.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28)
changeset 2573 424fa2092ace
permissions -rw-r--r--
scripts/libc: do not build add-ons by default

Currently, no --enable-add-ons option is passed to libc configure when
"$(do_libc_add_ons_list ,)" is empty, which makes configure automatically search
for present add-ons. In that case, all present add-ons are built, although
no add-on was selected by the user in the config. Moreover, this can make the
configure fail if some non-standard add-ons like eglibc-localedef are present.

This behavior also leads to an inconsistency from a user point of view between
the following cases:
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS="none" in the config,
which makes "$(do_libc_add_ons_list ,)" return "", so all present add-ons
are built.
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS!="none" in the
config, which makes "$(do_libc_add_ons_list ,)" return the add-on supporting
the chosen threading implementation, e.g. "nptl", so only this add-on is
built.

This patch disables the building of all add-ons in that case.

It is still possible to build all present add-ons by adding --enable-add-ons to
LIBC_GLIBC_EXTRA_CONFIG_ARRAY.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
yann@2437
     1
diff -durN glibc-2.12.1.orig/elf/dl-lookup.c glibc-2.12.1/elf/dl-lookup.c
yann@2437
     2
--- glibc-2.12.1.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
yann@2437
     3
+++ glibc-2.12.1/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
yann@2437
     4
@@ -301,6 +301,12 @@
yann@2437
     5
 	      /* FALLTHROUGH */
yann@2437
     6
 	    case STB_GLOBAL:
yann@2437
     7
	    success:
yann@2437
     8
+#ifdef __mips__
yann@2437
     9
+	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
yann@2437
    10
+		 symbols, we skip them. */
yann@2437
    11
+	      if (sym->st_shndx == SHN_UNDEF)
yann@2437
    12
+		break;
yann@2437
    13
+#endif
yann@2437
    14
 	      /* Global definition.  Just what we need.  */
yann@2437
    15
 	      result->s = sym;
yann@2437
    16
 	      result->m = (struct link_map *) map;