[llvm] r339492 - [gold] Fix Tests cases on i686

[Tom Stellard via llvm-commits]

On 08/10/2018 06:08 PM, Tom Stellard via llvm-commits wrote:
> Author: tstellar
> Date: Fri Aug 10 18:08:34 2018
> New Revision: 339492
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=339492&view=rev
> Log:
> [gold] Fix Tests cases on i686
> 
> Reviewers: tejohnson
> 
> Reviewed By: tejohnson
> 
> Subscribers: llvm-commits
> 

Hi Hans,

Can we merge this to the release_70 branch?

-Tom

> Differential Revision: https://reviews.llvm.org/D50583
> 
> Modified:
>     llvm/trunk/test/tools/gold/X86/common.ll
>     llvm/trunk/test/tools/gold/X86/v1.16/wrap-1.ll
>     llvm/trunk/test/tools/gold/X86/v1.16/wrap-2.ll
> 
> Modified: llvm/trunk/test/tools/gold/X86/common.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/gold/X86/common.ll?rev=339492&r1=339491&r2=339492&view=diff
> ==============================================================================
> --- llvm/trunk/test/tools/gold/X86/common.ll (original)
> +++ llvm/trunk/test/tools/gold/X86/common.ll Fri Aug 10 18:08:34 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/trunk/test/tools/gold/X86/v1.16/wrap-1.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/gold/X86/v1.16/wrap-1.ll?rev=339492&r1=339491&r2=339492&view=diff
> ==============================================================================
> --- llvm/trunk/test/tools/gold/X86/v1.16/wrap-1.ll (original)
> +++ llvm/trunk/test/tools/gold/X86/v1.16/wrap-1.ll Fri Aug 10 18:08:34 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/trunk/test/tools/gold/X86/v1.16/wrap-2.ll
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/gold/X86/v1.16/wrap-2.ll?rev=339492&r1=339491&r2=339492&view=diff
> ==============================================================================
> --- llvm/trunk/test/tools/gold/X86/v1.16/wrap-2.ll (original)
> +++ llvm/trunk/test/tools/gold/X86/v1.16/wrap-2.ll Fri Aug 10 18:08:34 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-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>