From 6ac05dcd01171f46af1ec2006c6b09097e1b7c07 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 4 Aug 2021 21:01:24 -0700 Subject: nonclangable.conf: Convert remaining overrides to new syntax Signed-off-by: Khem Raj (cherry picked from commit d2a30f0fd7377c1e19c778dc6b82dca4fa21c0d4) --- conf/nonclangable.conf | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf index d579d85..71ac3b0 100644 --- a/conf/nonclangable.conf +++ b/conf/nonclangable.conf @@ -51,8 +51,8 @@ TOOLCHAIN:pn-libssp-nonshared = "gcc" TOOLCHAIN:pn-libstd-rs = "gcc" TOOLCHAIN:pn-m4:powerpc = "gcc" # clang does not have 64bit atomics on mips32 -#TOOLCHAIN_pn-mesa:mips = "gcc" -#TOOLCHAIN_pn-mesa:mipsel = "gcc" +#TOOLCHAIN:pn-mesa:mips = "gcc" +#TOOLCHAIN:pn-mesa:mipsel = "gcc" TOOLCHAIN:pn-mesa:riscv64 = "gcc" TOOLCHAIN:pn-mesa:powerpc = "gcc" # variant-impl.hpp:309:36: error: 'is_variant' does not name a template but is followed by template arguments @@ -164,7 +164,7 @@ CFLAGS:append:pn-mdadm:toolchain-clang = " -Wno-error=unknown-warning-option" #:9:2: note: instantiated into assembly here # .force_thumb # ^ -#CFLAGS_append_pn-db:toolchain-clang = " -no-integrated-as" +#CFLAGS:append:pn-db:toolchain-clang = " -no-integrated-as" # #| ../../../DirectFB-1.7.7/lib/direct/armasm_memcpy.S:63:2: error: invalid instruction #| ldmgeia r1!, {r3, r4, r12, lr} @@ -253,15 +253,15 @@ TUNE_CCARGS:remove:pn-pulseaudio:toolchain-clang = "-Qunused-arguments" #| /usr/src/debug/ruby/2.5.1-r0/build/../ruby-2.5.1/process.c:7073: undefined reference to `__mulodi4' #| clang-7: error: linker command failed with exit code 1 (use -v to see invocation) -COMPILER_RT:pn-ruby:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" -COMPILER_RT:pn-python3:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" -COMPILER_RT:pn-m4:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" -COMPILER_RT:pn-cpio:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" -COMPILER_RT:pn-openssh:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" -COMPILER_RT:pn-webkitgtk:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" -COMPILER_RT:pn-wpewebkit:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" -COMPILER_RT:pn-python3-numpy:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" -COMPILER_RT:pn-mongodb:toolchain-clang_runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" +COMPILER_RT:pn-ruby:toolchain-clang:runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" +COMPILER_RT:pn-python3:toolchain-clang:runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" +COMPILER_RT:pn-m4:toolchain-clang:runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" +COMPILER_RT:pn-cpio:toolchain-clang:runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" +COMPILER_RT:pn-openssh:toolchain-clang:runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" +COMPILER_RT:pn-webkitgtk:toolchain-clang:runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" +COMPILER_RT:pn-wpewebkit:toolchain-clang:runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" +COMPILER_RT:pn-python3-numpy:toolchain-clang:runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" +COMPILER_RT:pn-mongodb:toolchain-clang:runtime-gnu = "-rtlib=compiler-rt ${UNWINDLIB}" COMPILER_RT:remove:pn-m4:powerpc = "-rtlib=compiler-rt" COMPILER_RT:remove:pn-ruby:powerpc = "-rtlib=compiler-rt" COMPILER_RT:remove:pn-webkitgtk:powerpc = "-rtlib=compiler-rt" @@ -275,7 +275,7 @@ COMPILER_RT:pn-qtbase:toolchain-clang:riscv32 = "-rtlib=compiler-rt ${UNWINDLIB} LDFLAGS:append:pn-gnutls:toolchain-clang:riscv64 = " -latomic" LDFLAGS:append:pn-harfbuzz:toolchain-clang:riscv64 = " -latomic" -LDFLAGS:append:pn-qtwebengine:toolchain-clang_runtime-gnu:x86 = " -latomic" +LDFLAGS:append:pn-qtwebengine:toolchain-clang:runtime-gnu:x86 = " -latomic" LDFLAGS:append:pn-qemu:toolchain-clang:x86 = " -latomic" # glibc is built with gcc and hence encodes some libgcc specific builtins which are not found -- cgit v1.2.3-54-g00ecf