* [COMMITTED BPF] bpf: default to using pseudo-C assembly syntax by default
@ 2024-04-25 15:35 Jose E. Marchesi
0 siblings, 0 replies; only message in thread
From: Jose E. Marchesi @ 2024-04-25 15:35 UTC (permalink / raw)
To: gcc-patches
At this point the kernel headers that almost all BPF programs use
contain pseudo-C inline assembly and having the GNU toolchain using
the conventional assembly syntax by default would force users to
specify the command-line option explicitly almost all of the time,
which is very inconvenient.
This patch changes GCC in order to recognize and generate the pseudo-C
assembly syntax of BPF by default. The ASM_SPEC is adapted
accordingly, and in a way that the current release of the BPF
assembler (which still expects conventional assembler syntax by
default) does the right thing.
Tested in bpf-unknown-none-bpf target and x86_64-linux-gnu host.
No regressions.
gcc/ChangeLog
* config/bpf/bpf.opt: Use ASM_PSEUDOC for the default value of
-masm.
* config/bpf/bpf.h (ASM_SPEC): Adapt accordingly.
* doc/invoke.texi (eBPF Options): Update.
gcc/testsuite/ChangeLog
* gcc.target/bpf/alu-1.c: Specify conventional asm dialect.
* gcc.target/bpf/xbpf-indirect-call-1.c: Likewise.
* gcc.target/bpf/sync-fetch-and-add.c: Likewise.
* gcc.target/bpf/smov-2.c: Likewise.
* gcc.target/bpf/smov-1.c: Likewise.
* gcc.target/bpf/smod-1.c: Likewise.
* gcc.target/bpf/sload-1.c: Likewise.
* gcc.target/bpf/sdiv-1.c: Likewise.
* gcc.target/bpf/nop-1.c: Likewise.
* gcc.target/bpf/neg-1.c: Likewise.
* gcc.target/bpf/ldxdw.c: Likewise.
* gcc.target/bpf/jmp-1.c: Likewise.
* gcc.target/bpf/inline-memops-threshold-1.c: Likewise.
* gcc.target/bpf/float-1.c: Likewise.
* gcc.target/bpf/double-2.c: Likewise.
* gcc.target/bpf/double-1.c: Likewise.
* gcc.target/bpf/core-builtin-type-id.c: Likewise.
* gcc.target/bpf/core-builtin-type-based.c: Likewise.
* gcc.target/bpf/core-builtin-fieldinfo-size-1.c: Likewise.
* gcc.target/bpf/core-builtin-fieldinfo-sign-2.c: Likewise.
* gcc.target/bpf/core-builtin-fieldinfo-sign-1.c: Likewise.
* gcc.target/bpf/core-builtin-fieldinfo-rshift-2.c: Likewise.
* gcc.target/bpf/core-builtin-fieldinfo-rshift-1.c: Likewise.
* gcc.target/bpf/core-builtin-fieldinfo-offset-1.c: Likewise.
* gcc.target/bpf/core-builtin-fieldinfo-lshift-2.c: Likewise.
* gcc.target/bpf/core-builtin-fieldinfo-lshift-1-le.c: Likewise.
* gcc.target/bpf/core-builtin-fieldinfo-lshift-1-be.c: Likewise.
* gcc.target/bpf/core-builtin-fieldinfo-existence-1.c: Likewise.
* gcc.target/bpf/core-builtin-fieldinfo-errors-2.c: Likewise.
* gcc.target/bpf/core-builtin-fieldinfo-errors-1.c: Likewise.
* gcc.target/bpf/core-builtin-fieldinfo-const-elimination.c:
Likewise.
* gcc.target/bpf/core-builtin-exprlist-4.c: Likewise.
* gcc.target/bpf/core-builtin-exprlist-3.c: Likewise.
* gcc.target/bpf/core-builtin-exprlist-2.c: Likewise.
* gcc.target/bpf/core-builtin-exprlist-1.c: Likewise.
* gcc.target/bpf/core-builtin-enumvalue-opt.c: Likewise.
* gcc.target/bpf/core-builtin-enumvalue-errors.c: Likewise.
* gcc.target/bpf/core-builtin-enumvalue.c: Likewise.
* gcc.target/bpf/core-builtin-3.c: Likewise.
* gcc.target/bpf/core-builtin-2.c: Likewise.
* gcc.target/bpf/core-builtin-1.c: Likewise.
* gcc.target/bpf/core-attr-struct-as-array.c: Likewise.
* gcc.target/bpf/core-attr-6.c: Likewise.
* gcc.target/bpf/core-attr-5.c: Likewise.
* gcc.target/bpf/core-attr-4.c: Likewise.
* gcc.target/bpf/core-attr-3.c: Likewise.
* gcc.target/bpf/core-attr-2.c: Likewise.
* gcc.target/bpf/core-attr-1.c: Likewise.
* gcc.target/bpf/builtin-load.c: Likewise.
* gcc.target/bpf/btfext-funcinfo-nocore.c: Likewise.
* gcc.target/bpf/btfext-funcinfo.c: Likewise.
* gcc.target/bpf/bswap-1.c: Likewise.
* gcc.target/bpf/bswap-2.c: Likewise.
* gcc.target/bpf/attr-kernel-helper.c: Likewise.
* gcc.target/bpf/atomic-xchg-2.c: Likewise.
* gcc.target/bpf/atomic-xchg-1.c: Likewise.
* gcc.target/bpf/atomic-op-3.c: Likewise.
* gcc.target/bpf/atomic-op-2.c: Likewise.
* gcc.target/bpf/atomic-op-1.c: Likewise.
* gcc.target/bpf/atomic-fetch-op-3.c: Likewise.
* gcc.target/bpf/atomic-fetch-op-2.c: Likewise.
* gcc.target/bpf/atomic-fetch-op-1.c: Likewise.
* gcc.target/bpf/atomic-cmpxchg-2.c: Likewise.
* gcc.target/bpf/atomic-cmpxchg-1.c: Likewise.
* gcc.target/bpf/alu-2.c: Likewise.
---
gcc/config/bpf/bpf.h | 4 +++-
gcc/config/bpf/bpf.opt | 2 +-
gcc/doc/invoke.texi | 2 +-
gcc/testsuite/gcc.target/bpf/alu-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/alu-2.c | 2 +-
gcc/testsuite/gcc.target/bpf/atomic-cmpxchg-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/atomic-cmpxchg-2.c | 2 +-
gcc/testsuite/gcc.target/bpf/atomic-fetch-op-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/atomic-fetch-op-2.c | 2 +-
gcc/testsuite/gcc.target/bpf/atomic-fetch-op-3.c | 2 +-
gcc/testsuite/gcc.target/bpf/atomic-op-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/atomic-op-2.c | 2 +-
gcc/testsuite/gcc.target/bpf/atomic-op-3.c | 2 +-
gcc/testsuite/gcc.target/bpf/atomic-xchg-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/atomic-xchg-2.c | 2 +-
gcc/testsuite/gcc.target/bpf/attr-kernel-helper.c | 2 +-
gcc/testsuite/gcc.target/bpf/bswap-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/bswap-2.c | 2 +-
gcc/testsuite/gcc.target/bpf/btfext-funcinfo-nocore.c | 2 +-
gcc/testsuite/gcc.target/bpf/btfext-funcinfo.c | 2 +-
gcc/testsuite/gcc.target/bpf/builtin-load.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-attr-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-attr-2.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-attr-3.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-attr-4.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-attr-5.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-attr-6.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-attr-struct-as-array.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-2.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-3.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-errors.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-opt.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-2.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-3.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-4.c | 2 +-
.../gcc.target/bpf/core-builtin-fieldinfo-const-elimination.c | 2 +-
.../gcc.target/bpf/core-builtin-fieldinfo-errors-1.c | 2 +-
.../gcc.target/bpf/core-builtin-fieldinfo-errors-2.c | 2 +-
.../gcc.target/bpf/core-builtin-fieldinfo-existence-1.c | 2 +-
.../gcc.target/bpf/core-builtin-fieldinfo-lshift-1-be.c | 2 +-
.../gcc.target/bpf/core-builtin-fieldinfo-lshift-1-le.c | 2 +-
.../gcc.target/bpf/core-builtin-fieldinfo-lshift-2.c | 2 +-
.../gcc.target/bpf/core-builtin-fieldinfo-offset-1.c | 2 +-
.../gcc.target/bpf/core-builtin-fieldinfo-rshift-1.c | 2 +-
.../gcc.target/bpf/core-builtin-fieldinfo-rshift-2.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-2.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-size-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c | 2 +-
gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c | 2 +-
gcc/testsuite/gcc.target/bpf/double-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/double-2.c | 2 +-
gcc/testsuite/gcc.target/bpf/float-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/inline-memops-threshold-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/jmp-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/ldxdw.c | 2 +-
gcc/testsuite/gcc.target/bpf/neg-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/nop-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/sdiv-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/sload-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/smod-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/smov-1.c | 2 +-
gcc/testsuite/gcc.target/bpf/smov-2.c | 2 +-
gcc/testsuite/gcc.target/bpf/sync-fetch-and-add.c | 1 +
gcc/testsuite/gcc.target/bpf/xbpf-indirect-call-1.c | 2 +-
68 files changed, 70 insertions(+), 67 deletions(-)
diff --git a/gcc/config/bpf/bpf.h b/gcc/config/bpf/bpf.h
index 3cc5daa1b58..c67e17526bf 100644
--- a/gcc/config/bpf/bpf.h
+++ b/gcc/config/bpf/bpf.h
@@ -23,7 +23,9 @@
/**** Controlling the Compilation Driver. */
#define ASM_SPEC "%{mbig-endian:-EB} %{!mbig-endian:-EL} %{mxbpf:-mxbpf} " \
- "%{masm=pseudoc:-mdialect=pseudoc}"
+ "%{masm=normal:-mdialect=normal} " \
+ "%{masm=pseudoc:-mdialect=pseudoc} " \
+ "%{!masm=normal:%{!masm=pseudoc:-mdialect=pseudoc}}"
#define LINK_SPEC "%{mbig-endian:-EB} %{!mbig-endian:-EL}"
#define LIB_SPEC ""
#define STARTFILE_SPEC ""
diff --git a/gcc/config/bpf/bpf.opt b/gcc/config/bpf/bpf.opt
index 541ebe4dfc4..62156e26799 100644
--- a/gcc/config/bpf/bpf.opt
+++ b/gcc/config/bpf/bpf.opt
@@ -96,7 +96,7 @@ EnumValue
Enum(bpf_isa) String(v4) Value(ISA_V4)
masm=
-Target RejectNegative Joined Var(asm_dialect) Enum(asm_dialect) Init(ASM_NORMAL)
+Target RejectNegative Joined Var(asm_dialect) Enum(asm_dialect) Init(ASM_PSEUDOC)
Use given assembler dialect.
Enum
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index 27c31ab0c86..8f0d6d30377 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -25753,7 +25753,7 @@ exit, respectively.
@opindex masm=@var{dialect}
@item -masm=@var{dialect}
Outputs assembly instructions using eBPF selected @var{dialect}. The default
-is @samp{normal}.
+is @samp{pseudoc}.
Supported values for @var{dialect} are:
diff --git a/gcc/testsuite/gcc.target/bpf/alu-1.c b/gcc/testsuite/gcc.target/bpf/alu-1.c
index 98149305e82..be85a451786 100644
--- a/gcc/testsuite/gcc.target/bpf/alu-1.c
+++ b/gcc/testsuite/gcc.target/bpf/alu-1.c
@@ -2,7 +2,7 @@
not enabled. */
/* { dg-do compile } */
-/* { dg-options "-mno-alu32" } */
+/* { dg-options "-mno-alu32 -masm=normal" } */
int foo (int a, int b)
{
diff --git a/gcc/testsuite/gcc.target/bpf/alu-2.c b/gcc/testsuite/gcc.target/bpf/alu-2.c
index 0444a9bc68a..1a8f2af9b26 100644
--- a/gcc/testsuite/gcc.target/bpf/alu-2.c
+++ b/gcc/testsuite/gcc.target/bpf/alu-2.c
@@ -1,6 +1,6 @@
/* Check add and sub instructions. */
/* { dg-do compile } */
-/* { dg-options "" } */
+/* { dg-options "-masm=normal" } */
long foo (long x, long y)
{
diff --git a/gcc/testsuite/gcc.target/bpf/atomic-cmpxchg-1.c b/gcc/testsuite/gcc.target/bpf/atomic-cmpxchg-1.c
index 4bb6a7dba29..c0c85a2b321 100644
--- a/gcc/testsuite/gcc.target/bpf/atomic-cmpxchg-1.c
+++ b/gcc/testsuite/gcc.target/bpf/atomic-cmpxchg-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-mv3-atomics -O2" } */
+/* { dg-options "-mv3-atomics -O2 -masm=normal" } */
int
foo (int *p, int *expected, int desired)
diff --git a/gcc/testsuite/gcc.target/bpf/atomic-cmpxchg-2.c b/gcc/testsuite/gcc.target/bpf/atomic-cmpxchg-2.c
index 4036570ac60..c452e0385e3 100644
--- a/gcc/testsuite/gcc.target/bpf/atomic-cmpxchg-2.c
+++ b/gcc/testsuite/gcc.target/bpf/atomic-cmpxchg-2.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-mno-v3-atomics -O2" } */
+/* { dg-options "-mno-v3-atomics -O2 -masm=normal" } */
int
foo (int *p, int *expected, int desired)
diff --git a/gcc/testsuite/gcc.target/bpf/atomic-fetch-op-1.c b/gcc/testsuite/gcc.target/bpf/atomic-fetch-op-1.c
index 533e955fe88..1013bcafc7a 100644
--- a/gcc/testsuite/gcc.target/bpf/atomic-fetch-op-1.c
+++ b/gcc/testsuite/gcc.target/bpf/atomic-fetch-op-1.c
@@ -1,7 +1,7 @@
/* Test 64-bit atomic-fetch-op instructions. */
/* { dg-do compile } */
-/* { dg-options "-mv3-atomics -O2" } */
+/* { dg-options "-mv3-atomics -O2 -masm=normal" } */
long val;
diff --git a/gcc/testsuite/gcc.target/bpf/atomic-fetch-op-2.c b/gcc/testsuite/gcc.target/bpf/atomic-fetch-op-2.c
index 6b9ee6348b5..6fce8e9b69c 100644
--- a/gcc/testsuite/gcc.target/bpf/atomic-fetch-op-2.c
+++ b/gcc/testsuite/gcc.target/bpf/atomic-fetch-op-2.c
@@ -1,7 +1,7 @@
/* Test 32-bit atomic-fetch-op instructions. */
/* { dg-do compile } */
-/* { dg-options "-mv3-atomics -O2" } */
+/* { dg-options "-mv3-atomics -O2 -masm=normal" } */
int val;
diff --git a/gcc/testsuite/gcc.target/bpf/atomic-fetch-op-3.c b/gcc/testsuite/gcc.target/bpf/atomic-fetch-op-3.c
index 044a2f76474..04f9e5dbfe9 100644
--- a/gcc/testsuite/gcc.target/bpf/atomic-fetch-op-3.c
+++ b/gcc/testsuite/gcc.target/bpf/atomic-fetch-op-3.c
@@ -1,7 +1,7 @@
/* Test atomic-fetch-op instructions are disabled with -mno-v3-atomics. */
/* { dg-do compile } */
-/* { dg-options "-mno-v3-atomics -O2" } */
+/* { dg-options "-mno-v3-atomics -O2 -masm=normal" } */
long val;
diff --git a/gcc/testsuite/gcc.target/bpf/atomic-op-1.c b/gcc/testsuite/gcc.target/bpf/atomic-op-1.c
index 453c0ed47ce..5c87dcbffe6 100644
--- a/gcc/testsuite/gcc.target/bpf/atomic-op-1.c
+++ b/gcc/testsuite/gcc.target/bpf/atomic-op-1.c
@@ -1,6 +1,6 @@
/* Test 64-bit non-fetch atomic operations. */
/* { dg-do compile } */
-/* { dg-options "-mv3-atomics -O2" } */
+/* { dg-options "-mv3-atomics -O2 -masm=normal" } */
long val;
diff --git a/gcc/testsuite/gcc.target/bpf/atomic-op-2.c b/gcc/testsuite/gcc.target/bpf/atomic-op-2.c
index daacf42c00b..8331d33465f 100644
--- a/gcc/testsuite/gcc.target/bpf/atomic-op-2.c
+++ b/gcc/testsuite/gcc.target/bpf/atomic-op-2.c
@@ -1,6 +1,6 @@
/* Test 32-bit non-fetch atomic operations. */
/* { dg-do compile } */
-/* { dg-options "-mv3-atomics -O2" } */
+/* { dg-options "-mv3-atomics -O2 -masm=normal" } */
int val;
diff --git a/gcc/testsuite/gcc.target/bpf/atomic-op-3.c b/gcc/testsuite/gcc.target/bpf/atomic-op-3.c
index b2ce2892634..af5b607c093 100644
--- a/gcc/testsuite/gcc.target/bpf/atomic-op-3.c
+++ b/gcc/testsuite/gcc.target/bpf/atomic-op-3.c
@@ -1,6 +1,6 @@
/* Test that atomic insns are properly disabled with -mno-v3-atomics. */
/* { dg-do compile } */
-/* { dg-options "-mno-v3-atomics -O2" } */
+/* { dg-options "-mno-v3-atomics -O2 -masm=normal" } */
int val;
diff --git a/gcc/testsuite/gcc.target/bpf/atomic-xchg-1.c b/gcc/testsuite/gcc.target/bpf/atomic-xchg-1.c
index bab806393df..e8d4f14f36b 100644
--- a/gcc/testsuite/gcc.target/bpf/atomic-xchg-1.c
+++ b/gcc/testsuite/gcc.target/bpf/atomic-xchg-1.c
@@ -1,6 +1,6 @@
/* Test atomic exchange instruction. */
/* { dg-do compile } */
-/* { dg-options "-mv3-atomics -O2" } */
+/* { dg-options "-mv3-atomics -O2 -masm=normal" } */
int foo (int *p, int *new)
{
diff --git a/gcc/testsuite/gcc.target/bpf/atomic-xchg-2.c b/gcc/testsuite/gcc.target/bpf/atomic-xchg-2.c
index 3b6324e966b..9cc56e05fb7 100644
--- a/gcc/testsuite/gcc.target/bpf/atomic-xchg-2.c
+++ b/gcc/testsuite/gcc.target/bpf/atomic-xchg-2.c
@@ -1,6 +1,6 @@
/* Test atomic exchange instruction is disabled with -mno-v3-atomics. */
/* { dg-do compile } */
-/* { dg-options "-mno-v3-atomics -O2" } */
+/* { dg-options "-mno-v3-atomics -O2 -masm=normal" } */
int foo (int *p, int *new)
{
diff --git a/gcc/testsuite/gcc.target/bpf/attr-kernel-helper.c b/gcc/testsuite/gcc.target/bpf/attr-kernel-helper.c
index 7c5a0007c97..40c541f0c75 100644
--- a/gcc/testsuite/gcc.target/bpf/attr-kernel-helper.c
+++ b/gcc/testsuite/gcc.target/bpf/attr-kernel-helper.c
@@ -1,7 +1,7 @@
/* Basic test for kernel_helper attribute BTF information. */
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf" } */
+/* { dg-options "-O0 -dA -gbtf -masm=normal" } */
extern int foo_helper(int) __attribute((kernel_helper(42)));
extern int foo_nohelper(int);
diff --git a/gcc/testsuite/gcc.target/bpf/bswap-1.c b/gcc/testsuite/gcc.target/bpf/bswap-1.c
index ba19eb60485..2203e426fd4 100644
--- a/gcc/testsuite/gcc.target/bpf/bswap-1.c
+++ b/gcc/testsuite/gcc.target/bpf/bswap-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-mlittle-endian -mcpu=v3" } */
+/* { dg-options "-mlittle-endian -mcpu=v3 -masm=normal" } */
unsigned short in16 = 0x1234U;
unsigned int in32 = 0x12345678U;
diff --git a/gcc/testsuite/gcc.target/bpf/bswap-2.c b/gcc/testsuite/gcc.target/bpf/bswap-2.c
index e5aef3845d0..9e5044efb94 100644
--- a/gcc/testsuite/gcc.target/bpf/bswap-2.c
+++ b/gcc/testsuite/gcc.target/bpf/bswap-2.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-mlittle-endian -mcpu=v4" } */
+/* { dg-options "-mlittle-endian -mcpu=v4 -masm=normal" } */
unsigned short in16 = 0x1234U;
unsigned int in32 = 0x12345678U;
diff --git a/gcc/testsuite/gcc.target/bpf/btfext-funcinfo-nocore.c b/gcc/testsuite/gcc.target/bpf/btfext-funcinfo-nocore.c
index 09d3acc8c2d..e44facf4ef6 100644
--- a/gcc/testsuite/gcc.target/bpf/btfext-funcinfo-nocore.c
+++ b/gcc/testsuite/gcc.target/bpf/btfext-funcinfo-nocore.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -dA -gbtf -mno-co-re" } */
+/* { dg-options "-O2 -dA -gbtf -mno-co-re -masm=normal" } */
struct T {
int a;
diff --git a/gcc/testsuite/gcc.target/bpf/btfext-funcinfo.c b/gcc/testsuite/gcc.target/bpf/btfext-funcinfo.c
index 6fdd14574ec..fbbefeae68f 100644
--- a/gcc/testsuite/gcc.target/bpf/btfext-funcinfo.c
+++ b/gcc/testsuite/gcc.target/bpf/btfext-funcinfo.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -dA -gbtf" } */
+/* { dg-options "-O2 -dA -gbtf -masm=normal" } */
struct T {
int a;
diff --git a/gcc/testsuite/gcc.target/bpf/builtin-load.c b/gcc/testsuite/gcc.target/bpf/builtin-load.c
index 0f93d91fb6f..1f51d80079f 100644
--- a/gcc/testsuite/gcc.target/bpf/builtin-load.c
+++ b/gcc/testsuite/gcc.target/bpf/builtin-load.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -std=gnu99" } */
+/* { dg-options "-O0 -std=gnu99 -masm=normal" } */
void foo ()
{
diff --git a/gcc/testsuite/gcc.target/bpf/core-attr-1.c b/gcc/testsuite/gcc.target/bpf/core-attr-1.c
index 1af9dc5ea6d..a9f153a85a1 100644
--- a/gcc/testsuite/gcc.target/bpf/core-attr-1.c
+++ b/gcc/testsuite/gcc.target/bpf/core-attr-1.c
@@ -2,7 +2,7 @@
for BPF CO-RE support. */
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct S {
int a;
diff --git a/gcc/testsuite/gcc.target/bpf/core-attr-2.c b/gcc/testsuite/gcc.target/bpf/core-attr-2.c
index 25c819a0082..b66e3c85614 100644
--- a/gcc/testsuite/gcc.target/bpf/core-attr-2.c
+++ b/gcc/testsuite/gcc.target/bpf/core-attr-2.c
@@ -2,7 +2,7 @@
for BPF CO-RE support. */
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
union U {
int a;
diff --git a/gcc/testsuite/gcc.target/bpf/core-attr-3.c b/gcc/testsuite/gcc.target/bpf/core-attr-3.c
index b46549f788c..12354fc6f86 100644
--- a/gcc/testsuite/gcc.target/bpf/core-attr-3.c
+++ b/gcc/testsuite/gcc.target/bpf/core-attr-3.c
@@ -6,7 +6,7 @@
generated. */
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct O {
int e;
diff --git a/gcc/testsuite/gcc.target/bpf/core-attr-4.c b/gcc/testsuite/gcc.target/bpf/core-attr-4.c
index 9c0f966b556..6f025f42f3e 100644
--- a/gcc/testsuite/gcc.target/bpf/core-attr-4.c
+++ b/gcc/testsuite/gcc.target/bpf/core-attr-4.c
@@ -2,7 +2,7 @@
LHS and both LHS and RHS of assignment. */
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct T {
int a;
diff --git a/gcc/testsuite/gcc.target/bpf/core-attr-5.c b/gcc/testsuite/gcc.target/bpf/core-attr-5.c
index 90734dab3a2..81e25fa85de 100644
--- a/gcc/testsuite/gcc.target/bpf/core-attr-5.c
+++ b/gcc/testsuite/gcc.target/bpf/core-attr-5.c
@@ -2,7 +2,7 @@
LHS and both LHS and RHS of assignment. */
/* { dg-do compile } */
-/* { dg-options "-O2 -dA -gbtf -mco-re" } */
+/* { dg-options "-O2 -dA -gbtf -mco-re -masm=normal" } */
struct U {
int c;
diff --git a/gcc/testsuite/gcc.target/bpf/core-attr-6.c b/gcc/testsuite/gcc.target/bpf/core-attr-6.c
index d0c5371b86e..25215b5ae37 100644
--- a/gcc/testsuite/gcc.target/bpf/core-attr-6.c
+++ b/gcc/testsuite/gcc.target/bpf/core-attr-6.c
@@ -2,7 +2,7 @@
LHS and both LHS and RHS of assignment. */
/* { dg-do compile } */
-/* { dg-options "-O2 -dA -gbtf -mco-re" } */
+/* { dg-options "-O2 -dA -gbtf -mco-re -masm=normal" } */
struct U {
int c;
diff --git a/gcc/testsuite/gcc.target/bpf/core-attr-struct-as-array.c b/gcc/testsuite/gcc.target/bpf/core-attr-struct-as-array.c
index 3f6eb9cb97f..e34eb3c39be 100644
--- a/gcc/testsuite/gcc.target/bpf/core-attr-struct-as-array.c
+++ b/gcc/testsuite/gcc.target/bpf/core-attr-struct-as-array.c
@@ -2,7 +2,7 @@
for BPF CO-RE support. */
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct S {
int a;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-1.c b/gcc/testsuite/gcc.target/bpf/core-builtin-1.c
index 3f15980a4c7..b4f9998afb8 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-1.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct S {
int a;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-2.c b/gcc/testsuite/gcc.target/bpf/core-builtin-2.c
index c9ec8994ae3..b72e2566b71 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-2.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-2.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct S {
int a;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-3.c b/gcc/testsuite/gcc.target/bpf/core-builtin-3.c
index 190ec2657d3..251b08ffcd4 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-3.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-3.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct T {
int a;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-errors.c b/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-errors.c
index 138e9989516..65d74f3b9b2 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-errors.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-errors.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
#include "core-support.h"
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-opt.c b/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-opt.c
index fc3c299fe9c..0b87c8d39fe 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-opt.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-opt.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -dA -gbtf -mco-re" } */
+/* { dg-options "-O2 -dA -gbtf -mco-re -masm=normal" } */
#include "core-support.h"
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue.c b/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue.c
index 23dfd8a10bf..ceb9987c0d6 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
#include "core-support.h"
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-1.c b/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-1.c
index b8bdeeaa125..8ce4a6e70de 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-1.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct S {
int a;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-2.c b/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-2.c
index 3a22b99f8e6..e8ae4c82e21 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-2.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-2.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct T {
int a;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-3.c b/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-3.c
index bccf2b3a696..313f2a7202e 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-3.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-3.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct T {
int a;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-4.c b/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-4.c
index 8ef239c30c1..6884c31f86e 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-4.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-exprlist-4.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct T {
int a;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-const-elimination.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-const-elimination.c
index 51e938c8aac..1cda6badea5 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-const-elimination.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-const-elimination.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -dA -gbtf -mco-re" } */
+/* { dg-options "-O2 -dA -gbtf -mco-re -masm=normal" } */
struct S {
unsigned int a1: 7;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-errors-1.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-errors-1.c
index 6f8c320ab8b..8eb24ded84c 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-errors-1.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-errors-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct F {
int bar;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-errors-2.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-errors-2.c
index 08fbdf01655..b57b1479b6e 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-errors-2.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-errors-2.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct F {
int bar;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-existence-1.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-existence-1.c
index 96119daf7b2..8e775dc8049 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-existence-1.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-existence-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
enum {
FIELD_EXISTENCE = 2,
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-be.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-be.c
index 579bc769b82..10f8abf2fb3 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-be.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-be.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re -mbig-endian" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -mbig-endian -masm=normal" } */
struct S {
int x1: 6;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-le.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-le.c
index d48f01ae522..57e390771bd 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-le.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-1-le.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re -mlittle-endian" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -mlittle-endian -masm=normal" } */
struct S {
int x1: 6;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-2.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-2.c
index 653ddf65e56..46db09aed1a 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-2.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-lshift-2.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct S {
char c;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-offset-1.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-offset-1.c
index a0ddda83a07..7a6a9dec924 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-offset-1.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-offset-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct S {
unsigned int a1: 7;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-1.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-1.c
index 47767832272..1b6d150aa2a 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-1.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct S {
int x1: 6;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-2.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-2.c
index a13ff8e261e..106b686375a 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-2.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-rshift-2.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct S {
int x;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-1.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-1.c
index 442ed076aa9..f32f116a5b7 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-1.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
enum {
FIELD_SIGNEDNESS = 3,
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-2.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-2.c
index cdc4d4db35d..f28915e25cc 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-2.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-sign-2.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
enum {
FIELD_SIGNEDNESS = 3,
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-size-1.c b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-size-1.c
index 74707f1cb7d..12d3643bd1d 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-size-1.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-fieldinfo-size-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
struct S {
unsigned int a1: 7;
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c b/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c
index 9d818133c08..8f0ccfc0f1f 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
#include "core-support.h"
diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c b/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c
index 9576b91bc94..cb0ee1ff6c9 100644
--- a/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c
+++ b/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-O0 -dA -gbtf -mco-re" } */
+/* { dg-options "-O0 -dA -gbtf -mco-re -masm=normal" } */
#include "core-support.h"
diff --git a/gcc/testsuite/gcc.target/bpf/double-1.c b/gcc/testsuite/gcc.target/bpf/double-1.c
index 200f1bd18f8..ae5d34c4bc2 100644
--- a/gcc/testsuite/gcc.target/bpf/double-1.c
+++ b/gcc/testsuite/gcc.target/bpf/double-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-mlittle-endian" } */
+/* { dg-options "-mlittle-endian -masm=normal" } */
double f;
double a() { f = 1.0; return 1.0; }
diff --git a/gcc/testsuite/gcc.target/bpf/double-2.c b/gcc/testsuite/gcc.target/bpf/double-2.c
index d04ddd0c575..d87a65c2d91 100644
--- a/gcc/testsuite/gcc.target/bpf/double-2.c
+++ b/gcc/testsuite/gcc.target/bpf/double-2.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-mbig-endian" } */
+/* { dg-options "-mbig-endian -masm=normal" } */
double f;
double a() { f = 1.0; return 1.0; }
diff --git a/gcc/testsuite/gcc.target/bpf/float-1.c b/gcc/testsuite/gcc.target/bpf/float-1.c
index 05ed7bb651d..ccfb9c44f62 100644
--- a/gcc/testsuite/gcc.target/bpf/float-1.c
+++ b/gcc/testsuite/gcc.target/bpf/float-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-mlittle-endian" } */
+/* { dg-options "-mlittle-endian -masm=normal" } */
float f;
float a() { f = 1.0; return 1.0; }
diff --git a/gcc/testsuite/gcc.target/bpf/inline-memops-threshold-1.c b/gcc/testsuite/gcc.target/bpf/inline-memops-threshold-1.c
index c2ba4db5b7b..d4ffc5b7f11 100644
--- a/gcc/testsuite/gcc.target/bpf/inline-memops-threshold-1.c
+++ b/gcc/testsuite/gcc.target/bpf/inline-memops-threshold-1.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
-/* { dg-options "-O2" "-minline-memops-threshold=256"} */
+/* { dg-options "-O2 -masm=normal -minline-memops-threshold=256" } */
char buf[512];
diff --git a/gcc/testsuite/gcc.target/bpf/jmp-1.c b/gcc/testsuite/gcc.target/bpf/jmp-1.c
index eaf825395ef..1fa7307ee0b 100644
--- a/gcc/testsuite/gcc.target/bpf/jmp-1.c
+++ b/gcc/testsuite/gcc.target/bpf/jmp-1.c
@@ -3,7 +3,7 @@
if -mjmp32 is not enabled. */
/* { dg-do compile } */
-/* { dg-options "-mno-jmpext -mno-jmp32" } */
+/* { dg-options "-mno-jmpext -mno-jmp32 -masm=normal" } */
int foo (int a, int b)
{
diff --git a/gcc/testsuite/gcc.target/bpf/ldxdw.c b/gcc/testsuite/gcc.target/bpf/ldxdw.c
index 72db8f03324..91f2f55ab91 100644
--- a/gcc/testsuite/gcc.target/bpf/ldxdw.c
+++ b/gcc/testsuite/gcc.target/bpf/ldxdw.c
@@ -2,7 +2,7 @@
with a constant instead of register + offset. */
/* { dg-do compile } */
-/* { dg-options "-O2" } */
+/* { dg-options "-O2 -masm=normal" } */
/* { dg-final { scan-assembler-times "ldxdw\t%r.,\\\[%r.\\+\[0-9\]+\\\]" 1 } } */
/* { dg-final { scan-assembler-not "ldxdw\t%r.,\[0-9\]+" } } */
diff --git a/gcc/testsuite/gcc.target/bpf/neg-1.c b/gcc/testsuite/gcc.target/bpf/neg-1.c
index 9ffb956859d..7acc0cab553 100644
--- a/gcc/testsuite/gcc.target/bpf/neg-1.c
+++ b/gcc/testsuite/gcc.target/bpf/neg-1.c
@@ -1,7 +1,7 @@
/* Check negr and negr32 instructions. */
/* { dg-do compile } */
-/* { dg-options "-malu32" } */
+/* { dg-options "-malu32 -masm=normal" } */
long foo (long a, long b, int x, int y)
{
diff --git a/gcc/testsuite/gcc.target/bpf/nop-1.c b/gcc/testsuite/gcc.target/bpf/nop-1.c
index c4d274f6bad..06914dd10b9 100644
--- a/gcc/testsuite/gcc.target/bpf/nop-1.c
+++ b/gcc/testsuite/gcc.target/bpf/nop-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-std=gnu99 --patchable-function-entry=2,1" } */
+/* { dg-options "-std=gnu99 --patchable-function-entry=2,1 -masm=normal" } */
/* The purpose of this test is to make sure the right instruction is
generated for NOPs. See bpf.md for a description on why this is
diff --git a/gcc/testsuite/gcc.target/bpf/sdiv-1.c b/gcc/testsuite/gcc.target/bpf/sdiv-1.c
index ad75b044e1d..a1e51618ee6 100644
--- a/gcc/testsuite/gcc.target/bpf/sdiv-1.c
+++ b/gcc/testsuite/gcc.target/bpf/sdiv-1.c
@@ -1,6 +1,6 @@
/* Verify that sdiv instruction is used for xBPF. */
/* { dg-do compile } */
-/* { dg-options "-O0 -mcpu=v4" } */
+/* { dg-options "-O0 -mcpu=v4 -masm=normal" } */
void
foo ()
diff --git a/gcc/testsuite/gcc.target/bpf/sload-1.c b/gcc/testsuite/gcc.target/bpf/sload-1.c
index d85822932d3..d1dd5b7f4d7 100644
--- a/gcc/testsuite/gcc.target/bpf/sload-1.c
+++ b/gcc/testsuite/gcc.target/bpf/sload-1.c
@@ -1,6 +1,6 @@
/* Check ISA V4 signed load instructions. */
/* { dg-do compile } */
-/* { dg-options "-mcpu=v4 -O2" } */
+/* { dg-options "-mcpu=v4 -O2 -masm=normal" } */
long foo (char *p1, short *p2, int *p3)
{
diff --git a/gcc/testsuite/gcc.target/bpf/smod-1.c b/gcc/testsuite/gcc.target/bpf/smod-1.c
index c5fc6f7d4b2..5be0bf2856d 100644
--- a/gcc/testsuite/gcc.target/bpf/smod-1.c
+++ b/gcc/testsuite/gcc.target/bpf/smod-1.c
@@ -1,6 +1,6 @@
/* Verify that smod instruction is used for xBPF. */
/* { dg-do compile } */
-/* { dg-options "-O0 -mcpu=v4" } */
+/* { dg-options "-O0 -mcpu=v4 -masm=normal" } */
void
foo ()
diff --git a/gcc/testsuite/gcc.target/bpf/smov-1.c b/gcc/testsuite/gcc.target/bpf/smov-1.c
index ec17ad06fd2..49109a80e3e 100644
--- a/gcc/testsuite/gcc.target/bpf/smov-1.c
+++ b/gcc/testsuite/gcc.target/bpf/smov-1.c
@@ -1,6 +1,6 @@
/* Check signed mov instructions. */
/* { dg-do compile } */
-/* { dg-options "-mcpu=v4 -O2" } */
+/* { dg-options "-mcpu=v4 -O2 -masm=normal" } */
long
foo (char a, short b, int c, unsigned long d)
diff --git a/gcc/testsuite/gcc.target/bpf/smov-2.c b/gcc/testsuite/gcc.target/bpf/smov-2.c
index 6f3516d2385..2f477ec2819 100644
--- a/gcc/testsuite/gcc.target/bpf/smov-2.c
+++ b/gcc/testsuite/gcc.target/bpf/smov-2.c
@@ -1,6 +1,6 @@
/* Check signed 32-bit mov instructions. */
/* { dg-do compile } */
-/* { dg-options "-mcpu=v4 -O2" } */
+/* { dg-options "-mcpu=v4 -O2 -masm=normal" } */
int
foo (unsigned char a, unsigned short b)
diff --git a/gcc/testsuite/gcc.target/bpf/sync-fetch-and-add.c b/gcc/testsuite/gcc.target/bpf/sync-fetch-and-add.c
index 69949f14d0c..6902aabd337 100644
--- a/gcc/testsuite/gcc.target/bpf/sync-fetch-and-add.c
+++ b/gcc/testsuite/gcc.target/bpf/sync-fetch-and-add.c
@@ -1,4 +1,5 @@
/* { dg-do compile } */
+/* { dg-options "-masm=normal" } */
long delta;
long *val;
diff --git a/gcc/testsuite/gcc.target/bpf/xbpf-indirect-call-1.c b/gcc/testsuite/gcc.target/bpf/xbpf-indirect-call-1.c
index dc4b3cfb12d..f8ef3fa3178 100644
--- a/gcc/testsuite/gcc.target/bpf/xbpf-indirect-call-1.c
+++ b/gcc/testsuite/gcc.target/bpf/xbpf-indirect-call-1.c
@@ -1,5 +1,5 @@
/* { dg-do compile } */
-/* { dg-options "-mxbpf" } */
+/* { dg-options "-mxbpf -masm=normal" } */
/* GCC should generate an indirect call instruction (call %REG)
when targetting xBPF. */
--
2.30.2
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-04-25 15:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-04-25 15:35 [COMMITTED BPF] bpf: default to using pseudo-C assembly syntax by default Jose E. Marchesi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).