patches/glibc/ports-2.10.1/190-localedef-mmap.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Fri Jan 27 13:31:16 2012 +0100 (2012-01-27)
changeset 2854 a70abdbfa342
permissions -rw-r--r--
complibs/cloog: fix linking with libm

In Ubuntu 11.04 and 11.10, the default options for ld have changed.
--no-copy-dt-needed-entries and --as-needed are now enabled by default, which
causes errors like:

[EXTRA] Checking CLooG/ppl
[DEBUG] ==> Executing: 'make' '-j3' '-s' 'check'
[ALL ] Making check in .
[ALL ] config.status: creating include/cloog/cloog-config.h
[ALL ] config.status: include/cloog/cloog-config.h is unchanged
[ALL ] libtool: link: i686-build_pc-linux-gnu-gcc -Wall -fomit-frame-pointer
-pipe -o cloog cloog.o -L/<snip>/build/static/lib ./.libs/libcloog.a -lm
/<snip>/build/static/lib/libppl_c.a /<snip>/build/static/lib/libpwl.a
/<snip>/build/static/lib/libppl.a /<snip>/build/static/lib/libgmpxx.a
/<snip>/build/static/lib/libgmp.a -lstdc++
[ALL ] /usr/bin/ld: /<snip>/build/static/lib/libppl.a(MIP_Problem.o):
undefined reference to symbol 'sqrt@@GLIBC_2.0'
[ALL ] /usr/bin/ld: note: 'sqrt@@GLIBC_2.0' is defined in DSO
/usr/lib/gcc/i686-linux-gnu/4.6.1/../../../i386-linux-gnu/libm.so so try adding
it to the linker command line
[ALL ] /usr/lib/gcc/i686-linux-gnu/4.6.1/../../../i386-linux-gnu/libm.so:
could not read symbols: Invalid operation
[ALL ] collect2: ld returned 1 exit status
[ERROR] make[2]: *** [cloog] Error 1
[ERROR] make[1]: *** [check-recursive] Error 1

See:
https://wiki.ubuntu.com/NattyNarwhal/ToolchainTransition

This patch fixes these errors by placing '-lm' at the right place on the command
line as libppl requires libm when linking cloog.

Signed-off-by: "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
yann@1625
     1
sniped from Debian
yann@1625
     2
http://bugs.gentoo.org/289615
yann@1625
     3
yann@1625
     4
2009-10-27  Aurelien Jarno  <aurelien@aurel32.net>
yann@1625
     5
yann@1625
     6
	* locale/programs/locarchive.c: use MMAP_SHARED to reserve memory
yann@1625
     7
	used later with MMAP_FIXED | MMAP_SHARED to cope with different
yann@1625
     8
	alignment restrictions.
yann@1625
     9
yann@1625
    10
diff -durN glibc-2.10.1.orig/locale/programs/locarchive.c glibc-2.10.1/locale/programs/locarchive.c
yann@1625
    11
--- glibc-2.10.1.orig/locale/programs/locarchive.c	2009-04-27 16:07:47.000000000 +0200
yann@1625
    12
+++ glibc-2.10.1/locale/programs/locarchive.c	2009-11-13 00:50:01.000000000 +0100
yann@1625
    13
@@ -134,7 +134,7 @@
yann@1625
    14
   size_t reserved = RESERVE_MMAP_SIZE;
yann@1625
    15
   int xflags = 0;
yann@1625
    16
   if (total < reserved
yann@1625
    17
-      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
yann@1625
    18
+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
yann@1625
    19
 		       -1, 0)) != MAP_FAILED))
yann@1625
    20
     xflags = MAP_FIXED;
yann@1625
    21
   else
yann@1625
    22
@@ -396,7 +396,7 @@
yann@1625
    23
   size_t reserved = RESERVE_MMAP_SIZE;
yann@1625
    24
   int xflags = 0;
yann@1625
    25
   if (total < reserved
yann@1625
    26
-      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
yann@1625
    27
+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
yann@1625
    28
 		       -1, 0)) != MAP_FAILED))
yann@1625
    29
     xflags = MAP_FIXED;
yann@1625
    30
   else
yann@1625
    31
@@ -614,7 +614,7 @@
yann@1625
    32
   int xflags = 0;
yann@1625
    33
   void *p;
yann@1625
    34
   if (st.st_size < reserved
yann@1625
    35
-      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_PRIVATE | MAP_ANON,
yann@1625
    36
+      && ((p = mmap64 (NULL, reserved, PROT_NONE, MAP_SHARED | MAP_ANON,
yann@1625
    37
 		       -1, 0)) != MAP_FAILED))
yann@1625
    38
     xflags = MAP_FIXED;
yann@1625
    39
   else