Description: Don't target newer s390 subarchitectures
 Debian only targets the base
Author: Stefano Rivera <stefanor@debian.org>
Bug-Debian: https://bugs.debian.org/823916

--- a/rpython/jit/backend/zarch/test/test_auto_encoding.py
+++ b/rpython/jit/backend/zarch/test/test_auto_encoding.py
@@ -204,7 +204,7 @@
                 g.write('%s\n' % op)
                 oplist.append(op)
             g.write('\t.string "%s"\n' % END_TAG)
-        proc = subprocess.Popen(['as', '-m64', '-mzarch', '-march=z196',
+        proc = subprocess.Popen(['as',
                                  inputname, '-o', filename],
                                 stdout=subprocess.PIPE,
                                 stderr=subprocess.PIPE)
--- a/rpython/translator/platform/linux.py
+++ b/rpython/translator/platform/linux.py
@@ -21,10 +21,6 @@
     so_ext = 'so'
     so_prefixes = ('lib', '')
 
-    if platform.machine() == 's390x':
-        # force the right target arch for s390x
-        cflags = ('-march=z196','-m64','-mzarch') + cflags
-
     def _args_for_shared(self, args):
         return ['-shared'] + args
 
