[PATCH 2/6] Revert "x86: Replace evex-no-scale.s with evex-no-scale-[32|64].s"

[Jan Beulich]

This reverts commit 19449d7c67690c641b1ec9c13ff3531677a5afcc, addressing
the issue that was run into back then: There was no relationship to i686-*
and/or cross builds on 64-bit hosts. The sole problem was the use of / as
as comment character in certain ELF targets. Instead of division, use a
comparison operation.

gas/
2020-07-XX  Jan Beulich  <jbeulich@suse.com>

	* testsuite/gas/i386/evex-no-scale-32.d,
	testsuite/gas/i386/evex-no-scale-64.d: Add #source.
	* testsuite/gas/i386/evex-no-scale-32.s,
	testsuite/gas/i386/evex-no-scale-64.s: Rename / fold into ...
	* testsuite/gas/i386/evex-no-scale.s: ... this.

--- a/gas/testsuite/gas/i386/evex-no-scale-32.d
+++ b/gas/testsuite/gas/i386/evex-no-scale-32.d
@@ -1,3 +1,4 @@
+#source: evex-no-scale.s
 #objdump: -dw
 #name: ix86 EVEX no disp scaling
 
--- a/gas/testsuite/gas/i386/evex-no-scale-32.s
+++ /dev/null
@@ -1,7 +0,0 @@
-	.allow_index_reg
-	.text
-disp:
-	vmovaps	64(,%eax), %zmm0
-	vmovaps	64(,%eiz), %zmm0
-	vmovaps	64, %zmm0
-	addr16 vmovaps 64, %zmm0
--- a/gas/testsuite/gas/i386/evex-no-scale-64.d
+++ b/gas/testsuite/gas/i386/evex-no-scale-64.d
@@ -1,3 +1,4 @@
+#source: evex-no-scale.s
 #objdump: -dw
 #name: x86-64 EVEX no disp scaling
 
--- a/gas/testsuite/gas/i386/evex-no-scale-64.s
+++ /dev/null
@@ -1,9 +0,0 @@
-	.allow_index_reg
-	.text
-disp:
-	vmovaps	-1024(%rip), %zmm0
-	vmovaps	64(,%rax), %zmm0
-	vmovaps	64(,%riz), %zmm0
-	vmovaps	64(,%eax), %zmm0
-	vmovaps	64(,%eiz), %zmm0
-	vmovaps	64, %zmm0
--- /dev/null
+++ b/gas/testsuite/gas/i386/evex-no-scale.s
@@ -0,0 +1,19 @@
+	.allow_index_reg
+	.section .probe, "", @progbits
+.Lprobe_64bit:
+	inc	%eax
+.equiv is_64bit, (. - .Lprobe_64bit) > 1
+
+	.text
+disp:
+.if is_64bit
+	vmovaps	-1024(%rip), %zmm0
+	vmovaps	64(,%rax), %zmm0
+	vmovaps	64(,%riz), %zmm0
+.endif
+	vmovaps	64(,%eax), %zmm0
+	vmovaps	64(,%eiz), %zmm0
+	vmovaps	64, %zmm0
+.if !is_64bit
+	addr16 vmovaps 64, %zmm0
+.endif