aufs-util,libhugetlbfs,libc-bench: Use libgcc unwinder on glibc/arm

these packages do static linking in parts and when libc is glibc then it
has linked in some portions of libgcc since we can not use clang to
compile glibc yet. Therefore use libgcc where needed for now

Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit bf842214267663966ffa34e170368d55fcebd883)

1 files changed, 3 insertions, 2 deletions

diff --git a/conf/nonclangable.conf b/conf/nonclangable.conf
index 1058dc6..fb5d47c 100644
--- a/conf/nonclangable.conf
+++ b/conf/nonclangable.conf
@@ -285,8 +285,9 @@ COMPILER_RT_pn-tsocks_libc-glibc_toolchain-clang_x86-64 = "-rtlib=libgcc --unwin
 #(unwind.o): in function `__pthread_unwind':
 #/usr/src/debug/glibc/2.29-r0/git/nptl/unwind.c:121: undefined reference to `_Unwind_ForcedUnwind'
 #clang-8: error: linker command failed with exit code 1 (use -v to see invocation)
-COMPILER_RT_pn-aufs-util_libc-glibc_toolchain-clang_arm = "-rtlib=libgcc --unwindlib=libgcc"
-COMPILER_RT_pn-libhugetlbfs_libc-glibc_toolchain-clang_arm = "-rtlib=libgcc --unwindlib=libgcc"
+COMPILER_RT_pn-aufs-util_libc-glibc_toolchain-clang_arm = "--unwindlib=libgcc"
+COMPILER_RT_pn-libhugetlbfs_libc-glibc_toolchain-clang_arm = "--unwindlib=libgcc"
+COMPILER_RT_pn-libc-bench_libc-glibc_toolchain-clang_arm = "--unwindlib=libgcc"
 
 # Uses gcc for native tools, e.g. nsinstall and passes clang options which fails so
 # let same compiler ( gcc or clang) be native/cross compiler