[llvm-commits] [llvm-gcc-4.2] r65660 - in /llvm-gcc-4.2/branches/Apple/Dib/gcc: config/darwin.h llvm-convert.cpp

[Bill Wendling]

Author: void
Date: Fri Feb 27 17:31:00 2009
New Revision: 65660

URL: http://llvm.org/viewvc/llvm-project?rev=65660&view=rev
Log:
Merge r65654 into Dib:

Per Chris, shorten LLVM_DARWIN_CSTRING_SECTION to LLVM_CSTRING_SECTION
for portability.

Modified:
    llvm-gcc-4.2/branches/Apple/Dib/gcc/config/darwin.h
    llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/config/darwin.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/config/darwin.h?rev=65660&r1=65659&r2=65660&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/config/darwin.h (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/config/darwin.h Fri Feb 27 17:31:00 2009
@@ -680,7 +680,7 @@
 /* LLVM LOCAL - end radar 6389998 */
 
 /* Assign STRING_CSTs to the .cstring section.  */
-#define LLVM_DARWIN_CSTRING_SECTION "__TEXT,__cstring,cstring_literals"
+#define LLVM_CSTRING_SECTION "__TEXT,__cstring,cstring_literals"
 #endif
 /* LLVM LOCAL end */
 

Modified: llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp?rev=65660&r1=65659&r2=65660&view=diff

==============================================================================
--- llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Dib/gcc/llvm-convert.cpp Fri Feb 27 17:31:00 2009
@@ -7346,10 +7346,10 @@
                                             TAI->getStringConstantPrefix() : 
                                             ".str", TheModule);
   if (SlotP) *SlotP = GV;
-#ifdef LLVM_DARWIN_CSTRING_SECTION
+#ifdef LLVM_CSTRING_SECTION
   // For Darwin, try to put it into the .cstring section.
   if (TAI && TAI->SectionKindForGlobal(GV) == SectionKind::RODataMergeStr)
-    GV->setSection(LLVM_DARWIN_CSTRING_SECTION);
+    GV->setSection(LLVM_CSTRING_SECTION);
 #endif
   return GV;
 }