gcc/ChangeLog-archlevel * config/s390/s390-c.c (s390_cpu_cpp_builtins_internal): Define __S390_ARCH_LEVEL__. gcc/testsuite/ChangeLog-setmem * gcc.target/s390/md/setmem_long-1.c: Use "s390_runnable". * gcc.target/s390/md/rXsbg_mode_sXl.c: Likewise. * gcc.target/s390/md/andc-splitter-1.c: Likewise. * gcc.target/s390/md/andc-splitter-2.c: Likewise. * lib/gcc-dg.exp (gcc-dg-runtest): Export torture_current_flags. * gcc.target/s390/s390.exp: Import torture_current_flags. (check_effective_target_s390_runnable): New. (check_effective_target_z900_runnable): New. (check_effective_target_z990_runnable): New. (check_effective_target_z9_ec_runnable): New. (check_effective_target_z10_runnable): New. (check_effective_target_z196_runnable): New. (check_effective_target_zEC12_runnable): New. (check_effective_target_z13_runnable): New. (check_effective_target_z10_instructions): Removed. (MD_TEST_OPTS): Add optimization level without -march=.