llvm_9: fix test failing on non-x86, such as our aarch64

This commit is contained in:
Will Dietz 2019-09-20 21:59:28 -05:00
parent 9943cb0fa1
commit 233ba4052a
No known key found for this signature in database
GPG Key ID: EBB0EA4124809D02
2 changed files with 27 additions and 0 deletions

View File

@ -0,0 +1,23 @@
Index: test/tools/gold/X86/linkonce_odr_unnamed_addr.ll
===================================================================
diff --git a/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll b/llvm/trunk/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll
--- a/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll (revision 372333)
+++ b/test/tools/gold/X86/linkonce_odr_unnamed_addr.ll (working copy)
@@ -3,7 +3,7 @@
; RUN: opt -module-summary %s -o %t.o
; RUN: opt -module-summary %p/Inputs/linkonce_odr_unnamed_addr.ll -o %t2.o
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
; RUN: --plugin-opt=save-temps \
; RUN: %t.o %t2.o -o %t3.o
; RUN: llvm-dis %t.o.1.promote.bc -o - | FileCheck %s
@@ -11,7 +11,7 @@
; Now test when one module is a native object. In that case we must be
; conservative and not auto hide.
; RUN: llc %p/Inputs/linkonce_odr_unnamed_addr.ll -o %t2native.o -filetype=obj
-; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \
+; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \
; RUN: --plugin-opt=save-temps \
; RUN: %t.o %t2native.o -o %t3.o
; RUN: llvm-dis %t.o.1.promote.bc -o - | FileCheck %s --check-prefix=NOSUMMARY

View File

@ -81,6 +81,10 @@ in stdenv.mkDerivation (rec {
# Fix test so that no extra locale files are needed
substituteInPlace test/tools/llvm-ar/mri-utf8.test \
--replace en_US.UTF-8 C.UTF-8
# Fix x86 gold test on non-x86 platforms
# (similar fix made to others in this directory previously, FWIW)
patch -p1 -i ${./fix-test-on-non-x86-like-others.patch}
'';
# hacky fix: created binaries need to be run before installation