r283586 - Revert r283572 - [Driver] Make -print-libgcc-file-name print compiler-rt lib when used

[Michal Gorny via cfe-commits]

Author: mgorny
Date: Fri Oct  7 15:04:00 2016
New Revision: 283586

URL: http://llvm.org/viewvc/llvm-project?rev=283586&view=rev
Log:
Revert r283572 - [Driver] Make -print-libgcc-file-name print compiler-rt lib when used

Revert the -print-libgcc-file-name change as the new test fails
on Darwin. It needs to be updated to run the libgcc part only on systems
supporting that rtlib.

Removed:
    cfe/trunk/test/Driver/print-libgcc-file-name.c
Modified:
    cfe/trunk/docs/CommandGuide/clang.rst
    cfe/trunk/include/clang/Driver/Options.td
    cfe/trunk/lib/Driver/Driver.cpp

Modified: cfe/trunk/docs/CommandGuide/clang.rst
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/docs/CommandGuide/clang.rst?rev=283586&r1=283585&r2=283586&view=diff
==============================================================================
--- cfe/trunk/docs/CommandGuide/clang.rst (original)
+++ cfe/trunk/docs/CommandGuide/clang.rst Fri Oct  7 15:04:00 2016
@@ -394,8 +394,7 @@ Driver Options
 
 .. option:: -print-libgcc-file-name
 
-  Print the library path for the currently used compiler runtime library
-  ("libgcc.a" or "libclang_rt.builtins.*.a").
+  Print the library path for "libgcc.a".
 
 .. option:: -print-prog-name=<name>
 

Modified: cfe/trunk/include/clang/Driver/Options.td
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/Options.td?rev=283586&r1=283585&r2=283586&view=diff
==============================================================================
--- cfe/trunk/include/clang/Driver/Options.td (original)
+++ cfe/trunk/include/clang/Driver/Options.td Fri Oct  7 15:04:00 2016
@@ -1861,8 +1861,7 @@ def print_file_name_EQ : Joined<["-", "-
 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 the currently used compiler runtime "
-           "library (\"libgcc.a\" or \"libclang_rt.builtins.*.a\")">;
+  HelpText<"Print the library path for \"libgcc.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">,

Modified: cfe/trunk/lib/Driver/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Driver.cpp?rev=283586&r1=283585&r2=283586&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Driver.cpp (original)
+++ cfe/trunk/lib/Driver/Driver.cpp Fri Oct  7 15:04:00 2016
@@ -994,15 +994,7 @@ bool Driver::HandleImmediateArgs(const C
   }
 
   if (C.getArgs().hasArg(options::OPT_print_libgcc_file_name)) {
-    ToolChain::RuntimeLibType RLT = TC.GetRuntimeLibType(C.getArgs());
-    switch (RLT) {
-    case ToolChain::RLT_CompilerRT:
-      llvm::outs() << TC.getCompilerRTArgString(C.getArgs(), "builtins") << "\n";
-      break;
-    case ToolChain::RLT_Libgcc:
-      llvm::outs() << GetFilePath("libgcc.a", TC) << "\n";
-      break;
-    }
+    llvm::outs() << GetFilePath("libgcc.a", TC) << "\n";
     return false;
   }
 

Removed: cfe/trunk/test/Driver/print-libgcc-file-name.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/print-libgcc-file-name.c?rev=283585&view=auto
==============================================================================
--- cfe/trunk/test/Driver/print-libgcc-file-name.c (original)
+++ cfe/trunk/test/Driver/print-libgcc-file-name.c (removed)
@@ -1,15 +0,0 @@
-// Test that -print-libgcc-file-name correctly respects -rtlib=.
-
-// RUN: %clang -rtlib=libgcc -print-libgcc-file-name 2>&1 \
-// RUN:   | FileCheck --check-prefix=CHECK-LIBGCC %s
-// CHECK-LIBGCC: libgcc.a
-
-// 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