patches/glibc/2.9/120-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch
author "Benoît Thébaudeau" <benoit.thebaudeau@advansee.com>
Fri Jan 27 13:31:16 2012 +0100 (2012-01-27)
changeset 2854 a70abdbfa342
parent 1201 c9967a6e3b25
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@1201
     1
Original patch from: gentoo/src/patchsets/glibc/2.9/0050_all_glibc-_nss_dns_gethostbyaddr2_r-check-and-adjust-the-buffer-alignment.patch
yann@1201
     2
yann@1201
     3
-= BEGIN original header =-
yann@1201
     4
http://sourceware.org/ml/libc-alpha/2009-01/msg00000.html
yann@1201
     5
yann@1201
     6
From 8ad7030880eaa18dcabf8e284e79026301fd3fa4 Mon Sep 17 00:00:00 2001
yann@1201
     7
From: Ulrich Drepper <drepper@redhat.com>
yann@1201
     8
Date: Thu, 8 Jan 2009 00:02:38 +0000
yann@1201
     9
Subject: [PATCH] (_nss_dns_gethostbyaddr2_r): Check and adjust the buffer alignment.
yann@1201
    10
yann@1201
    11
-= END original header =-
yann@1201
    12
yann@1201
    13
diff -durN glibc-2_9.orig/resolv/nss_dns/dns-host.c glibc-2_9/resolv/nss_dns/dns-host.c
yann@1201
    14
--- glibc-2_9.orig/resolv/nss_dns/dns-host.c	2008-11-12 08:52:20.000000000 +0100
yann@1201
    15
+++ glibc-2_9/resolv/nss_dns/dns-host.c	2009-02-02 22:00:36.000000000 +0100
yann@1201
    16
@@ -364,6 +364,19 @@
yann@1201
    17
   int n, status;
yann@1201
    18
   int olderr = errno;
yann@1201
    19
 
yann@1201
    20
+ uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data);
yann@1201
    21
+ buffer += pad;
yann@1201
    22
+ buflen = buflen > pad ? buflen - pad : 0;
yann@1201
    23
+
yann@1201
    24
+ if (__builtin_expect (buflen < sizeof (struct host_data), 0))
yann@1201
    25
+   {
yann@1201
    26
+     *errnop = ERANGE;
yann@1201
    27
+     *h_errnop = NETDB_INTERNAL;
yann@1201
    28
+     return NSS_STATUS_TRYAGAIN;
yann@1201
    29
+   }
yann@1201
    30
+
yann@1201
    31
+ host_data = (struct host_data *) buffer;
yann@1201
    32
+
yann@1201
    33
   if (__res_maybe_init (&_res, 0) == -1)
yann@1201
    34
     return NSS_STATUS_UNAVAIL;
yann@1201
    35