mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-06-25 16:24:23 +00:00
when linking globals, make sure to preserve the address space of the global.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@52810 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
@ -575,7 +575,8 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
|
||||
GlobalVariable *NewDGV =
|
||||
new GlobalVariable(SGV->getType()->getElementType(),
|
||||
SGV->isConstant(), SGV->getLinkage(), /*init*/0,
|
||||
SGV->getName(), Dest);
|
||||
SGV->getName(), Dest, false,
|
||||
SGV->getType()->getAddressSpace());
|
||||
// Propagate alignment, visibility and section info.
|
||||
CopyGVAttributes(NewDGV, SGV);
|
||||
|
||||
@ -599,7 +600,8 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
|
||||
GlobalVariable *NewDGV =
|
||||
new GlobalVariable(SGV->getType()->getElementType(),
|
||||
SGV->isConstant(), SGV->getLinkage(), /*init*/0,
|
||||
"", Dest);
|
||||
"", Dest, false,
|
||||
SGV->getType()->getAddressSpace());
|
||||
|
||||
// Set alignment allowing CopyGVAttributes merge it with alignment of SGV.
|
||||
NewDGV->setAlignment(DGV->getAlignment());
|
||||
@ -634,7 +636,8 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
|
||||
GlobalVariable *NewDGV =
|
||||
new GlobalVariable(SGV->getType()->getElementType(),
|
||||
DGVar->isConstant(), DGVar->getLinkage(),
|
||||
/*init*/0, DGVar->getName(), Dest);
|
||||
/*init*/0, DGVar->getName(), Dest, false,
|
||||
SGV->getType()->getAddressSpace());
|
||||
CopyGVAttributes(NewDGV, DGVar);
|
||||
DGV->replaceAllUsesWith(ConstantExpr::getBitCast(NewDGV,
|
||||
DGVar->getType()));
|
||||
@ -1166,7 +1169,8 @@ static bool LinkAppendingVars(Module *M,
|
||||
// Create the new global variable...
|
||||
GlobalVariable *NG =
|
||||
new GlobalVariable(NewType, G1->isConstant(), G1->getLinkage(),
|
||||
/*init*/0, First->first, M, G1->isThreadLocal());
|
||||
/*init*/0, First->first, M, G1->isThreadLocal(),
|
||||
G1->getType()->getAddressSpace());
|
||||
|
||||
// Propagate alignment, visibility and section info.
|
||||
CopyGVAttributes(NG, G1);
|
||||
|
Reference in New Issue
Block a user