[llvm-branch-commits] [cfe-branch] r128025 - in /cfe/branches/release_29: ./ lib/CodeGen/CodeGenModule.cpp test/CodeGen/darwin-string-literals.c test/SemaCXX/warn-unreachable.cpp

[Bill Wendling]

Author: void
Date: Mon Mar 21 16:30:43 2011
New Revision: 128025

URL: http://llvm.org/viewvc/llvm-project?rev=128025&view=rev
Log:
--- Merging r127622 into '.':
U    test/CodeGen/darwin-string-literals.c
U    lib/CodeGen/CodeGenModule.cpp


Modified:
    cfe/branches/release_29/   (props changed)
    cfe/branches/release_29/lib/CodeGen/CodeGenModule.cpp
    cfe/branches/release_29/test/CodeGen/darwin-string-literals.c
    cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp   (props changed)

Propchange: cfe/branches/release_29/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 21 16:30:43 2011
@@ -1,2 +1,2 @@
-/cfe/trunk:127283,127308,127326,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127623,127737-127738,127806,127980
+/cfe/trunk:127283,127308,127326,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127737-127738,127806,127980
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_29/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/lib/CodeGen/CodeGenModule.cpp?rev=128025&r1=128024&r2=128025&view=diff
==============================================================================
--- cfe/branches/release_29/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/branches/release_29/lib/CodeGen/CodeGenModule.cpp Mon Mar 21 16:30:43 2011
@@ -1662,7 +1662,10 @@
     // does make plain ascii ones writable.
     isConstant = true;
   } else {
-    Linkage = llvm::GlobalValue::PrivateLinkage;
+    // FIXME: With OS X ld 123.2 (xcode 4) and LTO we would get a linker error
+    // when using private linkage. It is not clear if this is a bug in ld
+    // or a reasonable new restriction.
+    Linkage = llvm::GlobalValue::LinkerPrivateLinkage;
     isConstant = !Features.WritableStrings;
   }
   

Modified: cfe/branches/release_29/test/CodeGen/darwin-string-literals.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_29/test/CodeGen/darwin-string-literals.c?rev=128025&r1=128024&r2=128025&view=diff
==============================================================================
--- cfe/branches/release_29/test/CodeGen/darwin-string-literals.c (original)
+++ cfe/branches/release_29/test/CodeGen/darwin-string-literals.c Mon Mar 21 16:30:43 2011
@@ -1,13 +1,13 @@
 // RUN: %clang_cc1 -triple i386-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix LSB %s
 
 // CHECK-LSB: @.str = private unnamed_addr constant [8 x i8] c"string0\00"
-// CHECK-LSB: @.str1 = private unnamed_addr constant [8 x i8] c"string1\00"
+// CHECK-LSB: @.str1 = linker_private unnamed_addr constant [8 x i8] c"string1\00"
 // CHECK-LSB: @.str2 = internal unnamed_addr constant [36 x i8] c"h\00e\00l\00l\00o\00 \00\92! \00\03& \00\90! \00w\00o\00r\00l\00d\00\00\00", align 2
 
 // RUN: %clang_cc1 -triple powerpc-apple-darwin9 -emit-llvm %s -o - | FileCheck -check-prefix MSB %s
 
 // CHECK-MSB: @.str = private unnamed_addr constant [8 x i8] c"string0\00"
-// CHECK-MSB: @.str1 = private unnamed_addr constant [8 x i8] c"string1\00"
+// CHECK-MSB: @.str1 = linker_private unnamed_addr constant [8 x i8] c"string1\00"
 // CHECK-MSB: @.str2 = internal unnamed_addr constant [36 x i8] c"\00h\00e\00l\00l\00o\00 !\92\00 &\03\00 !\90\00 \00w\00o\00r\00l\00d\00\00", align 2
 
 const char *g0 = "string0";

Propchange: cfe/branches/release_29/test/SemaCXX/warn-unreachable.cpp
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 21 16:30:43 2011
@@ -1 +1 @@
-/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127283,127308,127326,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127623,127737-127738,127806,127980
+/cfe/trunk/test/SemaCXX/warn-unreachable.cpp:121961,127283,127308,127326,127373,127405,127460,127507,127512,127541,127543,127563,127580,127582-127583,127622-127623,127737-127738,127806,127980