patches/glibc/ports-2.10.1/630-mips_shn_undef-hack.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
permissions -rw-r--r--
cc/gcc: add option to compile against static libstdc++, for gcc-4.4 and newer

Idea and know-how taken from CodeSourcery build script.

Normal build:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb77f3000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb76e8000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75a1000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb757a000)
/lib/ld-linux.so.2 (0xb77f4000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb755c000)

CC_STATIC_LIBSTDCXX=y:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb7843000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb76e6000)
/lib/ld-linux.so.2 (0xb7844000)

I made CC_STATIC_LIBSTDCXX default=y since I think
it is always desirable.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
yann@1625
     1
	Hack from Debian to hopefully get sandbox working on mips
yann@1625
     2
yann@1625
     3
<`Kumba> ths: given the SHN_UNDEF thing is a hack, what's the preferred solution?
yann@1625
     4
<ths> For fakeroot the simplest trigger is "fakeroot file /bin/ls".
yann@1625
     5
<ths> `Kumba: I haven't found a better one yet.
yann@1625
     6
<ths> Probably marker symbols around the stub section, and then exclude it from the link map.
yann@1625
     7
<ths> This needs a ld change.
yann@1625
     8
yann@1625
     9
diff -durN glibc-2.10.1.orig/elf/do-lookup.h glibc-2.10.1/elf/do-lookup.h
yann@1625
    10
--- glibc-2.10.1.orig/elf/do-lookup.h	2009-03-30 23:14:32.000000000 +0200
yann@1625
    11
+++ glibc-2.10.1/elf/do-lookup.h	2009-11-13 00:51:36.000000000 +0100
yann@1625
    12
@@ -248,6 +248,12 @@
yann@1625
    13
 		}
yann@1625
    14
 	      /* FALLTHROUGH */
yann@1625
    15
 	    case STB_GLOBAL:
yann@1625
    16
+#ifdef __mips__
yann@1625
    17
+	      /* HACK: MIPS marks its lazy evaluation stubs with SHN_UNDEF
yann@1625
    18
+		 symbols, we skip them. */
yann@1625
    19
+	      if (sym->st_shndx == SHN_UNDEF)
yann@1625
    20
+		break;
yann@1625
    21
+#endif
yann@1625
    22
 	      /* Global definition.  Just what we need.  */
yann@1625
    23
 	      result->s = sym;
yann@1625
    24
 	      result->m = (struct link_map *) map;