Fix IA64 links-dso-program link.

[thirdparty/glibc.git] / aclocal.m4

diff --git a/aclocal.m4 b/aclocal.m4
index 23569b65f7f80af0264f56d04952f462a543377b..08fa1ac6d05323fd0bac1f0d8820ba78ba6cf9a0 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,7 @@
 dnl We require that everyone use exactly the same Autoconf version so that
 dnl the internal functions defined and used by the main configure script
-dnl match those expected by the fragments.
+dnl match those expected by the fragments.  When changing this version,
+dnl install.texi also needs to be updated.
 m4_define([GLIBC_AUTOCONF_VERSION], [2.69])
 m4_if(m4_defn([AC_AUTOCONF_VERSION]), GLIBC_AUTOCONF_VERSION, [],
       [m4_fatal(m4_flatten(
@@ -120,6 +121,8 @@ OBJDUMP=`$CC -print-prog-name=objdump`
 AC_SUBST(OBJDUMP)
 OBJCOPY=`$CC -print-prog-name=objcopy`
 AC_SUBST(OBJCOPY)
+GPROF=`$CC -print-prog-name=gprof`
+AC_SUBST(GPROF)
 
 # Determine whether we are using GNU binutils.
 AC_CACHE_CHECK(whether $AS is GNU as, libc_cv_prog_as_gnu,
@@ -140,7 +143,7 @@ int _start (void) { return 0; }
 int __start (void) { return 0; }
 $1
 EOF
-AS_IF([AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS -o conftest
+AS_IF([AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS $no_ssp -o conftest
                       conftest.c -static -nostartfiles -nostdlib
                       1>&AS_MESSAGE_LOG_FD])],
       [$2], [$3])
@@ -225,7 +228,7 @@ if test x"$gnu_ld" = x"yes"; then
     cat > conftest.c <<EOF
 int _start (void) { return 42; }
 EOF
-    if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+    if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS $no_ssp
                                $2 -nostdlib -nostartfiles
                                -fPIC -shared -o conftest.so conftest.c
                                1>&AS_MESSAGE_LOG_FD])
@@ -267,7 +270,7 @@ libc_compiler_builtin_inlined=no
 cat > conftest.c <<EOF
 int _start (void) { $2 return 0; }
 EOF
-if ! AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
+if ! AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS $no_ssp
                     $3 -nostdlib -nostartfiles
                     -S conftest.c -o - | fgrep "$1"
                     1>&AS_MESSAGE_LOG_FD])
@@ -290,12 +293,12 @@ AC_DEFUN([LIBC_SLIBDIR_RTLDDIR],
 [test -n "$libc_cv_slibdir" ||
 case "$prefix" in
 /usr | /usr/)
-  libc_cv_slibdir=/$1
-  libc_cv_rtlddir=/$2
+  libc_cv_slibdir='/$1'
+  libc_cv_rtlddir='/$2'
   if test "$libdir" = '${exec_prefix}/lib'; then
     libdir='${exec_prefix}/$1';
     # Locale data can be shared between 32-bit and 64-bit libraries.
-    libc_cv_localedir='${exec_prefix}/lib/locale'
+    libc_cv_complocaledir='${exec_prefix}/lib/locale'
   fi
   ;;
 esac])