Merge r65654 into Dib:
Per Chris, shorten LLVM_DARWIN_CSTRING_SECTION to LLVM_CSTRING_SECTION
for portability.
llvm-svn: 65660
diff --git a/llvm-gcc-4.2/gcc/config/darwin.h b/llvm-gcc-4.2/gcc/config/darwin.h
index 7c67b74..fa93895 100644
--- a/llvm-gcc-4.2/gcc/config/darwin.h
+++ b/llvm-gcc-4.2/gcc/config/darwin.h
@@ -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 */
diff --git a/llvm-gcc-4.2/gcc/llvm-convert.cpp b/llvm-gcc-4.2/gcc/llvm-convert.cpp
index 8110a78..32b6d0c 100644
--- a/llvm-gcc-4.2/gcc/llvm-convert.cpp
+++ b/llvm-gcc-4.2/gcc/llvm-convert.cpp
@@ -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;
}