aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2010-10-07 16:20:37 +0000
committerDJ Delorie <dj@redhat.com>2010-10-07 16:20:37 +0000
commit94e482001fa9d7a85e52f0be277cac380243a74e (patch)
treefb20501e4d6df048074aa92045190a3fbd37e0dd
parent5d4c71e1273480dd7ced19e193649093b30f1bd1 (diff)
downloadgdb-94e482001fa9d7a85e52f0be277cac380243a74e.zip
gdb-94e482001fa9d7a85e52f0be277cac380243a74e.tar.gz
gdb-94e482001fa9d7a85e52f0be277cac380243a74e.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rwxr-xr-xlibiberty/configure19
-rw-r--r--libiberty/configure.ac2
3 files changed, 13 insertions, 13 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 9316975..8c9a79f 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-07 Andi Kleen <ak@linux.intel.com>
+
+ * configure: Regenerate.
+ * configure.ac: Turn PR_SET_NAME check into link check.
+
2010-10-06 Andi Kleen <ak@linux.intel.com>
* Makefile.in (CFILES): Add setproctitle.
diff --git a/libiberty/configure b/libiberty/configure
index 7ff7792..7579000 100755
--- a/libiberty/configure
+++ b/libiberty/configure
@@ -5707,13 +5707,10 @@ fi
# check for prctl PR_SET_NAME
-if test "$cross_compiling" = yes; then :
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run test program while cross compiling
-See \`config.log' for more details." "$LINENO" 5; }
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+if test x$gcc_no_link = xyes; then
+ as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5
+fi
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/prctl.h>
@@ -5723,15 +5720,13 @@ int main()
}
_ACEOF
-if ac_fn_c_try_run "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
$as_echo "#define HAVE_PRCTL_SET_NAME 1" >>confdefs.h
fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
- conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
+rm -f core conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
case "${host}" in
*-*-cygwin* | *-*-mingw*)
diff --git a/libiberty/configure.ac b/libiberty/configure.ac
index 8b7be18..73ea6c9 100644
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
@@ -536,7 +536,7 @@ AC_SUBST(CHECK)
AC_SUBST(target_header_dir)
# check for prctl PR_SET_NAME
-AC_RUN_IFELSE([AC_LANG_SOURCE([[
+AC_LINK_IFELSE([AC_LANG_SOURCE([[
#include <sys/prctl.h>
int main()
{