From 0a4671b355d618ed87ad9b785d8c467bc5bd871e Mon Sep 17 00:00:00 2001 From: Bill Wendling Date: Thu, 12 Jul 2018 20:35:58 +0000 Subject: [PATCH] [gold-plugin] Disable section ordering for relocatable links Not all programs want section ordering when compiled with LTO. In particular, the Linux kernel is very sensitive when it comes to linking, and doesn't boot when each function is placed in its own sections. Reviewed By: pcc Differential Revision: https://reviews.llvm.org/D48756 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@336943 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/tools/gold/X86/relocatable.ll | 2 +- tools/gold/gold-plugin.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/tools/gold/X86/relocatable.ll b/test/tools/gold/X86/relocatable.ll index a7cd8f4ac0b..cc4d020a78c 100644 --- a/test/tools/gold/X86/relocatable.ll +++ b/test/tools/gold/X86/relocatable.ll @@ -10,7 +10,7 @@ ; CHECK-NEXT: Binding: Global ; CHECK-NEXT: Type: Function ; CHECK-NEXT: Other: 0 -; CHECK-NEXT: Section: .text.foo +; CHECK-NEXT: Section: .text ; CHECK-NEXT: } target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128" diff --git a/tools/gold/gold-plugin.cpp b/tools/gold/gold-plugin.cpp index 25ba80d2666..6c55ebcddc4 100644 --- a/tools/gold/gold-plugin.cpp +++ b/tools/gold/gold-plugin.cpp @@ -115,6 +115,7 @@ static ld_plugin_add_input_file add_input_file = nullptr; static ld_plugin_set_extra_library_path set_extra_library_path = nullptr; static ld_plugin_get_view get_view = nullptr; static bool IsExecutable = false; +static bool SplitSections = true; static Optional RelocationModel = None; static std::string output_name = ""; static std::list Modules; @@ -324,6 +325,7 @@ ld_plugin_status onload(ld_plugin_tv *tv) { switch (tv->tv_u.tv_val) { case LDPO_REL: // .o IsExecutable = false; + SplitSections = false; break; case LDPO_DYN: // .so IsExecutable = false; @@ -834,9 +836,9 @@ static std::unique_ptr createLTO(IndexWriteCallback OnIndexWrite, // FIXME: Check the gold version or add a new option to enable them. Conf.Options.RelaxELFRelocations = false; - // Enable function/data sections by default. - Conf.Options.FunctionSections = true; - Conf.Options.DataSections = true; + // Toggle function/data sections. + Conf.Options.FunctionSections = SplitSections; + Conf.Options.DataSections = SplitSections; Conf.MAttrs = MAttrs; Conf.RelocModel = RelocationModel; -- 2.50.1