commit 4dc2b39bf89d7c87868008ef8a0f807e0419aca6
author Duncan Sands <baldrick@free.fr> Wed Mar 11 20:14:15 2009 +0000
committer Duncan Sands <baldrick@free.fr> Wed Mar 11 20:14:15 2009 +0000
tree 17c5ecc6a7655096a2bff3312b8ca24cca3ebf76
parent 94244f384954f968617040a55e0857bf8c78bb19

It makes no sense to have a ODR version of common
linkage, so remove it.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@66690 91177308-0d34-0410-b5e6-96231b3b80d8

lib/AsmParser/LLLexer.cpp

diff --git a/lib/AsmParser/LLLexer.cpp b/lib/AsmParser/LLLexer.cpp
index d25b001..5a38e60 100644
--- a/lib/AsmParser/LLLexer.cpp
+++ b/lib/AsmParser/LLLexer.cpp
@@ -463,7 +463,6 @@
   KEYWORD(dllimport);
   KEYWORD(dllexport);
   KEYWORD(common);
-  KEYWORD(common_odr);
   KEYWORD(default);
   KEYWORD(hidden);
   KEYWORD(protected);

lib/AsmParser/LLParser.cpp

diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp
index c13c7fc..9d0f24c 100644
--- a/lib/AsmParser/LLParser.cpp
+++ b/lib/AsmParser/LLParser.cpp
@@ -122,7 +122,6 @@
     case lltok::kw_appending:     // OptionalLinkage
     case lltok::kw_dllexport:     // OptionalLinkage
     case lltok::kw_common:        // OptionalLinkage
-    case lltok::kw_common_odr:    // OptionalLinkage
     case lltok::kw_dllimport:     // OptionalLinkage
     case lltok::kw_extern_weak:   // OptionalLinkage
     case lltok::kw_external: {    // OptionalLinkage
@@ -748,7 +747,6 @@
 ///   ::= 'appending'
 ///   ::= 'dllexport'
 ///   ::= 'common'
-///   ::= 'common_odr'
 ///   ::= 'dllimport'
 ///   ::= 'extern_weak'
 ///   ::= 'external'
@@ -764,8 +762,7 @@
   case lltok::kw_linkonce_odr: Res = GlobalValue::LinkOnceODRLinkage; break;
   case lltok::kw_appending:    Res = GlobalValue::AppendingLinkage; break;
   case lltok::kw_dllexport:    Res = GlobalValue::DLLExportLinkage; break;
-  case lltok::kw_common:       Res = GlobalValue::CommonAnyLinkage; break;
-  case lltok::kw_common_odr:   Res = GlobalValue::CommonODRLinkage; break;
+  case lltok::kw_common:       Res = GlobalValue::CommonLinkage; break;
   case lltok::kw_dllimport:    Res = GlobalValue::DLLImportLinkage; break;
   case lltok::kw_extern_weak:  Res = GlobalValue::ExternalWeakLinkage; break;
   case lltok::kw_external:     Res = GlobalValue::ExternalLinkage; break;
@@ -2114,8 +2111,7 @@
     break;
   case GlobalValue::AppendingLinkage:
   case GlobalValue::GhostLinkage:
-  case GlobalValue::CommonAnyLinkage:
-  case GlobalValue::CommonODRLinkage:
+  case GlobalValue::CommonLinkage:
     return Error(LinkageLoc, "invalid function linkage type");
   }
   

lib/AsmParser/LLToken.h

diff --git a/lib/AsmParser/LLToken.h b/lib/AsmParser/LLToken.h
index 35a1bc3..ec3769b 100644
--- a/lib/AsmParser/LLToken.h
+++ b/lib/AsmParser/LLToken.h
@@ -37,7 +37,7 @@
     kw_global,  kw_constant,
 
     kw_private, kw_internal, kw_linkonce, kw_linkonce_odr, kw_weak, kw_weak_odr,
-    kw_appending, kw_dllimport, kw_dllexport, kw_common, kw_common_odr,
+    kw_appending, kw_dllimport, kw_dllexport, kw_common,
     kw_default, kw_hidden, kw_protected,
     kw_extern_weak,
     kw_external, kw_thread_local,