6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix message to make more sense and confuse Chris less

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@9354 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-10-21 21:52:20 +00:00
parent db15798e2e
commit f85770c9a6
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Linker/LinkModules.cpp
View File

@ -463,11 +463,16 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
"' have different linkage specifiers!");
} else if (SGV->hasExternalLinkage()) {
// Allow linking two exactly identical external global variables...
if (SGV->isConstant() != DGV->isConstant() ||
SGV->getInitializer() != DGV->getInitializer())
if (SGV->isConstant() != DGV->isConstant())
return Error(Err, "Global Variable Collision on '" +
SGV->getType()->getDescription() + " %" + SGV->getName() +
"' - Global variables differ in const'ness");
if (SGV->getInitializer() != DGV->getInitializer())
return Error(Err, "Global Variable Collision on '" +
SGV->getType()->getDescription() + " %" + SGV->getName() +
"' - External linkage globals have different initializers");
ValueMap.insert(std::make_pair(SGV, DGV));
} else if (SGV->hasLinkOnceLinkage()) {
// If the global variable has a name, and that name is already in use in

9
lib/Transforms/Utils/Linker.cpp
View File

@ -463,11 +463,16 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
"' have different linkage specifiers!");
} else if (SGV->hasExternalLinkage()) {
// Allow linking two exactly identical external global variables...
if (SGV->isConstant() != DGV->isConstant() ||
SGV->getInitializer() != DGV->getInitializer())
if (SGV->isConstant() != DGV->isConstant())
return Error(Err, "Global Variable Collision on '" +
SGV->getType()->getDescription() + " %" + SGV->getName() +
"' - Global variables differ in const'ness");
if (SGV->getInitializer() != DGV->getInitializer())
return Error(Err, "Global Variable Collision on '" +
SGV->getType()->getDescription() + " %" + SGV->getName() +
"' - External linkage globals have different initializers");
ValueMap.insert(std::make_pair(SGV, DGV));
} else if (SGV->hasLinkOnceLinkage()) {
// If the global variable has a name, and that name is already in use in

9
lib/VMCore/Linker.cpp
View File

@ -463,11 +463,16 @@ static bool LinkGlobals(Module *Dest, const Module *Src,
"' have different linkage specifiers!");
} else if (SGV->hasExternalLinkage()) {
// Allow linking two exactly identical external global variables...
if (SGV->isConstant() != DGV->isConstant() ||
SGV->getInitializer() != DGV->getInitializer())
if (SGV->isConstant() != DGV->isConstant())
return Error(Err, "Global Variable Collision on '" +
SGV->getType()->getDescription() + " %" + SGV->getName() +
"' - Global variables differ in const'ness");
if (SGV->getInitializer() != DGV->getInitializer())
return Error(Err, "Global Variable Collision on '" +
SGV->getType()->getDescription() + " %" + SGV->getName() +
"' - External linkage globals have different initializers");
ValueMap.insert(std::make_pair(SGV, DGV));
} else if (SGV->hasLinkOnceLinkage()) {
// If the global variable has a name, and that name is already in use in