patches/dmalloc/5.5.2/160-strdup_macro.patch
author Bryan Hundven <bryanhundven@gmail.com>
Sun Jun 26 03:26:54 2011 -0700 (2011-06-26)
changeset 2515 364b06df9e3a
parent 569 147a29d2e81f
permissions -rw-r--r--
glibc: Refactor startfiles/headers into do_libc_backend()

Refactor the contents of 'do_libc_start_files()' and 'do_libc()' into a
parameterized 'do_libc_backend()'. 'do_libc_start_files()' and 'do_libc()'
call 'do_libc_backend()' with either 'libc_mode=startfiles' or
'libc_mode=final' (respectively) so that the startfiles/headers and
the final libc builds are configured and built with the same options.

One example of where this is needed is when building a mips toolchain.
Previously, if you were building an n32 toolchain, you wouldn't have
noticed an issue, because if '-mabi' is not in CFLAGS, n32 is the
default:

http://sourceware.org/git/?p=glibc-ports.git;a=blob;f=sysdeps/mips/preconfigure;hb=HEAD

But when trying to build an o32 or n64 toolchain the build would
have failed. This is because (e)glibc expects "-mabi={o32,n32,n64}" to be
in CFLAGS, but was not previously provided in 'do_libc_start_files()'.
The build failure would happen in the shared-core gcc when it tries to
configure an n64 or o32 gcc with an n32 libc.

A simpler solution would have been to just add TARGET_CFLAGS to configure
in 'do_libc_start_files()', but this way makes configure and make
consistent for both steps.

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
yann@569
     1
--- dmalloc-5.5.2.orig/configure	2008-06-17 13:10:09.000000000 +0200
yann@569
     2
+++ dmalloc-5.5.2/configure	2008-06-17 13:11:25.000000000 +0200
yann@569
     3
@@ -4691,8 +4691,35 @@
yann@569
     4
 echo "$as_me:$LINENO: checking strdup macro" >&5
yann@569
     5
 echo $ECHO_N "checking strdup macro... $ECHO_C" >&6
yann@569
     6
 if test "$cross_compiling" = yes; then
yann@569
     7
-  ac_cv_strdup_macro=no
yann@569
     8
+  cat >conftest.$ac_ext <<_ACEOF
yann@569
     9
+/* confdefs.h */
yann@569
    10
+_ACEOF
yann@569
    11
+cat confdefs.h >>conftest.$ac_ext
yann@569
    12
+cat >>conftest.$ac_ext <<_ACEOF
yann@569
    13
+/* end confdefs.h.  */
yann@569
    14
+
yann@569
    15
+#if HAVE_STDLIB_H
yann@569
    16
+#  include <string.h>
yann@569
    17
+#endif
yann@569
    18
+
yann@569
    19
+#ifndef strdup
yann@569
    20
+       choke me
yann@569
    21
+#endif
yann@569
    22
 
yann@569
    23
+main() { exit(0); }
yann@569
    24
+
yann@569
    25
+_ACEOF
yann@569
    26
+rm -f conftest.o conftest.obj
yann@569
    27
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
yann@569
    28
+  (eval $ac_compile) 2>&5
yann@569
    29
+  ac_status=$?
yann@569
    30
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
yann@569
    31
+  (exit $ac_status); }; then
yann@569
    32
+  ac_cv_strdup_macro=yes
yann@569
    33
+else
yann@569
    34
+  ac_cv_strdup_macro=no
yann@569
    35
+fi
yann@569
    36
+  
yann@569
    37
 else
yann@569
    38
   cat >conftest.$ac_ext <<_ACEOF
yann@569
    39
 /* confdefs.h.  */