From 557a0b3a9eb727bdedb2b6ebf0908ae311330092 Mon Sep 17 00:00:00 2001 From: Davide Italiano Date: Wed, 26 Jul 2017 01:47:17 +0000 Subject: [PATCH] [gold] Enable data-sections by default for the gold-plugin. Follow up to r309056. llvm-svn: 309075 --- llvm/test/tools/gold/X86/Inputs/multiple-data.ll | 6 +++++ llvm/test/tools/gold/X86/multiple-data.s | 28 ++++++++++++++++++++++++ llvm/tools/gold/gold-plugin.cpp | 3 ++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 llvm/test/tools/gold/X86/Inputs/multiple-data.ll create mode 100644 llvm/test/tools/gold/X86/multiple-data.s diff --git a/llvm/test/tools/gold/X86/Inputs/multiple-data.ll b/llvm/test/tools/gold/X86/Inputs/multiple-data.ll new file mode 100644 index 0000000..57a048d --- /dev/null +++ b/llvm/test/tools/gold/X86/Inputs/multiple-data.ll @@ -0,0 +1,6 @@ +target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" +target triple = "x86_64-unknown-linux-gnu" + +@pat = global i32 33, align 4 +@tin = global i32 33, align 4 +@dipsy = global i32 33, align 4 diff --git a/llvm/test/tools/gold/X86/multiple-data.s b/llvm/test/tools/gold/X86/multiple-data.s new file mode 100644 index 0000000..991554b --- /dev/null +++ b/llvm/test/tools/gold/X86/multiple-data.s @@ -0,0 +1,28 @@ +# RUN: echo ".data.tin" > %t_order_lto.txt +# RUN: echo ".data.dipsy" >> %t_order_lto.txt +# RUN: echo ".data.pat" >> %t_order_lto.txt + +# RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-unknown-linux-gnu +# RUN: llvm-as %p/Inputs/multiple-data.ll -o %t2.o +# RUN: %gold -plugin %llvmshlibdir/LLVMgold.so \ +# RUN: -m elf_x86_64 -o %t.exe %t2.o %t.o \ +# RUN: --section-ordering-file=%t_order_lto.txt +# RUN: llvm-readobj -elf-output-style=GNU -t %t.exe | FileCheck %s + +# CHECK: Symbol table '.symtab' contains 9 entries: +# CHECK-NEXT: Num: Value Size Type Bind Vis Ndx Name +# CHECK-NEXT: 0: 0000000000000000 0 NOTYPE LOCAL DEFAULT UND +# CHECK-NEXT: 1: 0000000000000000 0 FILE LOCAL DEFAULT ABS ld-temp.o +# CHECK-NEXT: 2: 0000000000401104 0 NOTYPE GLOBAL DEFAULT ABS _end +# CHECK-NEXT: 3: 0000000000401104 0 NOTYPE GLOBAL DEFAULT ABS __bss_start +# CHECK-NEXT: 4: 0000000000401104 0 NOTYPE GLOBAL DEFAULT ABS _edata +# CHECK-NEXT: 5: 00000000004000e8 0 NOTYPE GLOBAL DEFAULT 1 _start +# CHECK-NEXT: 6: 00000000004010fc 4 OBJECT GLOBAL DEFAULT 2 dipsy +# CHECK-NEXT: 7: 00000000004010f8 4 OBJECT GLOBAL DEFAULT 2 tin +# CHECK-NEXT: 8: 0000000000401100 4 OBJECT GLOBAL DEFAULT 2 pat + +.globl _start +_start: + movl $pat, %ecx + movl $dipsy, %ebx + movl $tin, %eax diff --git a/llvm/tools/gold/gold-plugin.cpp b/llvm/tools/gold/gold-plugin.cpp index ac99a08..825fff1 100644 --- a/llvm/tools/gold/gold-plugin.cpp +++ b/llvm/tools/gold/gold-plugin.cpp @@ -750,8 +750,9 @@ static std::unique_ptr createLTO() { // FIXME: Check the gold version or add a new option to enable them. Conf.Options.RelaxELFRelocations = false; - // Enable function sections by default. + // Enable function/data sections by default. Conf.Options.FunctionSections = true; + Conf.Options.DataSections = true; Conf.MAttrs = MAttrs; Conf.RelocModel = RelocationModel; -- 2.7.4