[llvm-branch-commits] [clang] f1e7f84 - [clang][tests] Fix ve-toolchain tests with CLANG_DEFAULT_UNWINDLIB

[Tom Stellard via llvm-branch-commits]

Author: Timm Bäder
Date: 2022-03-02T12:59:40-08:00
New Revision: f1e7f848bf3e84906fda52975dbcfc6825710987

URL: https://github.com/llvm/llvm-project/commit/f1e7f848bf3e84906fda52975dbcfc6825710987
DIFF: https://github.com/llvm/llvm-project/commit/f1e7f848bf3e84906fda52975dbcfc6825710987.diff

LOG: [clang][tests] Fix ve-toolchain tests with CLANG_DEFAULT_UNWINDLIB

Otherwise, the driver will insert e.g. -lgcc_s when
CLANG_DEFAULT_UNWINDLIB=libgcc is set during the clang build.

Differential Revision: https://reviews.llvm.org/D120644

(cherry picked from commit 12d3679256c9a544699f9894c16c2918da17e4af)

Added: 
    

Modified: 
    clang/test/Driver/ve-toolchain.c
    clang/test/Driver/ve-toolchain.cpp

Removed: 
    


################################################################################
diff  --git a/clang/test/Driver/ve-toolchain.c b/clang/test/Driver/ve-toolchain.c
index 35af3c81c4c6f..753dee19fcbfb 100644
--- a/clang/test/Driver/ve-toolchain.c
+++ b/clang/test/Driver/ve-toolchain.c
@@ -83,6 +83,7 @@
 // RUN: %clang -### -target ve-unknown-linux-gnu \
 // RUN:     --sysroot %S/Inputs/basic_ve_tree \
 // RUN:     -resource-dir=%S/Inputs/basic_ve_tree/resource_dir \
+// RUN:     --unwindlib=none \
 // RUN:     -fuse-ld=ld \
 // RUN:     %s 2>&1 | FileCheck -check-prefix=DEF %s
 

diff  --git a/clang/test/Driver/ve-toolchain.cpp b/clang/test/Driver/ve-toolchain.cpp
index 7447f34b70e0c..4b2b9c5747fe4 100644
--- a/clang/test/Driver/ve-toolchain.cpp
+++ b/clang/test/Driver/ve-toolchain.cpp
@@ -133,7 +133,8 @@
 // RUN:     --sysroot %S/Inputs/basic_ve_tree \
 // RUN:     -fuse-ld=ld \
 // RUN:     -resource-dir=%S/Inputs/basic_ve_tree/resource_dir \
-// RUN:     --stdlib=c++ %s 2>&1 | FileCheck -check-prefix=DEF %s
+// RUN:     --unwindlib=none \
+// RUN:     --stdlib=libc++ %s 2>&1 | FileCheck -check-prefix=DEF %s
 
 // DEF:      clang{{.*}}" "-cc1"
 // DEF-SAME: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"