diff options
| -rw-r--r-- | llvm/lib/Target/PowerPC/PPCTargetObjectFile.cpp | 22 | ||||
| -rw-r--r-- | llvm/test/CodeGen/PowerPC/vtable-reloc.ll | 11 |
2 files changed, 20 insertions, 13 deletions
diff --git a/llvm/lib/Target/PowerPC/PPCTargetObjectFile.cpp b/llvm/lib/Target/PowerPC/PPCTargetObjectFile.cpp index 2e8605c15ef..2903cc192aa 100644 --- a/llvm/lib/Target/PowerPC/PPCTargetObjectFile.cpp +++ b/llvm/lib/Target/PowerPC/PPCTargetObjectFile.cpp @@ -25,13 +25,6 @@ Initialize(MCContext &Ctx, const TargetMachine &TM) { const MCSection *PPC64LinuxTargetObjectFile::SelectSectionForGlobal( const GlobalValue *GV, SectionKind Kind, Mangler &Mang, const TargetMachine &TM) const { - - const MCSection *DefaultSection = - TargetLoweringObjectFileELF::SelectSectionForGlobal(GV, Kind, Mang, TM); - - if (DefaultSection != ReadOnlySection) - return DefaultSection; - // Here override ReadOnlySection to DataRelROSection for PPC64 SVR4 ABI // when we have a constant that contains global relocations. This is // necessary because of this ABI's handling of pointers to functions in @@ -46,14 +39,17 @@ const MCSection *PPC64LinuxTargetObjectFile::SelectSectionForGlobal( // linker, so we must use DataRelROSection instead of ReadOnlySection. // For more information, see the description of ELIMINATE_COPY_RELOCS in // GNU ld. - const GlobalVariable *GVar = dyn_cast<GlobalVariable>(GV); + if (Kind.isReadOnly()) { + const GlobalVariable *GVar = dyn_cast<GlobalVariable>(GV); - if (GVar && GVar->isConstant() && - (GVar->getInitializer()->getRelocationInfo() == - Constant::GlobalRelocations)) - return DataRelROSection; + if (GVar && GVar->isConstant() && + (GVar->getInitializer()->getRelocationInfo() == + Constant::GlobalRelocations)) + Kind = SectionKind::getReadOnlyWithRel(); + } - return DefaultSection; + return TargetLoweringObjectFileELF::SelectSectionForGlobal(GV, Kind, + Mang, TM); } const MCExpr *PPC64LinuxTargetObjectFile:: diff --git a/llvm/test/CodeGen/PowerPC/vtable-reloc.ll b/llvm/test/CodeGen/PowerPC/vtable-reloc.ll new file mode 100644 index 00000000000..995a5d03ba5 --- /dev/null +++ b/llvm/test/CodeGen/PowerPC/vtable-reloc.ll @@ -0,0 +1,11 @@ +; RUN: llc -O0 < %s | FileCheck %s + +target datalayout = "E-m:e-i64:64-n32:64" +target triple = "powerpc64-unknown-linux-gnu" + +@_ZTV3foo = linkonce_odr unnamed_addr constant [1 x i8*] [i8* bitcast (void ()* @__cxa_pure_virtual to i8*)] +declare void @__cxa_pure_virtual() + +; CHECK: .section .data.rel.ro +; CHECK: .quad __cxa_pure_virtual + |
