CbC/CbC_llvm: lib/Target/TargetLoweringObjectFile.cpp comparison

comparison lib/Target/TargetLoweringObjectFile.cpp @ 100:7d135dc70f03 LLVM 3.9

LLVM 3.9

author	Miyagi Mitsuki <e135756@ie.u-ryukyu.ac.jp>
date	Tue, 26 Jan 2016 22:53:40 +0900
parents	afa8332a0e37
children	1172e4bd9c6f

comparison

equal deleted inserted replaced

-:6418606d0ead
+:7d135dc70f03
 // a mergable string section, or general .data if it contains relocations.
 if (GVar->isConstant()) {
 // If the initializer for the global contains something that requires a
 // relocation, then we may have to drop this into a writable data section
 // even though it is marked const.
-switch (C->getRelocationInfo()) {
+if (!C->needsRelocation()) {
-case Constant::NoRelocation:
 // If the global is required to have a unique address, it can't be put
 // into a mergable section: just drop it into the general read-only
 // section instead.
 if (!GVar->hasUnnamedAddr())
 return SectionKind::getReadOnly();
 // If initializer is a null-terminated string, put it in a "cstring"
 // section of the right width.
 if (ArrayType *ATy = dyn_cast<ArrayType>(C->getType())) {
 if (IntegerType *ITy =
 dyn_cast<IntegerType>(ATy->getElementType())) {
 case 16: return SectionKind::getMergeableConst16();
 default:
 return SectionKind::getReadOnly();
 }
-case Constant::LocalRelocation:
+} else {
 // In static relocation model, the linker will resolve all addresses, so
 // the relocation entries will actually be constants by the time the app
 // starts up.  However, we can't put this into a mergable section, because
 // the linker doesn't take relocations into consideration when it tries to
 // merge entries in the section.
 if (ReloModel == Reloc::Static)
 return SectionKind::getReadOnly();
 // Otherwise, the dynamic linker needs to fix it up, put it in the
-// writable data.rel.local section.
-return SectionKind::getReadOnlyWithRelLocal();
-case Constant::GlobalRelocations:
-// In static relocation model, the linker will resolve all addresses, so
-// the relocation entries will actually be constants by the time the app
-// starts up.  However, we can't put this into a mergable section, because
-// the linker doesn't take relocations into consideration when it tries to
-// merge entries in the section.
-if (ReloModel == Reloc::Static)
-return SectionKind::getReadOnly();
-// Otherwise, the dynamic linker needs to fix it up, put it in the
 // writable data.rel section.
 return SectionKind::getReadOnlyWithRel();
 }
 }
 // to require a runtime relocation by the dynamic linker, put it into a more
 // specific section to improve startup time of the app.  This coalesces these
 // globals together onto fewer pages, improving the locality of the dynamic
 // linker.
 if (ReloModel == Reloc::Static)
-return SectionKind::getDataNoRel();
+return SectionKind::getData();
-switch (C->getRelocationInfo()) {
+if (C->needsRelocation())
-case Constant::NoRelocation:
+return SectionKind::getData();
-return SectionKind::getDataNoRel();
+return SectionKind::getData();
-case Constant::LocalRelocation:
-return SectionKind::getDataRelLocal();
-case Constant::GlobalRelocations:
-return SectionKind::getDataRel();
-}
-llvm_unreachable("Invalid relocation");
 }
 /// This method computes the appropriate section to emit the specified global
 /// variable or function definition.  This should not be passed external (or
 /// available externally) globals.
 // null return could mean 'no location' & we should just do that here.
 return MCSymbolRefExpr::create(Sym, *Ctx);
 }
 void TargetLoweringObjectFile::getNameWithPrefix(
-SmallVectorImpl<char> &OutName, const GlobalValue *GV,
+SmallVectorImpl<char> &OutName, const GlobalValue *GV, Mangler &Mang,
-bool CannotUsePrivateLabel, Mangler &Mang, const TargetMachine &TM) const {
+const TargetMachine &TM) const {
-Mang.getNameWithPrefix(OutName, GV, CannotUsePrivateLabel);
+Mang.getNameWithPrefix(OutName, GV, /*CannotUsePrivateLabel=*/false);
 }

Mercurial > hg > CbC > CbC_llvm

comparison lib/Target/TargetLoweringObjectFile.cpp @ 100:7d135dc70f03 LLVM 3.9