Merge commit 'afab3c488f0c' from llvm.org/main into next

cachemeifyoucan · Sep 24, 2021 · 226f729 · 226f729
2 parents 5bb54dc + afab3c4
commit 226f729
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -2713,6 +2713,7 @@ bool Generic_GCC::IsUnwindTablesDefault(const ArgList &Args) const {
   case llvm::Triple::ppcle:
   case llvm::Triple::ppc64:
   case llvm::Triple::ppc64le:
+  case llvm::Triple::x86:
   case llvm::Triple::x86_64:
     return true;
   default:

diff --git a/clang/test/Driver/clang-translation.c b/clang/test/Driver/clang-translation.c
@@ -1,10 +1,10 @@
-// RUN: %clang -target i386-unknown-unknown -### -S -O0 -Os %s -o %t.s -fverbose-asm -funwind-tables -fvisibility=hidden 2>&1 | FileCheck -check-prefix=I386 %s
+// RUN: %clang -target i386-unknown-unknown -### -S -O0 -Os %s -o %t.s -fverbose-asm -fvisibility=hidden 2>&1 | FileCheck -check-prefix=I386 %s
 // I386: "-triple" "i386-unknown-unknown"
 // I386: "-S"
 // I386: "-disable-free"
 // I386: "-mrelocation-model" "static"
 // I386: "-mframe-pointer=all"
-// I386: "-funwind-tables=1"
+// I386: "-funwind-tables=2"
 // I386: "-Os"
 // I386: "-fvisibility"
 // I386: "hidden"