diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:56:13 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 18:57:13 +0000 |
| commit | 82dd75a7f436a19047325d62182590c9f9e23a78 (patch) | |
| tree | 60ca20c8cf2b0d178d84725c0715471f76df97e1 /aclocal.m4 | |
| parent | 0bbb676a2342367c4e52b35e890f24667dabb348 (diff) | |
| parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) | |
Merge commit 'refs/top-bases/t/tls' into t/tls
Diffstat (limited to 'aclocal.m4')
| -rw-r--r-- | aclocal.m4 | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/aclocal.m4 b/aclocal.m4 index 3d64f7773d..08fa1ac6d0 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -121,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, @@ -141,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]) @@ -226,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]) @@ -268,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]) @@ -291,8 +293,8 @@ 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. |