%define quadmath_arch %ix86 x86_64 ia64
%define tsan_arch x86_64 aarch64
-%define esan_arch x86_64 armv7l
+%define esan_arch x86_64 %arm
%define asan_arch x86_64 %ix86 ppc ppc64 %sparc %arm aarch64
%define itm_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc aarch64
%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k
%define quadmath_arch %ix86 x86_64 ia64
%define tsan_arch x86_64 aarch64
-%define esan_arch x86_64 armv7l
+%define esan_arch x86_64 %arm
%define asan_arch x86_64 %ix86 ppc ppc64 %sparc %arm aarch64
%define itm_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc aarch64
%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k
%define quadmath_arch %ix86 x86_64 ia64
%define tsan_arch x86_64 aarch64
-%define esan_arch x86_64 armv7l
+%define esan_arch x86_64 %arm
%define asan_arch x86_64 %ix86 ppc ppc64 %sparc %arm aarch64
%define itm_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc aarch64
%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k
%define quadmath_arch %ix86 x86_64 ia64
%define tsan_arch x86_64 aarch64
-%define esan_arch x86_64 armv7l
+%define esan_arch x86_64 %arm
%define asan_arch x86_64 %ix86 ppc ppc64 %sparc %arm aarch64
%define itm_arch x86_64 %ix86 %arm ppc ppc64 ppc64le s390 s390x %sparc aarch64
%define atomic_arch x86_64 %ix86 %arm aarch64 ppc ppc64 ppc64le s390 s390x %sparc m68k