Bug 465782 - s390x: Drop -mzarch -march=z900 from assembler options

The -mzarch flag is unsupported by Clang, and it is redundant on 64-bit
build systems.  Remove it.

Also remove '-march=z900', since it is unsupported by Clang as well.  It
would only be needed on build systems with a default architecture lower
than z900.  Such systems are out of service for some time now.

diff --git a/Makefile.all.am b/Makefile.all.am
index 1de1f13a7e0c1a8a5aab5198288eb62537ace017..94d65f2ccb4066b3197d37de727a2357022e89c7 100755 (executable)
--- a/Makefile.all.am
+++ b/Makefile.all.am
@@ -270,7 +270,7 @@ AM_CCASFLAGS_AMD64_DARWIN  = -arch x86_64 -g
 AM_FLAG_M3264_S390X_LINUX = @FLAG_M64@
 AM_CFLAGS_S390X_LINUX     = @FLAG_M64@ $(AM_CFLAGS_BASE) -fomit-frame-pointer
 AM_CFLAGS_PSO_S390X_LINUX = @FLAG_M64@ $(AM_CFLAGS_BASE) $(AM_CFLAGS_PSO_BASE)
-AM_CCASFLAGS_S390X_LINUX  = @FLAG_M64@ -g -mzarch -march=z900
+AM_CCASFLAGS_S390X_LINUX  = @FLAG_M64@ -g
 
 AM_FLAG_M3264_MIPS32_LINUX = @FLAG_M32@
 AM_CFLAGS_MIPS32_LINUX     = @FLAG_M32@ $(AM_CFLAGS_BASE)