diff options
| -rw-r--r-- | clang/docs/CommandGuide/clang.rst | 3 | ||||
| -rw-r--r-- | clang/include/clang/Driver/Options.td | 3 | ||||
| -rw-r--r-- | clang/lib/Driver/Driver.cpp | 10 | ||||
| -rw-r--r-- | clang/test/Driver/montavista-gcc-toolchain.c | 2 | ||||
| -rw-r--r-- | clang/test/Driver/print-libgcc-file-name-clangrt.c | 11 | ||||
| -rw-r--r-- | clang/test/Driver/print-libgcc-file-name-libgcc.c | 7 | ||||
| -rw-r--r-- | clang/test/lit.cfg | 5 |
7 files changed, 37 insertions, 4 deletions
diff --git a/clang/docs/CommandGuide/clang.rst b/clang/docs/CommandGuide/clang.rst index 14c81270e17..c71544915e4 100644 --- a/clang/docs/CommandGuide/clang.rst +++ b/clang/docs/CommandGuide/clang.rst @@ -394,7 +394,8 @@ Driver Options .. option:: -print-libgcc-file-name - Print the library path for "libgcc.a". + Print the library path for the currently used compiler runtime library + ("libgcc.a" or "libclang_rt.builtins.*.a"). .. option:: -print-prog-name=<name> diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td index a6b006108fc..ad10bcb2737 100644 --- a/clang/include/clang/Driver/Options.td +++ b/clang/include/clang/Driver/Options.td @@ -1861,7 +1861,8 @@ def print_file_name_EQ : Joined<["-", "--"], "print-file-name=">, def print_ivar_layout : Flag<["-"], "print-ivar-layout">, Flags<[CC1Option]>, HelpText<"Enable Objective-C Ivar layout bitmap print trace">; def print_libgcc_file_name : Flag<["-", "--"], "print-libgcc-file-name">, - HelpText<"Print the library path for \"libgcc.a\"">; + HelpText<"Print the library path for the currently used compiler runtime " + "library (\"libgcc.a\" or \"libclang_rt.builtins.*.a\")">; def print_multi_directory : Flag<["-", "--"], "print-multi-directory">; def print_multi_lib : Flag<["-", "--"], "print-multi-lib">; def print_multi_os_directory : Flag<["-", "--"], "print-multi-os-directory">, diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp index 8fc52b286e6..459f601814b 100644 --- a/clang/lib/Driver/Driver.cpp +++ b/clang/lib/Driver/Driver.cpp @@ -994,7 +994,15 @@ bool Driver::HandleImmediateArgs(const Compilation &C) { } if (C.getArgs().hasArg(options::OPT_print_libgcc_file_name)) { - llvm::outs() << GetFilePath("libgcc.a", TC) << "\n"; + ToolChain::RuntimeLibType RLT = TC.GetRuntimeLibType(C.getArgs()); + switch (RLT) { + case ToolChain::RLT_CompilerRT: + llvm::outs() << TC.getCompilerRT(C.getArgs(), "builtins") << "\n"; + break; + case ToolChain::RLT_Libgcc: + llvm::outs() << GetFilePath("libgcc.a", TC) << "\n"; + break; + } return false; } diff --git a/clang/test/Driver/montavista-gcc-toolchain.c b/clang/test/Driver/montavista-gcc-toolchain.c index da76e957943..402e53b63c5 100644 --- a/clang/test/Driver/montavista-gcc-toolchain.c +++ b/clang/test/Driver/montavista-gcc-toolchain.c @@ -1,6 +1,6 @@ // Test that the montavista gcc-toolchain is correctly detected // -// RUN: %clang -print-libgcc-file-name 2>&1 \ +// RUN: %clang -rtlib=platform -print-libgcc-file-name 2>&1 \ // RUN: --target=i686-montavista-linux \ // RUN: --gcc-toolchain=%S/Inputs/montavista_i686_tree/usr \ // RUN: | FileCheck %s diff --git a/clang/test/Driver/print-libgcc-file-name-clangrt.c b/clang/test/Driver/print-libgcc-file-name-clangrt.c new file mode 100644 index 00000000000..9f8120c31d9 --- /dev/null +++ b/clang/test/Driver/print-libgcc-file-name-clangrt.c @@ -0,0 +1,11 @@ +// Test that -print-libgcc-file-name correctly respects -rtlib=compiler-rt. + +// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \ +// RUN: --target=x86_64-pc-linux \ +// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-X8664 %s +// CHECK-CLANGRT-X8664: libclang_rt.builtins-x86_64.a + +// RUN: %clang -rtlib=compiler-rt -print-libgcc-file-name 2>&1 \ +// RUN: --target=i686-pc-linux \ +// RUN: | FileCheck --check-prefix=CHECK-CLANGRT-I686 %s +// CHECK-CLANGRT-I686: libclang_rt.builtins-i686.a diff --git a/clang/test/Driver/print-libgcc-file-name-libgcc.c b/clang/test/Driver/print-libgcc-file-name-libgcc.c new file mode 100644 index 00000000000..3ca8fb900e3 --- /dev/null +++ b/clang/test/Driver/print-libgcc-file-name-libgcc.c @@ -0,0 +1,7 @@ +// Test that -print-libgcc-file-name correctly respects -rtlib=libgcc. + +// REQUIRES: libgcc + +// RUN: %clang -rtlib=libgcc -print-libgcc-file-name 2>&1 \ +// RUN: | FileCheck --check-prefix=CHECK-LIBGCC %s +// CHECK-LIBGCC: libgcc.a diff --git a/clang/test/lit.cfg b/clang/test/lit.cfg index ad4cf834f91..aea4d6aa316 100644 --- a/clang/test/lit.cfg +++ b/clang/test/lit.cfg @@ -375,6 +375,11 @@ if platform.system() not in ['Windows']: if platform.system() not in ['Windows']: config.available_features.add('utf8-capable-terminal') +# Support for libgcc runtime. Used to rule out tests that require +# clang to run with -rtlib=libgcc. +if platform.system() not in ['Darwin', 'Fuchsia']: + config.available_features.add('libgcc') + # Native compilation: Check if triples match. # FIXME: Consider cases that target can be executed # even if host_triple were different from target_triple. |
