[cfe-commits] r127622 - in /cfe/trunk: lib/CodeGen/CodeGenModule.cpp test/CodeGen/darwin-string-literals.c

[Chris Lattner]

Hi Bill, please pull this into 2.9.  The patch will probably conflict with the change from private -> internal linkage.

-Chris

On Mar 14, 2011, at 2:08 PM, Rafael Espindola wrote:

> Author: rafael
> Date: Mon Mar 14 16:08:19 2011
> New Revision: 127622
> 
> URL: http://llvm.org/viewvc/llvm-project?rev=127622&view=rev
> Log:
> Switch from internal to linker_private linkage, it is sufficient to please the new linker.
> 
> Modified:
>    cfe/trunk/lib/CodeGen/CodeGenModule.cpp
>    cfe/trunk/test/CodeGen/darwin-string-literals.c
> 
> Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=127622&r1=127621&r2=127622&view=diff
> ==============================================================================
> --- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
> +++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Mon Mar 14 16:08:19 2011
> @@ -1672,7 +1672,7 @@
>     // 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::InternalLinkage;
> +    Linkage = llvm::GlobalValue::LinkerPrivateLinkage;
>     isConstant = !Features.WritableStrings;
>   }
> 
> 
> Modified: cfe/trunk/test/CodeGen/darwin-string-literals.c
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/darwin-string-literals.c?rev=127622&r1=127621&r2=127622&view=diff
> ==============================================================================
> --- cfe/trunk/test/CodeGen/darwin-string-literals.c (original)
> +++ cfe/trunk/test/CodeGen/darwin-string-literals.c Mon Mar 14 16:08:19 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 = internal 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 = internal 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";
> 
> 
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits