patches/glibc/ports-2.13/630-mips_shn_undef-hack.patch
author "Bryan Hundven" <bryanhundven@gmail.com>
Thu Mar 01 15:23:49 2012 -0800 (2012-03-01)
changeset 2909 28ac8fbd9e6a
permissions -rw-r--r--
libg/eglibc: add updated eglibc 2.15

Includes a patch to remove __builtin_expect test:

In eglibc-2.15, the build breaks in configure while testing
for the existance of __builtin_expect. It fails with newer
versions of gcc.

This patch is a modification of an upstream change in glibc
mainline (to be 2.16) to fix the following error:

[CFG ] checking for __builtin_expect... no
[ERROR] configure: error: support for __builtin_expect needed

http://sourceware.org/git/?p=glibc.git;a=commit;h=3857022a761ea7251f8e5c0e45d382ebc3e34cf9

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
[yann.morin.1998@free.fr: coalesce both patches into a single changeset]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
yann@2438
     1
diff -durN glibc-2.13.orig/elf/dl-lookup.c glibc-2.13/elf/dl-lookup.c
yann@2438
     2
--- glibc-2.13.orig/elf/dl-lookup.c	2009-03-30 23:14:32.000000000 +0200
yann@2438
     3
+++ glibc-2.13/elf/dl-lookup.c	2009-11-13 00:51:36.000000000 +0100
yann@2438
     4
@@ -301,6 +301,12 @@
yann@2438
     5
 	      /* FALLTHROUGH */
yann@2438
     6
 	    case STB_GLOBAL:
yann@2438
     7
	    success:
yann@2438
     8
+#ifdef __mips__
yann@2438
     9
+	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
yann@2438
    10
+		 symbols, we skip them. */
yann@2438
    11
+	      if (sym->st_shndx == SHN_UNDEF)
yann@2438
    12
+		break;
yann@2438
    13
+#endif
yann@2438
    14
 	      /* Global definition.  Just what we need.  */
yann@2438
    15
 	      result->s = sym;
yann@2438
    16
 	      result->m = (struct link_map *) map;