$ svn merge -c 85992 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r85992 into '.':
U gcc/llvm-backend.cpp
U gcc/config/darwin.h
llvm-svn: 85993
diff --git a/llvm-gcc-4.2/gcc/config/darwin.h b/llvm-gcc-4.2/gcc/config/darwin.h
index 8d53630..9b2801a 100644
--- a/llvm-gcc-4.2/gcc/config/darwin.h
+++ b/llvm-gcc-4.2/gcc/config/darwin.h
@@ -698,21 +698,10 @@
char *N = (char *)alloca(strlen(fmt) + 37); \
sprintf(N, fmt, i++); \
GV->setName(N); \
- GV->setAlignment(TARGET_64BIT ? 8 : 4); \
} \
} while (0)
/* LLVM LOCAL - end radar 6389998 */
-/* LLVM LOCAL - begin radar 7291825 */
-/* Give a constant string a sufficient alignment for the platform. */
-#define TARGET_ADJUST_CSTRING_ALIGN(GV) \
- do { \
- if (GV->hasInternalLinkage()) { \
- GV->setAlignment(TARGET_64BIT ? 8 : 4); \
- } \
- } while (0)
-/* LLVM LOCAL - end radar 7291825 */
-
#endif
/* LLVM LOCAL end */
diff --git a/llvm-gcc-4.2/gcc/llvm-backend.cpp b/llvm-gcc-4.2/gcc/llvm-backend.cpp
index 3de829f..8ebaef7 100644
--- a/llvm-gcc-4.2/gcc/llvm-backend.cpp
+++ b/llvm-gcc-4.2/gcc/llvm-backend.cpp
@@ -1415,16 +1415,8 @@
unsigned TargetAlign =
getTargetData().getABITypeAlignment(GV->getType()->getElementType());
if (DECL_USER_ALIGN(decl) ||
- 8 * TargetAlign < (unsigned)DECL_ALIGN(decl)) {
+ 8 * TargetAlign < (unsigned)DECL_ALIGN(decl))
GV->setAlignment(DECL_ALIGN(decl) / 8);
- }
-#ifdef TARGET_ADJUST_CSTRING_ALIGN
- else if (DECL_INITIAL(decl) != error_mark_node && // uninitialized?
- DECL_INITIAL(decl) &&
- TREE_CODE(DECL_INITIAL(decl)) == STRING_CST) {
- TARGET_ADJUST_CSTRING_ALIGN(GV);
- }
-#endif
}
// Handle used decls
