aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Osborne <richard@xmos.com>2009-08-18 21:14:31 +0000
committerRichard Osborne <richard@xmos.com>2009-08-18 21:14:31 +0000
commit1123135dbfa776bbe4c2120a16098d81e0850a76 (patch)
treedd62ebff8682c94a35a553a091f474f27af27973
parent3731604f1f73cb29a9554660b27aecba1c5c032b (diff)
Add support for mergeable sections back into the XCore backend.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79368 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Target/XCore/XCoreTargetObjectFile.cpp23
-rw-r--r--test/CodeGen/XCore/constants.ll2
-rw-r--r--test/CodeGen/XCore/globals.ll2
3 files changed, 20 insertions, 7 deletions
diff --git a/lib/Target/XCore/XCoreTargetObjectFile.cpp b/lib/Target/XCore/XCoreTargetObjectFile.cpp
index 91cb11533d..c1990d6d0f 100644
--- a/lib/Target/XCore/XCoreTargetObjectFile.cpp
+++ b/lib/Target/XCore/XCoreTargetObjectFile.cpp
@@ -28,11 +28,24 @@ void XCoreTargetObjectFile::Initialize(MCContext &Ctx, const TargetMachine &TM){
MCSectionXCore::SHF_DP_SECTION,
SectionKind::getBSS(), false, getContext());
- // For now, disable lowering of mergable sections, just drop everything into
- // ReadOnly.
- MergeableConst4Section = 0;
- MergeableConst8Section = 0;
- MergeableConst16Section = 0;
+ MergeableConst4Section =
+ MCSectionXCore::Create(".cp.rodata.cst4", MCSectionELF::SHT_PROGBITS,
+ MCSectionELF::SHF_ALLOC | MCSectionELF::SHF_MERGE |
+ MCSectionXCore::SHF_CP_SECTION,
+ SectionKind::getMergeableConst4(), false,
+ getContext());
+ MergeableConst8Section =
+ MCSectionXCore::Create(".cp.rodata.cst8", MCSectionELF::SHT_PROGBITS,
+ MCSectionELF::SHF_ALLOC | MCSectionELF::SHF_MERGE |
+ MCSectionXCore::SHF_CP_SECTION,
+ SectionKind::getMergeableConst8(), false,
+ getContext());
+ MergeableConst16Section =
+ MCSectionXCore::Create(".cp.rodata.cst16", MCSectionELF::SHT_PROGBITS,
+ MCSectionELF::SHF_ALLOC | MCSectionELF::SHF_MERGE |
+ MCSectionXCore::SHF_CP_SECTION,
+ SectionKind::getMergeableConst16(), false,
+ getContext());
// TLS globals are lowered in the backend to arrays indexed by the current
// thread id. After lowering they require no special handling by the linker
diff --git a/test/CodeGen/XCore/constants.ll b/test/CodeGen/XCore/constants.ll
index 2aee6a26c4..8ba8b5c6a7 100644
--- a/test/CodeGen/XCore/constants.ll
+++ b/test/CodeGen/XCore/constants.ll
@@ -1,6 +1,6 @@
; RUN: llvm-as < %s | llc -march=xcore -mcpu=xs1b-generic | FileCheck %s
-; CHECK: .section .cp.rodata,"ac",@progbits
+; CHECK: .section .cp.rodata.cst4,"aMc",@progbits,4
; CHECK: .LCPI1_0:
; CHECK: .long 12345678
; CHECK: f:
diff --git a/test/CodeGen/XCore/globals.ll b/test/CodeGen/XCore/globals.ll
index 8cb2ef3669..9bc0f53de7 100644
--- a/test/CodeGen/XCore/globals.ll
+++ b/test/CodeGen/XCore/globals.ll
@@ -68,7 +68,7 @@ entry:
; CHECK: G2:
@G3 = constant i32 9401
-; CHECK: .section .cp.rodata,"ac",@progbits
+; CHECK: .section .cp.rodata.cst4,"aMc",@progbits,4
; CHECK: G3:
@G4 = global i32* @G1