Author: hans Date: Mon Aug 13 01:25:39 2018 New Revision: 339544 URL: http://llvm.org/viewvc/llvm-project?rev=339544&view=rev Log: Merging r339492: ------------------------------------------------------------------------ r339492 | tstellar | 2018-08-11 03:08:34 +0200 (Sat, 11 Aug 2018) | 9 lines
[gold] Fix Tests cases on i686 Reviewers: tejohnson Reviewed By: tejohnson Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D50583 ------------------------------------------------------------------------ Modified: llvm/branches/release_70/ (props changed) llvm/branches/release_70/test/tools/gold/X86/common.ll llvm/branches/release_70/test/tools/gold/X86/v1.16/wrap-1.ll llvm/branches/release_70/test/tools/gold/X86/v1.16/wrap-2.ll Propchange: llvm/branches/release_70/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Aug 13 01:25:39 2018 @@ -1,3 +1,3 @@ /llvm/branches/Apple/Pertwee:110850,110961 /llvm/branches/type-system-rewrite:133420-134817 -/llvm/trunk:155241,338552,338554,338569,338599,338610,338658,338665,338682,338703,338709,338716,338751,338762,338817,338902,338915,338968,339073,339179,339184,339190,339225,339316,339319 +/llvm/trunk:155241,338552,338554,338569,338599,338610,338658,338665,338682,338703,338709,338716,338751,338762,338817,338902,338915,338968,339073,339179,339184,339190,339225,339316,339319,339492 Modified: llvm/branches/release_70/test/tools/gold/X86/common.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/tools/gold/X86/common.ll?rev=339544&r1=339543&r2=339544&view=diff ============================================================================== --- llvm/branches/release_70/test/tools/gold/X86/common.ll (original) +++ llvm/branches/release_70/test/tools/gold/X86/common.ll Mon Aug 13 01:25:39 2018 @@ -8,7 +8,7 @@ target triple = "x86_64-unknown-linux-gn @a = common global i16 0, align 8 -; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \ +; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \ ; RUN: --plugin-opt=emit-llvm \ ; RUN: -shared %t1.o %t2.o -o %t3.o ; RUN: llvm-dis %t3.o -o - | FileCheck %s --check-prefix=A @@ -16,7 +16,7 @@ target triple = "x86_64-unknown-linux-gn ; Shared library case, we merge @a as common and keep it for the symbol table. ; A: @a = common global [4 x i8] zeroinitializer, align 8 -; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \ +; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \ ; RUN: --plugin-opt=emit-llvm \ ; RUN: -shared %t1.o %t2b.o -o %t3.o ; RUN: llvm-dis %t3.o -o - | FileCheck %s --check-prefix=B @@ -24,7 +24,7 @@ target triple = "x86_64-unknown-linux-gn ; (i16 align 8) + (i8 align 16) = i16 align 16 ; B: @a = common global i16 0, align 16 -; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \ +; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \ ; RUN: --plugin-opt=emit-llvm \ ; RUN: -shared %t1.o %t2c.o -o %t3.o ; RUN: llvm-dis %t3.o -o - | FileCheck %s --check-prefix=C @@ -32,7 +32,7 @@ target triple = "x86_64-unknown-linux-gn ; (i16 align 8) + (i8 align 1) = i16 align 8. ; C: @a = common global i16 0, align 8 -; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext \ +; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext \ ; RUN: --plugin-opt=emit-llvm \ ; RUN: %t1.o %t2.o -o %t3.o ; RUN: llvm-dis %t3.o -o - | FileCheck --check-prefix=EXEC %s @@ -41,7 +41,7 @@ target triple = "x86_64-unknown-linux-gn ; EXEC: @a = internal global [4 x i8] zeroinitializer, align 8 ; RUN: llc %p/Inputs/common.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=emit-llvm \ ; RUN: %t1.o %t2native.o -o %t3.o ; RUN: llvm-dis %t3.o -o - | FileCheck --check-prefix=MIXED %s Modified: llvm/branches/release_70/test/tools/gold/X86/v1.16/wrap-1.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/tools/gold/X86/v1.16/wrap-1.ll?rev=339544&r1=339543&r2=339544&view=diff ============================================================================== --- llvm/branches/release_70/test/tools/gold/X86/v1.16/wrap-1.ll (original) +++ llvm/branches/release_70/test/tools/gold/X86/v1.16/wrap-1.ll Mon Aug 13 01:25:39 2018 @@ -1,12 +1,12 @@ ; LTO ; RUN: llvm-as %s -o %t.o -; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext %t.o -o %t.out -wrap=bar -plugin-opt=save-temps +; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext %t.o -o %t.out -wrap=bar -plugin-opt=save-temps ; RUN: llvm-readobj -t %t.out | FileCheck %s ; RUN: cat %t.out.resolution.txt | FileCheck -check-prefix=RESOLS %s ; ThinLTO ; RUN: opt -module-summary %s -o %t.o -; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext %t.o -o %t.out -wrap=bar -plugin-opt=save-temps +; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext %t.o -o %t.out -wrap=bar -plugin-opt=save-temps ; RUN: llvm-readobj -t %t.out | FileCheck %s ; RUN: cat %t.out.resolution.txt | FileCheck -check-prefix=RESOLS %s Modified: llvm/branches/release_70/test/tools/gold/X86/v1.16/wrap-2.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_70/test/tools/gold/X86/v1.16/wrap-2.ll?rev=339544&r1=339543&r2=339544&view=diff ============================================================================== --- llvm/branches/release_70/test/tools/gold/X86/v1.16/wrap-2.ll (original) +++ llvm/branches/release_70/test/tools/gold/X86/v1.16/wrap-2.ll Mon Aug 13 01:25:39 2018 @@ -7,14 +7,14 @@ ; LTO defsym handling, gold will need a fix (not the gold plugin). ; RUN-TODO: llvm-as %s -o %t.o ; RUN-TODO: llvm-as %S/Inputs/wrap-bar.ll -o %t1.o -; RUN-TODO: %gold -plugin %llvmshlibdir/LLVMgold%shlibext %t.o %t1.o -shared -o %t.so -wrap=bar +; RUN-TODO: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext %t.o %t1.o -shared -o %t.so -wrap=bar ; RUN-TODO: llvm-objdump -d %t.so | FileCheck %s ; RUN-TODO: llvm-readobj -t %t.so | FileCheck -check-prefix=BIND %s ; ThinLTO ; RUN: opt -module-summary %s -o %t.o ; RUN: opt -module-summary %S/Inputs/wrap-bar.ll -o %t1.o -; RUN: %gold -plugin %llvmshlibdir/LLVMgold%shlibext %t.o %t1.o -shared -o %t.so -wrap=bar +; RUN: %gold -m elf_x86_64 -plugin %llvmshlibdir/LLVMgold%shlibext %t.o %t1.o -shared -o %t.so -wrap=bar ; RUN: llvm-objdump -d %t.so | FileCheck %s -check-prefix=THIN ; RUN: llvm-readobj -t %t.so | FileCheck -check-prefix=BIND %s _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
