Skip to content

Commit

Permalink
Add few clang compiler alias for BPF target (#4543)
Browse files Browse the repository at this point in the history
Add 3 latest clang version aliases + trunk to BPF target.
Use `llvm-objdump` for clang compilers and binutils' one for the GCC compiler (unfortunately, this can't be changed by the user in the UI).

refs #4408
  • Loading branch information
dkm authored and mattgodbolt committed Jan 24, 2023
1 parent 80254cc commit 7d5c488
Show file tree
Hide file tree
Showing 2 changed files with 52 additions and 4 deletions.
29 changes: 26 additions & 3 deletions etc/config/c++.amazon.properties
Expand Up @@ -872,7 +872,31 @@ group.cross.licensePreamble=Copyright (c) 2007 Free Software Foundation, Inc. <a

###############################
# Cross for BPF
group.bpf.compilers=&gccbpf
group.bpf.compilers=&gccbpf:&clangbpf
group.bpf.demangler=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-none-c++filt

# Clang for BPF
group.clangbpf.compilers=bpfclangtrunk:bpfclang1500:bpfclang1400:bpfclang1300
group.clangbpf.supportsBinary=true
group.clangbpf.supportsExecute=false
group.clangbpf.baseName=BPF CLANG
group.clangbpf.groupName=BPF CLANG
group.clangbpf.isSemVer=true
group.clangbpf.options=-target bpf
group.clangbpf.objdumper=/opt/compiler-explorer/clang-trunk/bin/llvm-objdump
group.clangbpf.objdumperType=llvm

compiler.bpfclangtrunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
compiler.bpfclangtrunk.semver=(trunk)

compiler.bpfclang1500.exe=/opt/compiler-explorer/clang-15.0.0/bin/clang
compiler.bpfclang1500.semver=15.0.0

compiler.bpfclang1400.exe=/opt/compiler-explorer/clang-14.0.0/bin/clang
compiler.bpfclang1400.semver=14.0.0

compiler.bpfclang1300.exe=/opt/compiler-explorer/clang-13.0.0/bin/clang
compiler.bpfclang1300.semver=13.0.0

# GCC for BPF
group.gccbpf.compilers=bpfgtrunk
Expand All @@ -881,11 +905,10 @@ group.gccbpf.supportsExecute=false
group.gccbpf.baseName=BPF gcc
group.gccbpf.groupName=BPF GCC
group.gccbpf.isSemVer=true
group.gccbpf.objdumper=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-objdump

compiler.bpfgtrunk.exe=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-none-g++
compiler.bpfgtrunk.semver=trunk
compiler.bpfgtrunk.objdumper=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-objdump
compiler.bpfgtrunk.demangler=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-none-c++filt

###############################
# Cross for SPARC
Expand Down
27 changes: 26 additions & 1 deletion etc/config/c.amazon.properties
Expand Up @@ -809,7 +809,31 @@ group.ccross.licensePreamble=Copyright (c) 2007 Free Software Foundation, Inc. <

###############################
# Cross for BPF
group.cbpf.compilers=&cgccbpf
group.cbpf.compilers=&cgccbpf:&cclangbpf
group.cbpf.demangler=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-none-c++filt

# Clang for BPF
group.cclangbpf.compilers=cbpfclangtrunk:cbpfclang1500:cbpfclang1400:cbpfclang1300
group.cclangbpf.supportsBinary=true
group.cclangbpf.supportsExecute=false
group.cclangbpf.baseName=BPF CLANG
group.cclangbpf.groupName=BPF CLANG
group.cclangbpf.isSemVer=true
group.cclangbpf.options=-target bpf
group.cclangbpf.objdumper=/opt/compiler-explorer/clang-trunk/bin/llvm-objdump
group.cclangbpf.objdumperType=llvm

compiler.cbpfclangtrunk.exe=/opt/compiler-explorer/clang-trunk/bin/clang
compiler.cbpfclangtrunk.semver=(trunk)

compiler.cbpfclang1500.exe=/opt/compiler-explorer/clang-15.0.0/bin/clang
compiler.cbpfclang1500.semver=15.0.0

compiler.cbpfclang1400.exe=/opt/compiler-explorer/clang-14.0.0/bin/clang
compiler.cbpfclang1400.semver=14.0.0

compiler.cbpfclang1300.exe=/opt/compiler-explorer/clang-13.0.0/bin/clang
compiler.cbpfclang1300.semver=13.0.0

# GCC for BPF
group.cgccbpf.compilers=cbpfgtrunk
Expand All @@ -818,6 +842,7 @@ group.cgccbpf.supportsExecute=false
group.cgccbpf.baseName=BPF gcc
group.cgccbpf.groupName=BPF GCC
group.cgccbpf.isSemVer=true
group.cgccbpf.objdumper=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-objdump

compiler.cbpfgtrunk.exe=/opt/compiler-explorer/bpf/gcc-trunk/bpf-unknown-none/bin/bpf-unknown-gcc
compiler.cbpfgtrunk.semver=trunk
Expand Down

0 comments on commit 7d5c488

Please sign in to comment.