summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makeconfig4
-rwxr-xr-xconfigure28
-rw-r--r--configure.ac17
4 files changed, 7 insertions, 48 deletions
diff --git a/ChangeLog b/ChangeLog
index 7c0072b88e..38cb052307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-27 Joseph Myers <joseph@codesourcery.com>
+
+ * configure.ac (libc_cv_need_minus_P): Remove configure test.
+ * configure: Regenerated.
+ * Makeconfig (asm-CPPFLAGS): Remove reference to -P in comment.
+
2015-10-26 Joseph Myers <joseph@codesourcery.com>
* configure.ac (old_glibc_headers): Remove configure test.
diff --git a/Makeconfig b/Makeconfig
index f3668c616a..c0f5e64ef5 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -345,9 +345,7 @@ endif
endif
# Flags to pass the C compiler when assembling preprocessed assembly code
-# (`.S' files). On some systems the assembler doesn't understand the `#' line
-# directives the preprocessor produces. If you have troubling compiling
-# assembly code, try using -P here to suppress these directives.
+# (`.S' files).
ifndef asm-CPPFLAGS
asm-CPPFLAGS =
endif
diff --git a/configure b/configure
index 22aa1b9372..1e9eba10b7 100755
--- a/configure
+++ b/configure
@@ -5272,34 +5272,6 @@ if test $ac_verc_fail = yes; then
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to use -P to assemble .S files" >&5
-$as_echo_n "checking whether we need to use -P to assemble .S files... " >&6; }
-if ${libc_cv_need_minus_P+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat > conftest.S <<EOF
-#include "confdefs.h"
-/* Nothing whatsoever. */
-EOF
-if { ac_try='${CC-cc} $CPPFLAGS $ASFLAGS -c conftest.S 1>&5'
- { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- libc_cv_need_minus_P=no
-else
- libc_cv_need_minus_P=yes
-fi
-rm -f conftest*
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libc_cv_need_minus_P" >&5
-$as_echo "$libc_cv_need_minus_P" >&6; }
-if test $libc_cv_need_minus_P = yes; then
- config_vars="$config_vars
-asm-CPPFLAGS = -P # The assembler can't grok cpp's # line directives."
-fi
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for .set assembler directive" >&5
$as_echo_n "checking for .set assembler directive... " >&6; }
if ${libc_cv_asm_set_directive+:} false; then :
diff --git a/configure.ac b/configure.ac
index 6947555be4..4879c48db7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1080,23 +1080,6 @@ AC_CHECK_PROG_VER(BISON, bison, --version,
[2.7*|[3-9].*|[1-9][0-9]*],
BISON=no)
-AC_CACHE_CHECK(whether we need to use -P to assemble .S files,
- libc_cv_need_minus_P, [dnl
-cat > conftest.S <<EOF
-#include "confdefs.h"
-/* Nothing whatsoever. */
-EOF
-if AC_TRY_COMMAND(${CC-cc} $CPPFLAGS $ASFLAGS -c conftest.S 1>&AS_MESSAGE_LOG_FD); then
- libc_cv_need_minus_P=no
-else
- libc_cv_need_minus_P=yes
-fi
-rm -f conftest*])
-if test $libc_cv_need_minus_P = yes; then
- config_vars="$config_vars
-asm-CPPFLAGS = -P # The assembler can't grok cpp's # line directives."
-fi
-
AC_CACHE_CHECK(for .set assembler directive, libc_cv_asm_set_directive, [dnl
cat > conftest.s <<EOF
.text