Subzero. Native 64-bit int arithmetic on x86-64.

crosstest/test_icmp_main.cpp

Index: crosstest/test_icmp_main.cpp
diff --git a/crosstest/test_icmp_main.cpp b/crosstest/test_icmp_main.cpp
index f27d53bba169e8814d76885adbc8f2be9548e853..82e5b6636d42a8a2d23f1e3a445c2eb11ba08275 100644
--- a/crosstest/test_icmp_main.cpp
+++ b/crosstest/test_icmp_main.cpp
@@ -23,10 +23,13 @@
 // Subzero_ namespace, corresponding to the llc and Subzero translated
 // object files, respectively.
 #include "test_icmp.h"
+
 namespace Subzero_ {
 #include "test_icmp.h"
 }
 
+#include "xdefs.h"
+
 volatile unsigned Values[] = {
     0x0,        0x1,        0x7ffffffe, 0x7fffffff, 0x80000000, 0x80000001,
     0xfffffffe, 0xffffffff, 0x7e,       0x7f,       0x80,       0x81,
@@ -265,7 +268,11 @@ void testsVecI1(size_t &TotalTests, size_t &Passes, size_t &Failures) {
   }
 }
 
-int main(int argc, char **argv) {
+#ifdef X8664_STACK_HACK
+extern "C" int wrapped_main(int argc, char *argv[]) {
+#else  // !defined(X8664_STACK_HACK)
+int main(int argc, char *argv[]) {
+#endif // X8664_STACK_HACK
   size_t TotalTests = 0;
   size_t Passes = 0;
   size_t Failures = 0;
@@ -273,7 +280,7 @@ int main(int argc, char **argv) {
   testsInt<uint8_t, myint8_t>(TotalTests, Passes, Failures);
   testsInt<uint16_t, int16_t>(TotalTests, Passes, Failures);
   testsInt<uint32_t, int32_t>(TotalTests, Passes, Failures);
-  testsInt<uint64_t, int64_t>(TotalTests, Passes, Failures);
+  testsInt<uint64, int64>(TotalTests, Passes, Failures);
   testsVecInt<v4ui32, v4si32>(TotalTests, Passes, Failures);
   testsVecInt<v8ui16, v8si16>(TotalTests, Passes, Failures);
   testsVecInt<v16ui8, v16si8>(TotalTests, Passes, Failures);