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

[Bill Wendling]

Author: void
Date: Fri Feb 27 00:13:31 2009
New Revision: 65617

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

Try, again, to send STRING_CSTs to the cstring section.  This is a
followup to r65490.  Darwin-specific.

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=65617&r1=65616&r2=65617&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 00:13:31 2009
@@ -679,6 +679,8 @@
   } while (0)
 /* LLVM LOCAL - end radar 6389998 */
 
+/* Assign STRING_CSTs to the .cstring section.  */
+#define LLVM_DARWIN_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=65617&r1=65616&r2=65617&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 00:13:31 2009
@@ -7346,6 +7346,11 @@
                                             TAI->getStringConstantPrefix() : 
                                             ".str", TheModule);
   if (SlotP) *SlotP = GV;
+#ifdef LLVM_DARWIN_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);
+#endif
   return GV;
 }