[ELF2] - Implemented PT_GNU_STACK support, -z execstack option.
PT_GNU_STACK is a entry in the elf file format which contains the access rights (read, write, execute) of the stack,
it is always generated now. By default stack is not executable in this implementation.
-z execstack can be used to make executable.
Differential revision: http://reviews.llvm.org/D14571
llvm-svn: 253145
diff --git a/lld/test/elf2/basic-aarch64.s b/lld/test/elf2/basic-aarch64.s
index 6eb42a1..e0b9350 100644
--- a/lld/test/elf2/basic-aarch64.s
+++ b/lld/test/elf2/basic-aarch64.s
@@ -31,7 +31,7 @@
# CHECK-NEXT: ]
# CHECK-NEXT: HeaderSize: 64
# CHECK-NEXT: ProgramHeaderEntrySize: 56
-# CHECK-NEXT: ProgramHeaderCount: 3
+# CHECK-NEXT: ProgramHeaderCount: 4
# CHECK-NEXT: SectionHeaderEntrySize: 64
# CHECK-NEXT: SectionHeaderCount: 5
# CHECK-NEXT: StringTableSectionIndex: 3
@@ -145,8 +145,8 @@
# CHECK-NEXT: Offset: 0x40
# CHECK-NEXT: VirtualAddress: 0x10040
# CHECK-NEXT: PhysicalAddress: 0x10040
-# CHECK-NEXT: FileSize: 168
-# CHECK-NEXT: MemSize: 168
+# CHECK-NEXT: FileSize: 224
+# CHECK-NEXT: MemSize: 224
# CHECK-NEXT: Flags [ (0x4)
# CHECK-NEXT: PF_R (0x4)
# CHECK-NEXT: ]
@@ -157,8 +157,8 @@
# CHECK-NEXT: Offset: 0x0
# CHECK-NEXT: VirtualAddress: 0x10000
# CHECK-NEXT: PhysicalAddress: 0x10000
-# CHECK-NEXT: FileSize: 232
-# CHECK-NEXT: MemSize: 232
+# CHECK-NEXT: FileSize: 288
+# CHECK-NEXT: MemSize: 288
# CHECK-NEXT: Flags [
# CHECK-NEXT: PF_R
# CHECK-NEXT: ]
@@ -177,4 +177,17 @@
# CHECK-NEXT: ]
# CHECK-NEXT: Alignment: 4096
# CHECK-NEXT: }
+# CHECK-NEXT: ProgramHeader {
+# CHECK-NEXT: Type: PT_GNU_STACK
+# CHECK-NEXT: Offset: 0x0
+# CHECK-NEXT: VirtualAddress: 0x0
+# CHECK-NEXT: PhysicalAddress: 0x0
+# CHECK-NEXT: FileSize: 0
+# CHECK-NEXT: MemSize: 0
+# CHECK-NEXT: Flags [
+# CHECK-NEXT: PF_R
+# CHECK-NEXT: PF_W
+# CHECK-NEXT: ]
+# CHECK-NEXT: Alignment: 0
+# CHECK-NEXT: }
# CHECK-NEXT: ]
diff --git a/lld/test/elf2/basic-mips.s b/lld/test/elf2/basic-mips.s
index 399f8b3..ac81147 100644
--- a/lld/test/elf2/basic-mips.s
+++ b/lld/test/elf2/basic-mips.s
@@ -32,7 +32,7 @@
# CHECK-NEXT: ]
# CHECK-NEXT: HeaderSize: 52
# CHECK-NEXT: ProgramHeaderEntrySize: 32
-# CHECK-NEXT: ProgramHeaderCount: 4
+# CHECK-NEXT: ProgramHeaderCount: 5
# CHECK-NEXT: SectionHeaderEntrySize: 40
# CHECK-NEXT: SectionHeaderCount: 9
# CHECK-NEXT: StringTableSectionIndex: 7
@@ -59,8 +59,8 @@
# CHECK-NEXT: Flags [ (0x2)
# CHECK-NEXT: SHF_ALLOC (0x2)
# CHECK-NEXT: ]
-# CHECK-NEXT: Address: 0x100B4
-# CHECK-NEXT: Offset: 0xB4
+# CHECK-NEXT: Address: 0x100D4
+# CHECK-NEXT: Offset: 0xD4
# CHECK-NEXT: Size: 24
# CHECK-NEXT: Link: 0
# CHECK-NEXT: Info: 0
@@ -74,8 +74,8 @@
# CHECK-NEXT: Flags [ (0x2)
# CHECK-NEXT: SHF_ALLOC (0x2)
# CHECK-NEXT: ]
-# CHECK-NEXT: Address: 0x100D0
-# CHECK-NEXT: Offset: 0xD0
+# CHECK-NEXT: Address: 0x100F0
+# CHECK-NEXT: Offset: 0xF0
# CHECK-NEXT: Size: 24
# CHECK-NEXT: Link: 0
# CHECK-NEXT: Info: 0
@@ -208,8 +208,8 @@
# CHECK-NEXT: Offset: 0x34
# CHECK-NEXT: VirtualAddress: 0x10034
# CHECK-NEXT: PhysicalAddress: 0x10034
-# CHECK-NEXT: FileSize: 128
-# CHECK-NEXT: MemSize: 128
+# CHECK-NEXT: FileSize: 160
+# CHECK-NEXT: MemSize: 160
# CHECK-NEXT: Flags [ (0x4)
# CHECK-NEXT: PF_R (0x4)
# CHECK-NEXT: ]
@@ -220,8 +220,8 @@
# CHECK-NEXT: Offset: 0x0
# CHECK-NEXT: VirtualAddress: 0x10000
# CHECK-NEXT: PhysicalAddress: 0x10000
-# CHECK-NEXT: FileSize: 232
-# CHECK-NEXT: MemSize: 232
+# CHECK-NEXT: FileSize: 264
+# CHECK-NEXT: MemSize: 264
# CHECK-NEXT: Flags [ (0x4)
# CHECK-NEXT: PF_R (0x4)
# CHECK-NEXT: ]
@@ -253,4 +253,17 @@
# CHECK-NEXT: ]
# CHECK-NEXT: Alignment: 65536
# CHECK-NEXT: }
-# CHECK-NEXT: ]
+# CHECK-NEXT: ProgramHeader {
+# CHECK-NEXT: Type: PT_GNU_STACK
+# CHECK-NEXT: Offset: 0x0
+# CHECK-NEXT: VirtualAddress: 0x0
+# CHECK-NEXT: PhysicalAddress: 0x0
+# CHECK-NEXT: FileSize: 0
+# CHECK-NEXT: MemSize: 0
+# CHECK-NEXT: Flags [
+# CHECK-NEXT: PF_R
+# CHECK-NEXT: PF_W
+# CHECK-NEXT: ]
+# CHECK-NEXT: Alignment: 0
+# CHECK-NEXT: }
+# CHECK-NEXT:]
diff --git a/lld/test/elf2/basic.s b/lld/test/elf2/basic.s
index 8a97d4d..0b612aa 100644
--- a/lld/test/elf2/basic.s
+++ b/lld/test/elf2/basic.s
@@ -32,7 +32,7 @@
# CHECK-NEXT: ]
# CHECK-NEXT: HeaderSize: 64
# CHECK-NEXT: ProgramHeaderEntrySize: 56
-# CHECK-NEXT: ProgramHeaderCount: 3
+# CHECK-NEXT: ProgramHeaderCount: 4
# CHECK-NEXT: SectionHeaderEntrySize: 64
# CHECK-NEXT: SectionHeaderCount: 5
# CHECK-NEXT: StringTableSectionIndex: 3
@@ -137,8 +137,8 @@
# CHECK-NEXT: Offset: 0x40
# CHECK-NEXT: VirtualAddress: 0x10040
# CHECK-NEXT: PhysicalAddress: 0x10040
-# CHECK-NEXT: FileSize: 168
-# CHECK-NEXT: MemSize: 168
+# CHECK-NEXT: FileSize: 224
+# CHECK-NEXT: MemSize: 224
# CHECK-NEXT: Flags [ (0x4)
# CHECK-NEXT: PF_R (0x4)
# CHECK-NEXT: ]
@@ -149,8 +149,8 @@
# CHECK-NEXT: Offset: 0x0
# CHECK-NEXT: VirtualAddress: 0x10000
# CHECK-NEXT: PhysicalAddress: 0x10000
-# CHECK-NEXT: FileSize: 232
-# CHECK-NEXT: MemSize: 232
+# CHECK-NEXT: FileSize: 288
+# CHECK-NEXT: MemSize: 288
# CHECK-NEXT: Flags [
# CHECK-NEXT: PF_R
# CHECK-NEXT: ]
@@ -169,6 +169,19 @@
# CHECK-NEXT: ]
# CHECK-NEXT: Alignment: 4096
# CHECK-NEXT: }
+# CHECK-NEXT: ProgramHeader {
+# CHECK-NEXT: Type: PT_GNU_STACK
+# CHECK-NEXT: Offset: 0x0
+# CHECK-NEXT: VirtualAddress: 0x0
+# CHECK-NEXT: PhysicalAddress: 0x0
+# CHECK-NEXT: FileSize: 0
+# CHECK-NEXT: MemSize: 0
+# CHECK-NEXT: Flags [
+# CHECK-NEXT: PF_R
+# CHECK-NEXT: PF_W
+# CHECK-NEXT: ]
+# CHECK-NEXT: Alignment: 0
+# CHECK-NEXT: }
# CHECK-NEXT: ]
# Test for the response file
diff --git a/lld/test/elf2/basic32.s b/lld/test/elf2/basic32.s
index 498d04b..f22a225 100644
--- a/lld/test/elf2/basic32.s
+++ b/lld/test/elf2/basic32.s
@@ -30,7 +30,7 @@
# CHECK-NEXT: ]
# CHECK-NEXT: HeaderSize: 52
# CHECK-NEXT: ProgramHeaderEntrySize: 32
-# CHECK-NEXT: ProgramHeaderCount: 3
+# CHECK-NEXT: ProgramHeaderCount: 4
# CHECK-NEXT: SectionHeaderEntrySize: 40
# CHECK-NEXT: SectionHeaderCount: 5
# CHECK-NEXT: StringTableSectionIndex: 3
@@ -115,8 +115,8 @@
# CHECK-NEXT: Offset: 0x34
# CHECK-NEXT: VirtualAddress: 0x10034
# CHECK-NEXT: PhysicalAddress: 0x10034
-# CHECK-NEXT: FileSize: 96
-# CHECK-NEXT: MemSize: 96
+# CHECK-NEXT: FileSize: 128
+# CHECK-NEXT: MemSize: 128
# CHECK-NEXT: Flags [ (0x4)
# CHECK-NEXT: PF_R (0x4)
# CHECK-NEXT: ]
@@ -127,8 +127,8 @@
# CHECK-NEXT: Offset: 0x0
# CHECK-NEXT: VirtualAddress: 0x10000
# CHECK-NEXT: PhysicalAddress: 0x10000
-# CHECK-NEXT: FileSize: 148
-# CHECK-NEXT: MemSize: 148
+# CHECK-NEXT: FileSize: 180
+# CHECK-NEXT: MemSize: 180
# CHECK-NEXT: Flags [
# CHECK-NEXT: PF_R
# CHECK-NEXT: ]
@@ -147,4 +147,17 @@
# CHECK-NEXT: ]
# CHECK-NEXT: Alignment: 4096
# CHECK-NEXT: }
+# CHECK-NEXT: ProgramHeader {
+# CHECK-NEXT: Type: PT_GNU_STACK
+# CHECK-NEXT: Offset: 0x0
+# CHECK-NEXT: VirtualAddress: 0x0
+# CHECK-NEXT: PhysicalAddress: 0x0
+# CHECK-NEXT: FileSize: 0
+# CHECK-NEXT: MemSize: 0
+# CHECK-NEXT: Flags [
+# CHECK-NEXT: PF_R
+# CHECK-NEXT: PF_W
+# CHECK-NEXT: ]
+# CHECK-NEXT: Alignment: 0
+# CHECK-NEXT: }
# CHECK-NEXT: ]
diff --git a/lld/test/elf2/basic64be.s b/lld/test/elf2/basic64be.s
index ebacc61..e733ff1 100644
--- a/lld/test/elf2/basic64be.s
+++ b/lld/test/elf2/basic64be.s
@@ -43,7 +43,7 @@
# CHECK-NEXT: ]
# CHECK-NEXT: HeaderSize: 64
# CHECK-NEXT: ProgramHeaderEntrySize: 56
-# CHECK-NEXT: ProgramHeaderCount: 4
+# CHECK-NEXT: ProgramHeaderCount: 5
# CHECK-NEXT: SectionHeaderEntrySize: 64
# CHECK-NEXT: SectionHeaderCount: 8
# CHECK-NEXT: StringTableSectionIndex: 6
@@ -199,8 +199,8 @@
# CHECK-NEXT: Offset: 0x40
# CHECK-NEXT: VirtualAddress: 0x10000040
# CHECK-NEXT: PhysicalAddress: 0x10000040
-# CHECK-NEXT: FileSize: 224
-# CHECK-NEXT: MemSize: 224
+# CHECK-NEXT: FileSize: 280
+# CHECK-NEXT: MemSize: 280
# CHECK-NEXT: Flags [ (0x4)
# CHECK-NEXT: PF_R (0x4)
# CHECK-NEXT: ]
@@ -211,8 +211,8 @@
# CHECK-NEXT: Offset: 0x0
# CHECK-NEXT: VirtualAddress: 0x10000000
# CHECK-NEXT: PhysicalAddress: 0x10000000
-# CHECK-NEXT: FileSize: 288
-# CHECK-NEXT: MemSize: 288
+# CHECK-NEXT: FileSize: 344
+# CHECK-NEXT: MemSize: 344
# CHECK-NEXT: Flags [
# CHECK-NEXT: PF_R
# CHECK-NEXT: ]
@@ -220,7 +220,7 @@
# CHECK-NEXT: }
# CHECK-NEXT: ProgramHeader {
# CHECK-NEXT: Type: PT_LOAD (0x1)
-# CHECK-NEXT: Offset: 0x1000
+# CHECK-NEXT: Offset: 0x10000
# CHECK-NEXT: VirtualAddress: 0x10010000
# CHECK-NEXT: PhysicalAddress: 0x10010000
# CHECK-NEXT: FileSize: 12
@@ -233,7 +233,7 @@
# CHECK-NEXT: }
# CHECK-NEXT: ProgramHeader {
# CHECK-NEXT: Type: PT_LOAD (0x1)
-# CHECK-NEXT: Offset: 0x2000
+# CHECK-NEXT: Offset: 0x20000
# CHECK-NEXT: VirtualAddress: 0x10020000
# CHECK-NEXT: PhysicalAddress: 0x10020000
# CHECK-NEXT: FileSize: 88
@@ -244,4 +244,17 @@
# CHECK-NEXT: ]
# CHECK-NEXT: Alignment: 65536
# CHECK-NEXT: }
-# CHECK-NEXT:]
+# CHECK-NEXT: ProgramHeader {
+# CHECK-NEXT: Type: PT_GNU_STACK (0x6474E551)
+# CHECK-NEXT: Offset: 0x0
+# CHECK-NEXT: VirtualAddress: 0x0
+# CHECK-NEXT: PhysicalAddress: 0x0
+# CHECK-NEXT: FileSize: 0
+# CHECK-NEXT: MemSize: 0
+# CHECK-NEXT: Flags [ (0x6)
+# CHECK-NEXT: PF_R (0x4)
+# CHECK-NEXT: PF_W (0x2)
+# CHECK-NEXT: ]
+# CHECK-NEXT: Alignment: 0
+# CHECK-NEXT: }
+# CHECK-NEXT: ]
\ No newline at end of file
diff --git a/lld/test/elf2/eh-frame-merge.s b/lld/test/elf2/eh-frame-merge.s
index 55978a62..bc879c5 100644
--- a/lld/test/elf2/eh-frame-merge.s
+++ b/lld/test/elf2/eh-frame-merge.s
@@ -35,9 +35,9 @@
// CHECK-NEXT: SectionData (
// CHECK-NEXT: 0000: 14000000 00000000 017A5200 01781001 |
// CHECK-NEXT: 0010: 1B0C0708 90010000 10000000 1C000000 |
-// CHECK-NEXT: 0020: 880E0000 01000000 00000000 10000000 |
-// CHECK-NEXT: 0030: 30000000 760E0000 02000000 00000000 |
-// CHECK-NEXT: 0040: 10000000 44000000 610E0000 01000000 |
+// CHECK-NEXT: 0020: 500E0000 01000000 00000000 10000000 |
+// CHECK-NEXT: 0030: 30000000 3E0E0000 02000000 00000000 |
+// CHECK-NEXT: 0040: 10000000 44000000 290E0000 01000000 |
// CHECK-NEXT: 0050: 00000000 |
// CHECK-NEXT: )
diff --git a/lld/test/elf2/gnu-hash-table.s b/lld/test/elf2/gnu-hash-table.s
index b4efcef..d86cb77 100644
--- a/lld/test/elf2/gnu-hash-table.s
+++ b/lld/test/elf2/gnu-hash-table.s
@@ -149,8 +149,8 @@
# PPC64-NEXT: Flags [
# PPC64-NEXT: SHF_ALLOC
# PPC64-NEXT: ]
-# PPC64-NEXT: Address: 0x1B8
-# PPC64-NEXT: Offset: 0x1B8
+# PPC64-NEXT: Address: 0x1F0
+# PPC64-NEXT: Offset: 0x1F0
# PPC64-NEXT: Size: 36
# PPC64-NEXT: Link: 1
# PPC64-NEXT: Info: 0
diff --git a/lld/test/elf2/gnustack.s b/lld/test/elf2/gnustack.s
new file mode 100644
index 0000000..d65f125
--- /dev/null
+++ b/lld/test/elf2/gnustack.s
@@ -0,0 +1,46 @@
+# REQUIRES: x86
+# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t1
+# RUN: ld.lld2 %t1 -z execstack -o %t
+# RUN: llvm-readobj --program-headers -s %t | FileCheck --check-prefix=CHECK_RWX %s
+# RUN: ld.lld2 %t1 -o %t
+# RUN: llvm-readobj --program-headers -s %t | FileCheck --check-prefix=CHECK_RW %s
+
+# CHECK_RW: Sections [
+# CHECK_RW-NOT: Name: .note.GNU-stack
+# CHECK_RW: ProgramHeaders [
+# CHECK_RW: ProgramHeader {
+# CHECK_RW: Type: PT_GNU_STACK
+# CHECK_RW-NEXT: Offset: 0x0
+# CHECK_RW-NEXT: VirtualAddress: 0x0
+# CHECK_RW-NEXT: PhysicalAddress: 0x0
+# CHECK_RW-NEXT: FileSize: 0
+# CHECK_RW-NEXT: MemSize: 0
+# CHECK_RW-NEXT: Flags [
+# CHECK_RW-NEXT: PF_R
+# CHECK_RW-NEXT: PF_W
+# CHECK_RW-NEXT: ]
+# CHECK_RW-NEXT: Alignment: 0
+# CHECK_RW-NEXT: }
+# CHECK_RW-NEXT: ]
+
+# CHECK_RWX: Sections [
+# CHECK_RWX-NOT: Name: .note.GNU-stack
+# CHECK_RWX: ProgramHeaders [
+# CHECK_RWX: ProgramHeader {
+# CHECK_RWX: Type: PT_GNU_STACK
+# CHECK_RWX-NEXT: Offset: 0x0
+# CHECK_RWX-NEXT: VirtualAddress: 0x0
+# CHECK_RWX-NEXT: PhysicalAddress: 0x0
+# CHECK_RWX-NEXT: FileSize: 0
+# CHECK_RWX-NEXT: MemSize: 0
+# CHECK_RWX-NEXT: Flags [
+# CHECK_RWX-NEXT: PF_R
+# CHECK_RWX-NEXT: PF_W
+# CHECK_RWX-NEXT: PF_X
+# CHECK_RWX-NEXT: ]
+# CHECK_RWX-NEXT: Alignment: 0
+# CHECK_RWX-NEXT: }
+# CHECK_RWX-NEXT: ]
+
+.globl _start
+_start:
diff --git a/lld/test/elf2/merge-shared.s b/lld/test/elf2/merge-shared.s
index 7984e94..e80cafd 100644
--- a/lld/test/elf2/merge-shared.s
+++ b/lld/test/elf2/merge-shared.s
@@ -17,10 +17,10 @@
// CHECK-NEXT: SHF_ALLOC
// CHECK-NEXT: SHF_MERGE
// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x158
+// CHECK-NEXT: Address: 0x190
// CHECK: Relocations [
// CHECK-NEXT: Section ({{.*}}) .rela.dyn {
-// CHECK-NEXT: 0x{{.*}} R_X86_64_RELATIVE - 0x15A
+// CHECK-NEXT: 0x{{.*}} R_X86_64_RELATIVE - 0x192
// CHECK-NEXT: }
// CHECK-NEXT: ]
diff --git a/lld/test/elf2/merge-string.s b/lld/test/elf2/merge-string.s
index c89fe38..c77c020 100644
--- a/lld/test/elf2/merge-string.s
+++ b/lld/test/elf2/merge-string.s
@@ -26,8 +26,8 @@
// CHECK-NEXT: SHF_MERGE
// CHECK-NEXT: SHF_STRINGS
// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x158
-// CHECK-NEXT: Offset: 0x158
+// CHECK-NEXT: Address: 0x190
+// CHECK-NEXT: Offset: 0x190
// CHECK-NEXT: Size: 4
// CHECK-NEXT: Link: 0
// CHECK-NEXT: Info: 0
@@ -44,8 +44,8 @@
// NOTAIL-NEXT: SHF_MERGE
// NOTAIL-NEXT: SHF_STRINGS
// NOTAIL-NEXT: ]
-// NOTAIL-NEXT: Address: 0x158
-// NOTAIL-NEXT: Offset: 0x158
+// NOTAIL-NEXT: Address: 0x190
+// NOTAIL-NEXT: Offset: 0x190
// NOTAIL-NEXT: Size: 7
// NOTAIL-NEXT: Link: 0
// NOTAIL-NEXT: Info: 0
@@ -62,8 +62,8 @@
// CHECK-NEXT: SHF_MERGE
// CHECK-NEXT: SHF_STRINGS
// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x15C
-// CHECK-NEXT: Offset: 0x15C
+// CHECK-NEXT: Address: 0x194
+// CHECK-NEXT: Offset: 0x194
// CHECK-NEXT: Size: 4
// CHECK-NEXT: Link: 0
// CHECK-NEXT: Info: 0
@@ -75,11 +75,11 @@
// CHECK: Name: bar
-// CHECK-NEXT: Value: 0x159
+// CHECK-NEXT: Value: 0x191
// CHECK: Name: foo
-// CHECK-NEXT: Value: 0x158
+// CHECK-NEXT: Value: 0x190
// CHECK: Name: zed
-// CHECK-NEXT: Value: 0x15C
+// CHECK-NEXT: Value: 0x194
// CHECK-NEXT: Size: 0
diff --git a/lld/test/elf2/merge-sym.s b/lld/test/elf2/merge-sym.s
index c421254..c86eea4 100644
--- a/lld/test/elf2/merge-sym.s
+++ b/lld/test/elf2/merge-sym.s
@@ -15,7 +15,7 @@
// CHECK-NEXT: SHF_ALLOC
// CHECK-NEXT: SHF_MERGE
// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x158
+// CHECK-NEXT: Address: 0x190
// CHECK: Name: foo
-// CHECK-NEXT: Value: 0x15A
+// CHECK-NEXT: Value: 0x192
diff --git a/lld/test/elf2/merge.s b/lld/test/elf2/merge.s
index 6e2cf0c..389da47 100644
--- a/lld/test/elf2/merge.s
+++ b/lld/test/elf2/merge.s
@@ -23,8 +23,8 @@
// CHECK-NEXT: SHF_ALLOC
// CHECK-NEXT: SHF_MERGE
// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x100E8
-// CHECK-NEXT: Offset: 0xE8
+// CHECK-NEXT: Address: 0x10120
+// CHECK-NEXT: Offset: 0x120
// CHECK-NEXT: Size: 8
// CHECK-NEXT: Link: 0
// CHECK-NEXT: Info: 0
@@ -35,13 +35,13 @@
// CHECK-NEXT: )
-// Address of the constant 0x10 = 0x100E8 = 65768
-// Address of the constant 0x42 = 0x100EC = 65772
+// Address of the constant 0x10 = 0x10120 = 65824
+// Address of the constant 0x42 = 0x10124 = 65828
// CHECK: Symbols [
// CHECK: Name: bar
-// CHECK-NEXT: Value: 0x100EC
+// CHECK-NEXT: Value: 0x10124
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Loca
// CHECK-NEXT: Type: None
@@ -49,7 +49,7 @@
// CHECK-NEXT: Section: .mysec
// CHECK: Name: zed
-// CHECK-NEXT: Value: 0x100EC
+// CHECK-NEXT: Value: 0x10124
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Local
// CHECK-NEXT: Type: None
@@ -57,7 +57,7 @@
// CHECK-NEXT: Section: .mysec
// CHECK: Name: foo
-// CHECK-NEXT: Value: 0x100EC
+// CHECK-NEXT: Value: 0x10124
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Local
// CHECK-NEXT: Type: None
@@ -73,37 +73,37 @@
// DISASM-NEXT: _start:
movl .mysec, %eax
-// addr(0x10) = 65768
-// DISASM-NEXT: movl 65768, %eax
+// addr(0x10) = 65824
+// DISASM-NEXT: movl 65824, %eax
movl .mysec+7, %eax
-// addr(0x42) + 3 = 65772 + 3 = 65775
-// DISASM-NEXT: movl 65775, %eax
+// addr(0x42) + 3 = 65828 + 3 = 65831
+// DISASM-NEXT: movl 65831, %eax
movl .mysec+8, %eax
-// addr(0x42) = 65772
-// DISASM-NEXT: movl 65772, %eax
+// addr(0x42) = 65828
+// DISASM-NEXT: movl 65828, %eax
movl bar+7, %eax
-// addr(0x42) + 7 = 65772 + 7 = 65779
-// DISASM-NEXT: movl 65779, %eax
+// addr(0x42) + 7 = 65828 + 7 = 65835
+// DISASM-NEXT: movl 65835, %eax
movl bar+8, %eax
-// addr(0x42) + 8 = 65772 + 8 = 65780
-// DISASM-NEXT: movl 65780, %eax
+// addr(0x42) + 8 = 65828 + 8 = 65836
+// DISASM-NEXT: movl 65836, %eax
movl foo, %eax
-// addr(0x42) = 65772
-// DISASM-NEXT: movl 65772, %eax
+// addr(0x42) = 65828
+// DISASM-NEXT: movl 65828, %eax
movl foo+7, %eax
-// addr(0x42) + 7 = = 65772 + 7 = 65779
-// DISASM-NEXT: movl 65779, %eax
+// addr(0x42) + 7 = = 65828 + 7 = 65835
+// DISASM-NEXT: movl 65835, %eax
movl foo+8, %eax
-// addr(0x42) + 8 = = 65772 + 8 = 65780
-// DISASM-NEXT: movl 65780, %eax
+// addr(0x42) + 8 = = 65828 + 8 = 65836
+// DISASM-NEXT: movl 65836, %eax
// From the other file: movl .mysec, %eax
-// addr(0x42) = 65772
-// DISASM-NEXT: movl 65772, %eax
+// addr(0x42) = 65828
+// DISASM-NEXT: movl 65828, %eax
diff --git a/lld/test/elf2/program-header-layout.s b/lld/test/elf2/program-header-layout.s
index 6f1ef3a..f6a752d 100644
--- a/lld/test/elf2/program-header-layout.s
+++ b/lld/test/elf2/program-header-layout.s
@@ -23,7 +23,7 @@
# CHECK-NEXT: SHF_ALLOC
# CHECK-NEXT: ]
# CHECK-NEXT: Address:
-# CHECK-NEXT: Offset: 0x120
+# CHECK-NEXT: Offset: 0x158
# CHECK-NEXT: Size:
# CHECK-NEXT: Link:
# CHECK-NEXT: Info:
@@ -37,8 +37,8 @@
# CHECK-NEXT: Offset: 0x40
# CHECK-NEXT: VirtualAddress: 0x10040
# CHECK-NEXT: PhysicalAddress: 0x10040
-# CHECK-NEXT: FileSize: 224
-# CHECK-NEXT: MemSize: 224
+# CHECK-NEXT: FileSize: 280
+# CHECK-NEXT: MemSize: 280
# CHECK-NEXT: Flags [ (0x4)
# CHECK-NEXT: PF_R (0x4)
# CHECK-NEXT: ]
@@ -49,8 +49,8 @@
# CHECK-NEXT: Offset: 0x0
# CHECK-NEXT: VirtualAddress:
# CHECK-NEXT: PhysicalAddress:
-# CHECK-NEXT: FileSize: 296
-# CHECK-NEXT: MemSize: 296
+# CHECK-NEXT: FileSize: 352
+# CHECK-NEXT: MemSize: 352
# CHECK-NEXT: Flags [
# CHECK-NEXT: PF_R
# CHECK-NEXT: ]
@@ -82,4 +82,17 @@
# CHECK-NEXT: ]
# CHECK-NEXT: Alignment:
# CHECK-NEXT: }
+# CHECK-NEXT: ProgramHeader {
+# CHECK-NEXT: Type: PT_GNU_STACK
+# CHECK-NEXT: Offset: 0x0
+# CHECK-NEXT: VirtualAddress: 0x0
+# CHECK-NEXT: PhysicalAddress: 0x0
+# CHECK-NEXT: FileSize: 0
+# CHECK-NEXT: MemSize: 0
+# CHECK-NEXT: Flags [
+# CHECK-NEXT: PF_R
+# CHECK-NEXT: PF_W
+# CHECK-NEXT: ]
+# CHECK-NEXT: Alignment: 0
+# CHECK-NEXT: }
# CHECK-NEXT: ]
diff --git a/lld/test/elf2/relative-dynamic-reloc-ppc64.s b/lld/test/elf2/relative-dynamic-reloc-ppc64.s
index fcb20ec..d147767 100644
--- a/lld/test/elf2/relative-dynamic-reloc-ppc64.s
+++ b/lld/test/elf2/relative-dynamic-reloc-ppc64.s
@@ -13,7 +13,7 @@
// CHECK-NEXT: 0x10010 R_PPC64_RELATIVE - 0x10009
// CHECK-NEXT: 0x{{.*}} R_PPC64_RELATIVE - 0x[[ZED_ADDR:.*]]
// CHECK-NEXT: 0x{{.*}} R_PPC64_RELATIVE - 0x[[FOO_ADDR]]
-// CHECK-NEXT: 0x160 R_PPC64_ADDR64 external 0x0
+// CHECK-NEXT: 0x198 R_PPC64_ADDR64 external 0x0
// CHECK-NEXT: }
// CHECK-NEXT: ]
diff --git a/lld/test/elf2/relative-dynamic-reloc.s b/lld/test/elf2/relative-dynamic-reloc.s
index 2813769..c38125f 100644
--- a/lld/test/elf2/relative-dynamic-reloc.s
+++ b/lld/test/elf2/relative-dynamic-reloc.s
@@ -12,7 +12,7 @@
// CHECK-NEXT: 0x1010 R_X86_64_RELATIVE - 0x1009
// CHECK-NEXT: 0x{{.*}} R_X86_64_RELATIVE - 0x[[ZED_ADDR:.*]]
// CHECK-NEXT: 0x{{.*}} R_X86_64_RELATIVE - 0x[[FOO_ADDR]]
-// CHECK-NEXT: 0x160 R_X86_64_64 external 0x0
+// CHECK-NEXT: 0x198 R_X86_64_64 external 0x0
// CHECK-NEXT: }
// CHECK-NEXT: ]
diff --git a/lld/test/elf2/relocation-local.s b/lld/test/elf2/relocation-local.s
index dafd62a..58eaf45 100644
--- a/lld/test/elf2/relocation-local.s
+++ b/lld/test/elf2/relocation-local.s
@@ -35,4 +35,4 @@
.quad R_X86_64_64
// CHECK: Contents of section .R_X86_64_64:
-// CHECK-NEXT: 100e8 e8000100 00000000
+// CHECK-NEXT: 10120 20010100 00000000
diff --git a/lld/test/elf2/relocation.s b/lld/test/elf2/relocation.s
index cd60ddc..68680dd 100644
--- a/lld/test/elf2/relocation.s
+++ b/lld/test/elf2/relocation.s
@@ -31,7 +31,7 @@
// SEC-NEXT: EntrySize: 0
// SEC-NEXT: }
-// SEC: Name: .got.plt
+// SEC: Name: .got.plt
// SEC-NEXT: Type: SHT_PROGBITS
// SEC-NEXT: Flags [
// SEC-NEXT: SHF_ALLOC
@@ -104,7 +104,7 @@
.quad R_X86_64_64
// CHECK: Contents of section .R_X86_64_64:
-// CHECK-NEXT: 10158 58010100 00000000
+// CHECK-NEXT: 10190 90010100 00000000
.section .R_X86_64_GOTPCREL,"a",@progbits
.global R_X86_64_GOTPCREL
@@ -114,4 +114,4 @@
// 0x120A8 - 0x10160 = 8008
// 8008 = 0x481f0000 in little endian
// CHECK: Contents of section .R_X86_64_GOTPCREL
-// CHECK-NEXT: 10160 801f0000
+// CHECK-NEXT: 10198 481f0000
diff --git a/lld/test/elf2/shared.s b/lld/test/elf2/shared.s
index 8a28542..a3c9bc5 100644
--- a/lld/test/elf2/shared.s
+++ b/lld/test/elf2/shared.s
@@ -46,7 +46,7 @@
// CHECK-NEXT: SHF_ALLOC
// CHECK-NEXT: ]
// CHECK-NEXT: Address: [[DYNSYMADDR:.*]]
-// CHECK-NEXT: Offset: 0x110
+// CHECK-NEXT: Offset: 0x130
// CHECK-NEXT: Size:
// CHECK-NEXT: Link: [[DYNSTR:.*]]
// CHECK-NEXT: Info: 1
diff --git a/lld/test/elf2/string-table.s b/lld/test/elf2/string-table.s
index 387bed9..2d8b3ac 100644
--- a/lld/test/elf2/string-table.s
+++ b/lld/test/elf2/string-table.s
@@ -19,7 +19,7 @@
// CHECK-NEXT: Flags [
// CHECK-NEXT: SHF_ALLOC
// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x100E8
+// CHECK-NEXT: Address: 0x10120
// CHECK: Name: foobar
// CHECK-NEXT: Type: SHT_PROGBITS
diff --git a/lld/test/elf2/symbols.s b/lld/test/elf2/symbols.s
index dea4c56..9a01df6 100644
--- a/lld/test/elf2/symbols.s
+++ b/lld/test/elf2/symbols.s
@@ -50,7 +50,7 @@
// CHECK-NEXT: Flags [
// CHECK-NEXT: SHF_ALLOC
// CHECK-NEXT: ]
-// CHECK-NEXT: Address: 0x10120
+// CHECK-NEXT: Address: 0x10158
// CHECK: Name: .text
// CHECK-NEXT: Type: SHT_PROGBITS
@@ -82,7 +82,7 @@
// CHECK-NEXT: }
// CHECK-NEXT: Symbol {
// CHECK-NEXT: Name: hidden
-// CHECK-NEXT: Value: 0x10128
+// CHECK-NEXT: Value: 0x10160
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Local
// CHECK-NEXT: Type: None
@@ -91,7 +91,7 @@
// CHECK-NEXT: }
// CHECK-NEXT: Symbol {
// CHECK-NEXT: Name: internal
-// CHECK-NEXT: Value: 0x10128
+// CHECK-NEXT: Value: 0x10160
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Local
// CHECK-NEXT: Type: None
@@ -145,7 +145,7 @@
// CHECK-NEXT: }
// CHECK-NEXT: Symbol {
// CHECK-NEXT: Name: protected
-// CHECK-NEXT: Value: 0x10128
+// CHECK-NEXT: Value: 0x10160
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Global
// CHECK-NEXT: Type: None
@@ -154,7 +154,7 @@
// CHECK-NEXT: }
// CHECK-NEXT: Symbol {
// CHECK-NEXT: Name: zed
-// CHECK-NEXT: Value: 0x10120
+// CHECK-NEXT: Value: 0x10158
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Global (0x1)
// CHECK-NEXT: Type: None
@@ -163,7 +163,7 @@
// CHECK-NEXT: }
// CHECK-NEXT: Symbol {
// CHECK-NEXT: Name: zed2
-// CHECK-NEXT: Value: 0x10124
+// CHECK-NEXT: Value: 0x1015C
// CHECK-NEXT: Size: 0
// CHECK-NEXT: Binding: Global
// CHECK-NEXT: Type: None
@@ -172,7 +172,7 @@
// CHECK-NEXT: }
// CHECK-NEXT: Symbol {
// CHECK-NEXT: Name: zed3
-// CHECK-NEXT: Value: 0x10128
+// CHECK-NEXT: Value: 0x10160
// CHECK-NEXT: Size: 4
// CHECK-NEXT: Binding: Global
// CHECK-NEXT: Type: None
