aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorThomas Schwinge <thomas@codesourcery.com>2013-10-11 12:41:22 +0200
committerThomas Schwinge <tschwinge@gcc.gnu.org>2013-10-11 12:41:22 +0200
commitd1227447828bafb8f5360e387aa9312ab2c4d95e (patch)
tree2a99ba8598cc616896db3350090cf4be0673f2ff /gcc
parentacf0174b6f7a3f8fe1e2a27361bbf87dfe454530 (diff)
downloadgcc-d1227447828bafb8f5360e387aa9312ab2c4d95e.zip
gcc-d1227447828bafb8f5360e387aa9312ab2c4d95e.tar.gz
gcc-d1227447828bafb8f5360e387aa9312ab2c4d95e.tar.bz2
acinclude.m4 (gcc_GAS_FLAGS): Add more gcc_cv_as_flags overrides.
gcc/ * acinclude.m4 (gcc_GAS_FLAGS): Add more gcc_cv_as_flags overrides. From-SVN: r203410
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/acinclude.m412
-rwxr-xr-xgcc/configure8
3 files changed, 23 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 07f8daf..18dc504 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-11 Thomas Schwinge <thomas@codesourcery.com>
+
+ * acinclude.m4 (gcc_GAS_FLAGS): Add more gcc_cv_as_flags
+ overrides.
+ * configure: Regenerate.
+
2013-10-11 Jakub Jelinek <jakub@redhat.com>
* tree-pretty-print.c (dump_omp_clause): Handle OMP_CLAUSE__LOOPTEMP_
diff --git a/gcc/acinclude.m4 b/gcc/acinclude.m4
index e68be77..6798d6f 100644
--- a/gcc/acinclude.m4
+++ b/gcc/acinclude.m4
@@ -444,8 +444,16 @@ AC_DEFUN([gcc_GAS_FLAGS],
[AC_CACHE_CHECK([assembler flags], gcc_cv_as_flags,
[ case "$target" in
i[[34567]]86-*-linux*)
- dnl Always pass --32 to ia32 Linux assembler.
- gcc_cv_as_flags="--32"
+ dnl Override the default, which may be incompatible.
+ gcc_cv_as_flags=--32
+ ;;
+ x86_64-*-linux-gnux32)
+ dnl Override the default, which may be incompatible.
+ gcc_cv_as_flags=--x32
+ ;;
+ x86_64-*-linux*)
+ dnl Override the default, which may be incompatible.
+ gcc_cv_as_flags=--64
;;
powerpc*-*-darwin*)
dnl Always pass -arch ppc to assembler.
diff --git a/gcc/configure b/gcc/configure
index 2ac0347..4d12a21 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -21760,7 +21760,13 @@ if test "${gcc_cv_as_flags+set}" = set; then :
else
case "$target" in
i[34567]86-*-linux*)
- gcc_cv_as_flags="--32"
+ gcc_cv_as_flags=--32
+ ;;
+ x86_64-*-linux-gnux32)
+ gcc_cv_as_flags=--x32
+ ;;
+ x86_64-*-linux*)
+ gcc_cv_as_flags=--64
;;
powerpc*-*-darwin*)
gcc_cv_as_flags="-arch ppc"