Hi David. OK. Thanks.
> The BPF "pseudo-C" assembly dialect uses semi-colon (;) to separate > statements, not to begin line comments. The GNU assembler was recently > changed accordingly: > > https://sourceware.org/pipermail/binutils/2023-November/130867.html > > This patch adapts the BPF backend in GCC accordingly, to use a hash (#) > instead of semi-colon (;) for ASM_COMMENT_START. This is supported > already in clang. > > Tested on x86_64-linux-gnu host for bpf-unknown-none target. > > gcc/ > * config/bpf/bpf.h (ASM_COMMENT_START): Change from ';' to '#'. > > gcc/testsuite/ > * gcc.target/bpf/core-builtin-enumvalue-opt.c: Change dg-final > scans to not assume a specific comment character. > * gcc.target/bpf/core-builtin-enumvalue.c: Likewise. > * gcc.target/bpf/core-builtin-type-based.c: Likewise. > * gcc.target/bpf/core-builtin-type-id.c: Likewise. > --- > gcc/config/bpf/bpf.h | 2 +- > .../gcc.target/bpf/core-builtin-enumvalue-opt.c | 8 ++++---- > .../gcc.target/bpf/core-builtin-enumvalue.c | 12 ++++++------ > .../gcc.target/bpf/core-builtin-type-based.c | 8 ++++---- > gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c | 6 +++--- > 5 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/gcc/config/bpf/bpf.h b/gcc/config/bpf/bpf.h > index 1f177ec4c4e..d175e99046c 100644 > --- a/gcc/config/bpf/bpf.h > +++ b/gcc/config/bpf/bpf.h > @@ -393,7 +393,7 @@ enum reg_class > > /*** The Overall Framework of an Assembler File. */ > > -#define ASM_COMMENT_START ";" > +#define ASM_COMMENT_START "#" > > /* Output to assembler file text saying following lines > may contain character constants, extra white space, comments, etc. */ > 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 c87e1a3ba3b..fc3c299fe9c 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-opt.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue-opt.c > @@ -26,10 +26,10 @@ unsigned long foo(void *data) > return 0; > } > > -/* { dg-final { scan-assembler-times "\t.4byte\t0x\[0-9a-f\]+\t; bpfcr_type > \\(named_ue64\\)" 2 } } */ > -/* { dg-final { scan-assembler-times "\t.4byte\t0x\[0-9a-f\]+\t; bpfcr_type > \\(named_se64\\)" 2} } */ > -/* { dg-final { scan-assembler-times "\t.4byte\t0xa\t; bpfcr_kind" 2 } } > BPF_ENUMVAL_EXISTS */ > -/* { dg-final { scan-assembler-times "\t.4byte\t0xb\t; bpfcr_kind" 2 } } > BPF_ENUMVAL_VALUE */ > +/* { dg-final { scan-assembler-times "bpfcr_type \\(named_ue64\\)" 2 } } */ > +/* { dg-final { scan-assembler-times "bpfcr_type \\(named_se64\\)" 2} } */ > +/* { dg-final { scan-assembler-times "0xa\[\t \]+\[^\n\]*bpfcr_kind" 2 } } > BPF_ENUMVAL_EXISTS */ > +/* { dg-final { scan-assembler-times "0xb\[\t \]+\[^\n\]*bpfcr_kind" 2 } } > BPF_ENUMVAL_VALUE */ > > /* { dg-final { scan-assembler-times "bpfcr_astr_off \\(\"0\"\\)" 4 } } */ > > diff --git a/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue.c > b/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue.c > index 2f16903b8d6..23dfd8a10bf 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-enumvalue.c > @@ -40,12 +40,12 @@ int foo(void *data) > return 0; > } > > -/* { dg-final { scan-assembler-times "\t.4byte\t0x\[0-9a-f\]+\t; bpfcr_type > \\(named_ue64\\)" 5 } } */ > -/* { dg-final { scan-assembler-times "\t.4byte\t0x\[0-9a-f\]+\t; bpfcr_type > \\(named_se64\\)" 5} } */ > -/* { dg-final { scan-assembler-times "\t.4byte\t0x\[0-9a-f\]+\t; bpfcr_type > \\(named_ue\\)" 5 } } */ > -/* { dg-final { scan-assembler-times "\t.4byte\t0x\[0-9a-f\]+\t; bpfcr_type > \\(named_se\\)" 5} } */ > -/* { dg-final { scan-assembler-times "\t.4byte\t0xa\t; bpfcr_kind" 12 } } > BPF_ENUMVAL_EXISTS */ > -/* { dg-final { scan-assembler-times "\t.4byte\t0xb\t; bpfcr_kind" 8 } } > BPF_ENUMVAL_VALUE */ > +/* { dg-final { scan-assembler-times "bpfcr_type \\(named_ue64\\)" 5 } } */ > +/* { dg-final { scan-assembler-times "bpfcr_type \\(named_se64\\)" 5} } */ > +/* { dg-final { scan-assembler-times "bpfcr_type \\(named_ue\\)" 5 } } */ > +/* { dg-final { scan-assembler-times "bpfcr_type \\(named_se\\)" 5} } */ > +/* { dg-final { scan-assembler-times "0xa\[\t \]+\[^\n\]*bpfcr_kind" 12 } } > BPF_ENUMVAL_EXISTS */ > +/* { dg-final { scan-assembler-times "0xb\[\t \]+\[^\n\]*bpfcr_kind" 8 } } > BPF_ENUMVAL_VALUE */ > > /* { dg-final { scan-assembler-times "bpfcr_astr_off \\(\"0\"\\)" 8 } } */ > /* { dg-final { scan-assembler-times "bpfcr_astr_off \\(\"1\"\\)" 8 } } */ > 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 16b48ae0a00..74a8d5a14d9 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-type-based.c > @@ -52,7 +52,7 @@ int foo(void *data) > return 0; > } > > -/* { dg-final { scan-assembler-times "\t.4byte\t0x0\t; bpfcr_type" 0 } } */ > -/* { dg-final { scan-assembler-times "\t.4byte\t0x8\t; bpfcr_kind" 13 } } > BPF_TYPE_EXISTS */ > -/* { dg-final { scan-assembler-times "\t.4byte\t0x9\t; bpfcr_kind" 11 } } > BPF_TYPE_SIZE */ > -/* { dg-final { scan-assembler-times "\t.4byte\t0xc\t; bpfcr_kind" 13 } } > BPF_TYPE_MATCHES */ > +/* { dg-final { scan-assembler-times "0x0\[\t \]+\[^\n\]*bpfcr_type" 0 } } */ > +/* { dg-final { scan-assembler-times "0x8\[\t \]+\[^\n\]*bpfcr_kind" 13 } } > BPF_TYPE_EXISTS */ > +/* { dg-final { scan-assembler-times "0x9\[\t \]+\[^\n\]*bpfcr_kind" 11 } } > BPF_TYPE_SIZE */ > +/* { dg-final { scan-assembler-times "0xc\[\t \]+\[^\n\]*bpfcr_kind" 13 } } > BPF_TYPE_MATCHES */ > 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 615bbc85a22..4b23288eac0 100644 > --- a/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c > +++ b/gcc/testsuite/gcc.target/bpf/core-builtin-type-id.c > @@ -35,6 +35,6 @@ int foo(void *data) > return 0; > } > > -/* { dg-final { scan-assembler-times "\t.4byte\t0\t; bpfcr_type" 0 { xfail > *-*-* } } } */ > -/* { dg-final { scan-assembler-times "\t.4byte\t0x6\t; bpfcr_kind" 13 } } > BPF_TYPE_ID_LOCAL */ > -/* { dg-final { scan-assembler-times "\t.4byte\t0x7\t; bpfcr_kind" 7 } } > BPF_TYPE_ID_TARGET */ > +/* { dg-final { scan-assembler-times "0\[\t \]+\[^\n\]*bpfcr_type" 0 { > xfail *-*-* } } } */ > +/* { dg-final { scan-assembler-times "0x6\[\t \]+\[^\n\]*bpfcr_kind" 13 } } > BPF_TYPE_ID_LOCAL */ > +/* { dg-final { scan-assembler-times "0x7\[\t \]+\[^\n\]*bpfcr_kind" 7 } } > BPF_TYPE_ID_TARGET */
