nicolas/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't try to generate common globals for C++ files, instead of depending on the FE to set NoCommon, and simplify CodeGenOptions initialization.

Browse Source 
llvm-svn: 90119
This commit is contained in:
Daniel Dunbar
2009-11-30 08:40:34 +00:00
parent 8e70505692
commit 2c11cd156e
3 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clang/lib/CodeGen/CodeGenModule.cpp
View File

@@ -973,7 +973,7 @@ void CodeGenModule::EmitGlobalVarDefinition(const VarDecl *D) {
GV->setLinkage(llvm::GlobalVariable::WeakAnyLinkage); GV->setLinkage(llvm::GlobalVariable::WeakAnyLinkage);
} else if (Linkage == GVA_TemplateInstantiation) } else if (Linkage == GVA_TemplateInstantiation)
GV->setLinkage(llvm::GlobalVariable::WeakAnyLinkage); GV->setLinkage(llvm::GlobalVariable::WeakAnyLinkage);
else if (!CodeGenOpts.NoCommon && else if (!getLangOptions().CPlusPlus && !CodeGenOpts.NoCommon &&
!D->hasExternalStorage() && !D->getInit() && !D->hasExternalStorage() && !D->getInit() &&
!D->getAttr<SectionAttr>()) { !D->getAttr<SectionAttr>()) {
GV->setLinkage(llvm::GlobalVariable::CommonLinkage); GV->setLinkage(llvm::GlobalVariable::CommonLinkage);

5
clang/lib/Driver/CC1Options.cpp
View File

@@ -190,11 +190,6 @@ static void ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args,
Opts.MainFileName = getLastArgValue(Args, OPT_main_file_name); Opts.MainFileName = getLastArgValue(Args, OPT_main_file_name);
// FIXME: Implement!
// FIXME: Eliminate this dependency?
// if (Lang.CPlusPlus)
// Opts.NoCommon = 1;
// FIXME: Put elsewhere? // FIXME: Put elsewhere?
#ifdef NDEBUG #ifdef NDEBUG
Opts.VerifyModule = 0; Opts.VerifyModule = 0;

4
clang/tools/clang-cc/Options.cpp
View File

@@ -826,10 +826,6 @@ void clang::InitializeCodeGenOptions(CodeGenOptions &Opts,
Opts.UnwindTables = MUnwindTables; Opts.UnwindTables = MUnwindTables;
Opts.RelocationModel = MRelocationModel; Opts.RelocationModel = MRelocationModel;
// FIXME: Eliminate this dependency?
if (Lang.CPlusPlus)
Opts.NoCommon = 1;
#ifdef NDEBUG #ifdef NDEBUG
Opts.VerifyModule = 0; Opts.VerifyModule = 0;
#endif #endif