[llvm-branch-commits] [llvm-branch] r134817 - in /llvm/branches/type-system-rewrite: ./ lib/Support/Windows/DynamicLibrary.inc lib/Support/Windows/explicit_symbols.inc lib/Target/CBackend/CBackend.cpp test/CodeGen/X86/vector.ll utils/lit/lit/LitConfig.py

[Chris Lattner]

Author: lattner
Date: Sat Jul  9 11:25:29 2011
New Revision: 134817

URL: http://llvm.org/viewvc/llvm-project?rev=134817&view=rev
Log:
Merging r134805 through r134816 from mainline.

Modified:
    llvm/branches/type-system-rewrite/   (props changed)
    llvm/branches/type-system-rewrite/lib/Support/Windows/DynamicLibrary.inc
    llvm/branches/type-system-rewrite/lib/Support/Windows/explicit_symbols.inc
    llvm/branches/type-system-rewrite/lib/Target/CBackend/CBackend.cpp
    llvm/branches/type-system-rewrite/test/CodeGen/X86/vector.ll
    llvm/branches/type-system-rewrite/utils/lit/lit/LitConfig.py

Propchange: llvm/branches/type-system-rewrite/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul  9 11:25:29 2011
@@ -1,2 +1,2 @@
 /llvm/branches/Apple/Pertwee:110850,110961
-/llvm/trunk:133420-134362,134364-134683,134685-134725,134727-134803
+/llvm/trunk:133420-134362,134364-134683,134685-134725,134727-134803,134805-134816

Modified: llvm/branches/type-system-rewrite/lib/Support/Windows/DynamicLibrary.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/type-system-rewrite/lib/Support/Windows/DynamicLibrary.inc?rev=134817&r1=134816&r2=134817&view=diff
==============================================================================
--- llvm/branches/type-system-rewrite/lib/Support/Windows/DynamicLibrary.inc (original)
+++ llvm/branches/type-system-rewrite/lib/Support/Windows/DynamicLibrary.inc Sat Jul  9 11:25:29 2011
@@ -115,7 +115,7 @@
        E = OpenedHandles.end(); I != E; ++I) {
     FARPROC ptr = GetProcAddress((HMODULE)*I, symbolName);
     if (ptr) {
-      return (void *) ptr;
+      return (void *)(intptr_t)ptr;
     }
   }
 

Modified: llvm/branches/type-system-rewrite/lib/Support/Windows/explicit_symbols.inc
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/type-system-rewrite/lib/Support/Windows/explicit_symbols.inc?rev=134817&r1=134816&r2=134817&view=diff
==============================================================================
--- llvm/branches/type-system-rewrite/lib/Support/Windows/explicit_symbols.inc (original)
+++ llvm/branches/type-system-rewrite/lib/Support/Windows/explicit_symbols.inc Sat Jul  9 11:25:29 2011
@@ -2,7 +2,7 @@
 
 #ifdef HAVE__ALLOCA
   EXPLICIT_SYMBOL(_alloca)
-  EXPLICIT_SYMBOL2(alloca, _alloca);
+  EXPLICIT_SYMBOL2(alloca, _alloca)
 #endif
 #ifdef HAVE___ALLOCA
   EXPLICIT_SYMBOL(__alloca)
@@ -62,5 +62,5 @@
 
 /* msvcrt */
 #if defined(_MSC_VER)
-  EXPLICIT_SYMBOL2(alloca, _alloca_probe);
+  EXPLICIT_SYMBOL2(alloca, _alloca_probe)
 #endif

Modified: llvm/branches/type-system-rewrite/lib/Target/CBackend/CBackend.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/type-system-rewrite/lib/Target/CBackend/CBackend.cpp?rev=134817&r1=134816&r2=134817&view=diff
==============================================================================
--- llvm/branches/type-system-rewrite/lib/Target/CBackend/CBackend.cpp (original)
+++ llvm/branches/type-system-rewrite/lib/Target/CBackend/CBackend.cpp Sat Jul  9 11:25:29 2011
@@ -2741,10 +2741,12 @@
     Out << "U" << type << (isMax ? "_MAX" : "0");
 }
 
+#ifndef NDEBUG
 static bool isSupportedIntegerSize(const IntegerType &T) {
   return T.getBitWidth() == 8 || T.getBitWidth() == 16 ||
          T.getBitWidth() == 32 || T.getBitWidth() == 64;
 }
+#endif
 
 void CWriter::printIntrinsicDefinition(const Function &F, raw_ostream &Out) {
   const FunctionType *funT = F.getFunctionType();

Modified: llvm/branches/type-system-rewrite/test/CodeGen/X86/vector.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/type-system-rewrite/test/CodeGen/X86/vector.ll?rev=134817&r1=134816&r2=134817&view=diff
==============================================================================
--- llvm/branches/type-system-rewrite/test/CodeGen/X86/vector.ll (original)
+++ llvm/branches/type-system-rewrite/test/CodeGen/X86/vector.ll Sat Jul  9 11:25:29 2011
@@ -1,6 +1,6 @@
 ; Test that vectors are scalarized/lowered correctly.
 ; RUN: llc < %s -march=x86 -mcpu=i386 > %t
-; RUN: llc < %s -march=x86 -mcpu=yonah > %t
+; RUN: llc < %s -march=x86 -mcpu=yonah >> %t
 
 %d8 = type <8 x double>
 %f1 = type <1 x float>

Modified: llvm/branches/type-system-rewrite/utils/lit/lit/LitConfig.py
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/type-system-rewrite/utils/lit/lit/LitConfig.py?rev=134817&r1=134816&r2=134817&view=diff
==============================================================================
--- llvm/branches/type-system-rewrite/utils/lit/lit/LitConfig.py (original)
+++ llvm/branches/type-system-rewrite/utils/lit/lit/LitConfig.py Sat Jul  9 11:25:29 2011
@@ -96,7 +96,7 @@
         # bash
         self.bashPath = Util.which('bash', dir)
         if self.bashPath is None:
-            self.warning("Unable to find 'bash.exe'.")
+            self.note("Unable to find 'bash.exe'.")
             self.bashPath = ''
 
         return dir