[llvm-commits] [dragonegg] r88778 - in /dragonegg/trunk: darwin/llvm-os.h llvm-backend.cpp

[Duncan Sands]

Author: baldrick
Date: Sat Nov 14 05:22:14 2009
New Revision: 88778

URL: http://llvm.org/viewvc/llvm-project?rev=88778&view=rev
Log:
Port commit 85992 (void) from llvm-gcc:
Reverting r84717. fldry is generating aligned loads of strings. It requires the
strings to be 16-byte aligned, which this breaks.

Modified:
    dragonegg/trunk/darwin/llvm-os.h
    dragonegg/trunk/llvm-backend.cpp

Modified: dragonegg/trunk/darwin/llvm-os.h
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/darwin/llvm-os.h?rev=88778&r1=88777&r2=88778&view=diff

==============================================================================
--- dragonegg/trunk/darwin/llvm-os.h (original)
+++ dragonegg/trunk/darwin/llvm-os.h Sat Nov 14 05:22:14 2009
@@ -42,12 +42,4 @@
     argvec.push_back ("--relocation-model=static")
 #endif /* !TARGET_386 && !TARGET_ARM */
 
-/* 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)
-
 #endif /* LLVM_OS_H */

Modified: dragonegg/trunk/llvm-backend.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/trunk/llvm-backend.cpp?rev=88778&r1=88777&r2=88778&view=diff

==============================================================================
--- dragonegg/trunk/llvm-backend.cpp (original)
+++ dragonegg/trunk/llvm-backend.cpp Sat Nov 14 05:22:14 2009
@@ -1210,16 +1210,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