[llvm-libtool-darwin] Fix crash with bitcode asm module
When using llvm-libtool-darwin with LTO building llvm itself, it crashed on a file with an asm module in the bitcode. This fixes that by correctly registering the targets for this. Differential Revision: https://reviews.llvm.org/D118575
This commit is contained in:
7
llvm/test/tools/llvm-libtool-darwin/Inputs/arm64-asm.ll
Normal file
7
llvm/test/tools/llvm-libtool-darwin/Inputs/arm64-asm.ll
Normal file
@@ -0,0 +1,7 @@
|
||||
target triple = "arm64-apple-macosx11.0.0"
|
||||
|
||||
module asm ".desc ___crashreporter_info__, 0x10"
|
||||
|
||||
define void @somesymbol() {
|
||||
ret void
|
||||
}
|
||||
7
llvm/test/tools/llvm-libtool-darwin/Inputs/x86_64-asm.ll
Normal file
7
llvm/test/tools/llvm-libtool-darwin/Inputs/x86_64-asm.ll
Normal file
@@ -0,0 +1,7 @@
|
||||
target triple = "x86_64-apple-macosx11.0.0"
|
||||
|
||||
module asm ".desc ___crashreporter_info__, 0x10"
|
||||
|
||||
define void @somesymbol() {
|
||||
ret void
|
||||
}
|
||||
9
llvm/test/tools/llvm-libtool-darwin/arm64-asm.test
Normal file
9
llvm/test/tools/llvm-libtool-darwin/arm64-asm.test
Normal file
@@ -0,0 +1,9 @@
|
||||
# REQUIRES: aarch64-registered-target
|
||||
## This tests that archives are correctly created when the llvm
|
||||
## has native assembly info
|
||||
|
||||
# RUN: llvm-as %p/Inputs/arm64-asm.ll -o %t-arm64-asm.bc
|
||||
# RUN: llvm-libtool-darwin -static -o %t-arm64.lib %t-arm64-asm.bc
|
||||
# RUN: llvm-nm %t-arm64.lib | FileCheck %s
|
||||
|
||||
# CHECK: T somesymbol
|
||||
9
llvm/test/tools/llvm-libtool-darwin/x86_64-asm.test
Normal file
9
llvm/test/tools/llvm-libtool-darwin/x86_64-asm.test
Normal file
@@ -0,0 +1,9 @@
|
||||
# REQUIRES: x86-registered-target
|
||||
## This tests that archives are correctly created when the llvm
|
||||
## has native assembly info
|
||||
|
||||
# RUN: llvm-as %p/Inputs/x86_64-asm.ll -o %t-x86_64-asm.bc
|
||||
# RUN: llvm-libtool-darwin -static -o %t-x86_64.lib %t-x86_64-asm.bc
|
||||
# RUN: llvm-nm %t-x86_64.lib | FileCheck %s
|
||||
|
||||
# CHECK: T somesymbol
|
||||
@@ -4,6 +4,7 @@ set(LLVM_LINK_COMPONENTS
|
||||
Object
|
||||
Support
|
||||
TextAPI
|
||||
${LLVM_TARGETS_TO_BUILD}
|
||||
)
|
||||
|
||||
add_llvm_tool(llvm-libtool-darwin
|
||||
|
||||
@@ -21,6 +21,7 @@
|
||||
#include "llvm/Support/CommandLine.h"
|
||||
#include "llvm/Support/InitLLVM.h"
|
||||
#include "llvm/Support/LineIterator.h"
|
||||
#include "llvm/Support/TargetSelect.h"
|
||||
#include "llvm/Support/VirtualFileSystem.h"
|
||||
#include "llvm/Support/WithColor.h"
|
||||
#include "llvm/Support/raw_ostream.h"
|
||||
@@ -682,6 +683,10 @@ int main(int Argc, char **Argv) {
|
||||
if (VersionOption)
|
||||
cl::PrintVersionMessage();
|
||||
|
||||
llvm::InitializeAllTargetInfos();
|
||||
llvm::InitializeAllTargetMCs();
|
||||
llvm::InitializeAllAsmParsers();
|
||||
|
||||
Config C = *ConfigOrErr;
|
||||
switch (LibraryOperation) {
|
||||
case Operation::None:
|
||||
|
||||
Reference in New Issue
Block a user