[llvm-commits] [llvm-gcc-4.2] r66651 - /llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp

[Duncan Sands]

Author: baldrick
Date: Wed Mar 11 03:09:00 2009
New Revision: 66651

URL: http://llvm.org/viewvc/llvm-project?rev=66651&view=rev
Log:
ExternalWeakODRLinkage has been removed since it didn't make
any sense; ExternalWeakAnyLinkage becomes ExternalWeakLinkage.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp?rev=66651&r1=66650&r2=66651&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-backend.cpp Wed Mar 11 03:09:00 2009
@@ -1017,14 +1017,12 @@
     if (!Aliasee) {
       if (lookup_attribute ("weakref", DECL_ATTRIBUTES (decl))) {
         if (GlobalVariable *GV = dyn_cast<GlobalVariable>(V))
-          // The user explicitly asked for weak linkage - ignore flag_odr.
           Aliasee = new GlobalVariable(GV->getType(), GV->isConstant(),
-                                       GlobalVariable::ExternalWeakAnyLinkage,
+                                       GlobalVariable::ExternalWeakLinkage,
                                        NULL, AliaseeName, TheModule);
         else if (Function *F = dyn_cast<Function>(V))
-          // The user explicitly asked for weak linkage - ignore flag_odr.
           Aliasee = Function::Create(F->getFunctionType(),
-                                     Function::ExternalWeakAnyLinkage,
+                                     Function::ExternalWeakLinkage,
                                      AliaseeName, TheModule);
         else
           assert(0 && "Unsuported global value");
@@ -1492,10 +1490,9 @@
       FnEntry->setCallingConv(CC);
       FnEntry->setAttributes(PAL);
 
-      // Check for external weak linkage.  The user may have explicitly asked
-      // for weak linkage - ignore flag_odr.
+      // Check for external weak linkage.
       if (DECL_EXTERNAL(decl) && DECL_WEAK(decl))
-        FnEntry->setLinkage(Function::ExternalWeakAnyLinkage);
+        FnEntry->setLinkage(Function::ExternalWeakLinkage);
 
 #ifdef TARGET_ADJUST_LLVM_LINKAGE
       TARGET_ADJUST_LLVM_LINKAGE(FnEntry,decl);
@@ -1539,10 +1536,9 @@
       GV = new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage, 0,
                               "", TheModule);
 
-      // Check for external weak linkage.  The user may have explicitly asked
-      // for weak linkage - ignore flag_odr.
+      // Check for external weak linkage.
       if (DECL_EXTERNAL(decl) && DECL_WEAK(decl))
-        GV->setLinkage(GlobalValue::ExternalWeakAnyLinkage);
+        GV->setLinkage(GlobalValue::ExternalWeakLinkage);
 
 #ifdef TARGET_ADJUST_LLVM_LINKAGE
       TARGET_ADJUST_LLVM_LINKAGE(GV,decl);
@@ -1558,10 +1554,9 @@
         GV = new GlobalVariable(Ty, false, GlobalValue::ExternalLinkage,0,
                                 Name, TheModule);
 
-        // Check for external weak linkage.  The user may have explicitly asked
-        // for weak linkage - ignore flag_odr.
+        // Check for external weak linkage.
         if (DECL_EXTERNAL(decl) && DECL_WEAK(decl))
-          GV->setLinkage(GlobalValue::ExternalWeakAnyLinkage);
+          GV->setLinkage(GlobalValue::ExternalWeakLinkage);
 
 #ifdef TARGET_ADJUST_LLVM_LINKAGE
         TARGET_ADJUST_LLVM_LINKAGE(GV,decl);
@@ -1647,7 +1642,7 @@
   // The user may have explicitly asked for weak linkage - ignore flag_odr.
   if (GV->hasExternalLinkage()) {
     if (GV->isDeclaration())
-      GV->setLinkage(GlobalValue::ExternalWeakAnyLinkage);
+      GV->setLinkage(GlobalValue::ExternalWeakLinkage);
     else
       GV->setLinkage(GlobalValue::WeakAnyLinkage);
   }