[llvm-branch-commits] [cfe-branch] r73447 - in /cfe/branches/Apple/Dib: lib/Basic/Targets.cpp test/CodeGen/target-data.c

[Daniel Dunbar]

Author: ddunbar
Date: Mon Jun 15 18:59:37 2009
New Revision: 73447

URL: http://llvm.org/viewvc/llvm-project?rev=73447&view=rev
Log:
Merge in 73093:

------------------------------------------------------------------------
r73093 | ddunbar | 2009-06-08 15:39:13 -0700 (Mon, 08 Jun 2009) | 4 lines

Add stack alignment to x86_64 target data.
 - <rdar://problem/6948443> WARNING: Linking two modules of different data
   layouts!

------------------------------------------------------------------------

Added:
    cfe/branches/Apple/Dib/test/CodeGen/target-data.c
Modified:
    cfe/branches/Apple/Dib/lib/Basic/Targets.cpp

Modified: cfe/branches/Apple/Dib/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/lib/Basic/Targets.cpp?rev=73447&r1=73446&r2=73447&view=diff

==============================================================================
--- cfe/branches/Apple/Dib/lib/Basic/Targets.cpp (original)
+++ cfe/branches/Apple/Dib/lib/Basic/Targets.cpp Mon Jun 15 18:59:37 2009
@@ -924,7 +924,7 @@
 
     DescriptionString = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-"
                         "i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-"
-                        "a0:0:64-f80:128:128";
+                        "a0:0:64-s0:64:64-f80:128:128";
   }
   virtual const char *getVAListDeclaration() const {
     return "typedef struct __va_list_tag {"

Added: cfe/branches/Apple/Dib/test/CodeGen/target-data.c
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/Dib/test/CodeGen/target-data.c?rev=73447&view=auto

==============================================================================
--- cfe/branches/Apple/Dib/test/CodeGen/target-data.c (added)
+++ cfe/branches/Apple/Dib/test/CodeGen/target-data.c Mon Jun 15 18:59:37 2009
@@ -0,0 +1,7 @@
+// RUN: clang-cc -triple i686-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: grep 'target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"' %t &&
+// RUN: clang-cc -triple i686-apple-darwin9 -emit-llvm -o %t %s &&
+// RUN: grep 'target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128"' %t &&
+// RUN: clang-cc -triple x86_64-unknown-unknown -emit-llvm -o %t %s &&
+// RUN: grep 'target datalayout = "e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128"' %t &&
+// RUN: true