6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-11-04 06:09:05 +00:00
Code Issues Projects Releases Wiki Activity

Propagate alignment, section name and visibility when linking "appending

Browse Source 
global values".
Fix noinline linkage.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@37482 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Lauro Ramos Venancio 2007-06-06 22:01:12 +00:00
parent 682f683669
commit 9613e871d2
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/Linker/LinkModules.cpp
View File

@ -827,6 +827,18 @@ static bool LinkAppendingVars(Module *M,
return Error(ErrorMsg, return Error(ErrorMsg,
"Appending variables linked with different const'ness!"); "Appending variables linked with different const'ness!");
if (G1->getAlignment() != G2->getAlignment())
return Error(ErrorMsg,
"Appending variables with different alignment need to be linked!");
if (G1->getVisibility() != G2->getVisibility())
return Error(ErrorMsg,
"Appending variables with different visibility need to be linked!");
if (G1->getSection() != G2->getSection())
return Error(ErrorMsg,
"Appending variables with different section name need to be linked!");
unsigned NewSize = T1->getNumElements() + T2->getNumElements(); unsigned NewSize = T1->getNumElements() + T2->getNumElements();
ArrayType *NewType = ArrayType::get(T1->getElementType(), NewSize); ArrayType *NewType = ArrayType::get(T1->getElementType(), NewSize);
@ -837,6 +849,9 @@ static bool LinkAppendingVars(Module *M,
new GlobalVariable(NewType, G1->isConstant(), G1->getLinkage(), new GlobalVariable(NewType, G1->isConstant(), G1->getLinkage(),
/*init*/0, First->first, M, G1->isThreadLocal()); /*init*/0, First->first, M, G1->isThreadLocal());
// Propagate alignment, visibility and section info.
CopyGVAttributes(NG, G1);
// Merge the initializer... // Merge the initializer...
Inits.reserve(NewSize); Inits.reserve(NewSize);
if (ConstantArray *I = dyn_cast<ConstantArray>(G1->getInitializer())) { if (ConstantArray *I = dyn_cast<ConstantArray>(G1->getInitializer())) {