diff options
author | Bill Wendling <isanbard@gmail.com> | 2013-12-01 04:40:32 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2013-12-01 04:40:32 +0000 |
commit | d0cf77ad590633c0e10336e4c59b509140328042 (patch) | |
tree | 0ef643f5ab912f6787aad2d1f9fe33c9f686fbd2 /test/MC | |
parent | 11e571c95403c73dc8d12d91a4da2a989c4ccbf5 (diff) | |
download | external_llvm-d0cf77ad590633c0e10336e4c59b509140328042.zip external_llvm-d0cf77ad590633c0e10336e4c59b509140328042.tar.gz external_llvm-d0cf77ad590633c0e10336e4c59b509140328042.tar.bz2 |
--- Reverse-merging r195823 into '.':
U lib/MC/MCSectionCOFF.cpp
U lib/CodeGen/TargetLoweringObjectFileImpl.cpp
U test/MC/COFF/weak-symbol.ll
U test/MC/COFF/tricky-names.ll
G .
--- Recording mergeinfo for reverse merge of r195823 into '.':
G .
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@196036 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/MC')
-rw-r--r-- | test/MC/COFF/tricky-names.ll | 6 | ||||
-rw-r--r-- | test/MC/COFF/weak-symbol.ll | 18 |
2 files changed, 15 insertions, 9 deletions
diff --git a/test/MC/COFF/tricky-names.ll b/test/MC/COFF/tricky-names.ll index 458aa41..6e041d3 100644 --- a/test/MC/COFF/tricky-names.ll +++ b/test/MC/COFF/tricky-names.ll @@ -25,11 +25,11 @@ define weak i32 @"\01??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU ; ASM-NOT: .globl "@foo.bar" ; READOBJ: Symbol -; READOBJ: Name: .text -; READOBJ: Section: .text +; READOBJ: Name: .text$??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51 +; READOBJ: Section: .text$??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51 ; READOBJ: Symbol ; READOBJ: Name: ??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51 -; READOBJ: Section: .text +; READOBJ: Section: .text$??_B?$num_put@_WV?$back_insert_iterator@V?$basic_string@_WU?$char_traits@_W@std@@V?$allocator@_W@2@@std@@@std@@@std@@51 ; READOBJ: Symbol ; READOBJ: Name: ??__E_Generic_object@?$_Error_objects@H@std@@YAXXZ ; READOBJ: Symbol diff --git a/test/MC/COFF/weak-symbol.ll b/test/MC/COFF/weak-symbol.ll index f23063e..7f2e87c 100644 --- a/test/MC/COFF/weak-symbol.ll +++ b/test/MC/COFF/weak-symbol.ll @@ -8,31 +8,37 @@ ; RUN: llc -mtriple=x86_64-pc-mingw32 %s -o - | FileCheck %s --check-prefix=X64
; Mangled function
-; X86: .section .text,"xr",discard,__Z3foo
+; X86: .section .text$_Z3foo
+; X86: .linkonce discard
; X86: .globl __Z3foo
;
-; X64: .section .text,"xr",discard,_Z3foo
+; X64: .section .text$_Z3foo
+; X64: .linkonce discard
; X64: .globl _Z3foo
define weak void @_Z3foo() {
ret void
}
; Unmangled function
-; X86: .section .sect,"xr",discard,_f
+; X86: .section .sect$f
+; X86: .linkonce discard
; X86: .globl _f
;
-; X64: .section .sect,"xr",discard,f
+; X64: .section .sect$f
+; X64: .linkonce discard
; X64: .globl f
define weak void @f() section ".sect" {
ret void
}
; Weak global
-; X86: .section .data,"r",discard,_a
+; X86: .section .data$a
+; X86: .linkonce discard
; X86: .globl _a
; X86: .zero 12
;
-; X64: .section .data,"r",discard,a
+; X64: .section .data$a
+; X64: .linkonce discard
; X64: .globl a
; X64: .zero 12
@a = weak unnamed_addr constant { i32, i32, i32 } { i32 0, i32 0, i32 0}, section ".data"
|