[llvm-commits] [llvm] r102359 - in /llvm/trunk: lib/CodeGen/AsmPrinter/AsmPrinter.cpp test/CodeGen/X86/alignment.ll test/CodeGen/X86/unaligned-load.ll test/FrontendC/cstring-align.c

[Chris Lattner]

Author: lattner
Date: Mon Apr 26 13:30:45 2010
New Revision: 102359

URL: http://llvm.org/viewvc/llvm-project?rev=102359&view=rev
Log:
Revert r102300/102301, which serious broke objc apps.

Removed:
    llvm/trunk/test/CodeGen/X86/alignment.ll
Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
    llvm/trunk/test/CodeGen/X86/unaligned-load.ll
    llvm/trunk/test/FrontendC/cstring-align.c

Modified: llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp?rev=102359&r1=102358&r2=102359&view=diff
==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter/AsmPrinter.cpp Mon Apr 26 13:30:45 2010
@@ -285,7 +285,7 @@
   OutStreamer.SwitchSection(TheSection);
 
   EmitLinkage(GV->getLinkage(), GVSym);
-  EmitAlignment(AlignLog, GV, AlignLog);
+  EmitAlignment(AlignLog, GV);
 
   if (isVerbose()) {
     WriteAsOperand(OutStreamer.GetCommentOS(), GV,
@@ -987,7 +987,7 @@
   unsigned Align = Log2_32(TD->getPointerPrefAlignment());
   if (GV->getName() == "llvm.global_ctors") {
     OutStreamer.SwitchSection(getObjFileLowering().getStaticCtorSection());
-    EmitAlignment(Align);
+    EmitAlignment(Align, 0);
     EmitXXStructorList(GV->getInitializer());
     
     if (TM.getRelocationModel() == Reloc::Static &&
@@ -1001,7 +1001,7 @@
   
   if (GV->getName() == "llvm.global_dtors") {
     OutStreamer.SwitchSection(getObjFileLowering().getStaticDtorSection());
-    EmitAlignment(Align);
+    EmitAlignment(Align, 0);
     EmitXXStructorList(GV->getInitializer());
 
     if (TM.getRelocationModel() == Reloc::Static &&

Removed: llvm/trunk/test/CodeGen/X86/alignment.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/alignment.ll?rev=102358&view=auto
==============================================================================
--- llvm/trunk/test/CodeGen/X86/alignment.ll (original)
+++ llvm/trunk/test/CodeGen/X86/alignment.ll (removed)
@@ -1,16 +0,0 @@
-; RUN: llc %s -o - -mtriple=x86_64-linux-gnu | FileCheck %s
-
-; This can get rounded up to the preferred alignment (16).
-; PR6921
- at GlobalA = global { [384 x i8] } zeroinitializer, align 8 
-
-; CHECK:	.bss
-; CHECK:	.globl	GlobalA
-; CHECK:	.align	16
-; CHECK: GlobalA:
-; CHECK:	.zero	384
-
-; Common variables should also get rounded up to the preferred alignment (16).
- at GlobalB = common global { [384 x i8] } zeroinitializer, align 8
-
-; CHECK: 	.comm	GlobalB,384,16 
\ No newline at end of file

Modified: llvm/trunk/test/CodeGen/X86/unaligned-load.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/unaligned-load.ll?rev=102359&r1=102358&r2=102359&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/unaligned-load.ll (original)
+++ llvm/trunk/test/CodeGen/X86/unaligned-load.ll Mon Apr 26 13:30:45 2010
@@ -28,9 +28,8 @@
 
 declare void @llvm.memcpy.i64(i8* nocapture, i8* nocapture, i64, i32) nounwind
 
-; CORE2: .section
-; CORE2: .align  4
+; CORE2: .align  3
 ; CORE2-NEXT: _.str1:
 ; CORE2-NEXT: .asciz "DHRYSTONE PROGRAM, SOME STRING"
-; CORE2: .align 4
+; CORE2: .align 3
 ; CORE2-NEXT: _.str3:

Modified: llvm/trunk/test/FrontendC/cstring-align.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC/cstring-align.c?rev=102359&r1=102358&r2=102359&view=diff
==============================================================================
--- llvm/trunk/test/FrontendC/cstring-align.c (original)
+++ llvm/trunk/test/FrontendC/cstring-align.c Mon Apr 26 13:30:45 2010
@@ -1,5 +1,6 @@
 // RUN: %llvmgcc %s -c -Os -m32 -emit-llvm -o - | llc -march=x86 -mtriple=i386-apple-darwin10 | FileCheck %s -check-prefix=DARWIN32
 // RUN: %llvmgcc %s -c -Os -m64 -emit-llvm -o - | llc -march=x86-64 -mtriple=x86_64-apple-darwin10 | FileCheck %s -check-prefix=DARWIN64
+// XFAIL: *
 // XTARGET: darwin
 
 extern void func(const char *, const char *);
@@ -8,10 +9,10 @@
   func("%s: the function name", __func__);
 }
 
-// DARWIN64: .align 4
+// DARWIN64: .align 3
 // DARWIN64: ___func__.
 // DARWIN64: .asciz "long_function_name"
 
-// DARWIN32: .align 4
+// DARWIN32: .align 2
 // DARWIN32: ___func__.
 // DARWIN32: .asciz "long_function_name"