diff options
| -rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 13 | ||||
| -rw-r--r-- | clang/test/CodeGen/xcore-abi.cpp | 27 |
2 files changed, 34 insertions, 6 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 11f69cc0fce..785c04cb390 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -1607,17 +1607,18 @@ CodeGenModule::GetOrCreateLLVMGlobal(StringRef MangledName, if (getCXXABI().isInlineInitializedStaticDataMemberLinkOnce() && isVarDeclInlineInitializedStaticDataMember(D)) EmitGlobalVarDefinition(D); + + // Handle XCore specific ABI requirements. + if (getTarget().getTriple().getArch() == llvm::Triple::xcore && + D->getLanguageLinkage() == CLanguageLinkage && + D->getType().isConstant(Context) && + isExternallyVisible(D->getLinkageAndVisibility().getLinkage())) + GV->setSection(".cp.rodata"); } if (AddrSpace != Ty->getAddressSpace()) return llvm::ConstantExpr::getAddrSpaceCast(GV, Ty); - if (getTarget().getTriple().getArch() == llvm::Triple::xcore && - D->getLanguageLinkage() == CLanguageLinkage && - D->getType().isConstant(Context) && - isExternallyVisible(D->getLinkageAndVisibility().getLinkage())) - GV->setSection(".cp.rodata"); - getTargetCodeGenInfo().emitTargetMD(D, GV, *this); return GV; diff --git a/clang/test/CodeGen/xcore-abi.cpp b/clang/test/CodeGen/xcore-abi.cpp new file mode 100644 index 00000000000..fbf31ff50aa --- /dev/null +++ b/clang/test/CodeGen/xcore-abi.cpp @@ -0,0 +1,27 @@ +// REQUIRES: xcore-registered-target + +// RUN: %clang_cc1 -triple xcore-unknown-unknown -fno-signed-char -fno-common -emit-llvm -o - -x c++ %s | FileCheck %s + +// CHECK: target triple = "xcore-unknown-unknown" + + +// C++ constants are not placed into the ".cp.rodata" section. +// CHECK: @cgx = external constant i32 +extern const int cgx; +int fcgx() { return cgx;} +// CHECK: @g1 = global i32 0, align 4 +int g1; +// CHECK: @cg1 = constant i32 0, align 4 +extern const int cg1 = 0; + +// Regression test for a bug in lib/CodeGen/CodeGenModule.cpp which called +// getLanguageLinkage() via a null 'VarDecl*'. This was an XCore specific +// conditional call to GV->setSection(".cp.rodata"). +class C { +public: + ~C(){}; +}; +C c; + +// CHECK: "no-frame-pointer-elim"="false" +// CHECK-NOT: "no-frame-pointer-elim-non-leaf" |
