Author: mehdi_amini Date: Tue Jan 24 12:15:21 2017 New Revision: 292961 URL: http://llvm.org/viewvc/llvm-project?rev=292961&view=rev Log: Forward -bitcode_process_mode to ld64 in marker-only mode
Reviewers: steven_wu Subscribers: cfe-commits Differential Revision: https://reviews.llvm.org/D29066 Modified: cfe/trunk/lib/Driver/Tools.cpp cfe/trunk/test/Driver/embed-bitcode.c Modified: cfe/trunk/lib/Driver/Tools.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=292961&r1=292960&r2=292961&view=diff ============================================================================== --- cfe/trunk/lib/Driver/Tools.cpp (original) +++ cfe/trunk/lib/Driver/Tools.cpp Tue Jan 24 12:15:21 2017 @@ -8435,9 +8435,13 @@ void darwin::Linker::AddLinkArgs(Compila // for embed-bitcode, use -bitcode_bundle in linker command if (C.getDriver().embedBitcodeEnabled()) { // Check if the toolchain supports bitcode build flow. - if (MachOTC.SupportsEmbeddedBitcode()) + if (MachOTC.SupportsEmbeddedBitcode()) { CmdArgs.push_back("-bitcode_bundle"); - else + if (C.getDriver().embedBitcodeMarkerOnly() && Version[0] >= 278) { + CmdArgs.push_back("-bitcode_process_mode"); + CmdArgs.push_back("marker"); + } + } else D.Diag(diag::err_drv_bitcode_unsupported_on_toolchain); } Modified: cfe/trunk/test/Driver/embed-bitcode.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/embed-bitcode.c?rev=292961&r1=292960&r2=292961&view=diff ============================================================================== --- cfe/trunk/test/Driver/embed-bitcode.c (original) +++ cfe/trunk/test/Driver/embed-bitcode.c Tue Jan 24 12:15:21 2017 @@ -34,6 +34,13 @@ // CHECK-LTO-NOT: warning: argument unused during compilation: '-fembed-bitcode' // CHECK-LTO-NOT: -cc1 // CHECK-LTO-NOT: -fembed-bitcode=all +// RUN: touch %t.o +// RUN: %clang %t.o -fembed-bitcode -fembed-bitcode-marker -mlinker-version=277 2>&1 -### | FileCheck %s -check-prefix=CHECK-LTO-MARKER-277 +// RUN: %clang %t.o -fembed-bitcode -fembed-bitcode-marker -mlinker-version=278 2>&1 -### | FileCheck %s -check-prefix=CHECK-LTO-MARKER-278 +// CHECK-LTO-MARKER-277-NOT: bitcode_process_mode +// CHECK-LTO-MARKER-278: bitcode_process_mode + + // RUN: %clang -c %s -fembed-bitcode-marker -fintegrated-as 2>&1 -### | FileCheck %s -check-prefix=CHECK-MARKER // CHECK-MARKER: -cc1 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits