5 files changed, 26 insertions, 12 deletions
diff --git a/test/Preprocessor/foo.framework/Headers/bar.h b/test/Preprocessor/foo.framework/Headers/bar.h
new file mode 100644
index 0000000..574e851
--- /dev/null
+++ b/test/Preprocessor/foo.framework/Headers/bar.h
@@ -0,0 +1,3 @@
+
+int y;
+
diff --git a/test/Preprocessor/foo.framework/Headers/foo.h b/test/Preprocessor/foo.framework/Headers/foo.h
new file mode 100644
index 0000000..b08d948
--- /dev/null
+++ b/test/Preprocessor/foo.framework/Headers/foo.h
@@ -0,0 +1,6 @@
+// This should warn: published framework headers should always 
+// #import headers within the framework with framework paths.
+#include "bar.h" 
+
+int x;
+
diff --git a/test/Preprocessor/framework-include.m b/test/Preprocessor/framework-include.m
new file mode 100644
index 0000000..7e50f18
--- /dev/null
+++ b/test/Preprocessor/framework-include.m
@@ -0,0 +1,5 @@
+// RUN: %clang -E -F%S %s 2>&1 | grep "published framework headers should always #import headers within the framework with framework paths"
+
+// rdar://7520940
+#include <foo/foo.h>
+
diff --git a/test/Preprocessor/init.c b/test/Preprocessor/init.c
index 5796b11..a1485b6 100644
--- a/test/Preprocessor/init.c
+++ b/test/Preprocessor/init.c
@@ -420,7 +420,7 @@
 // MSP430:#define __LDBL_MIN_10_EXP__ (-307)
 // MSP430:#define __LDBL_MIN_EXP__ (-1021)
 // MSP430:#define __LDBL_MIN__ 2.2250738585072014e-308
-// MSP430:#define __LONG_LONG_MAX__ 2147483647LL
+// MSP430:#define __LONG_LONG_MAX__ 9223372036854775807LL
 // MSP430:#define __LONG_MAX__ 2147483647L
 // MSP430:#define __MSP430__ 1
 // MSP430:#define __NO_INLINE__ 1
diff --git a/test/Preprocessor/stdint.c b/test/Preprocessor/stdint.c
index 5f0842a..e701494 100644
--- a/test/Preprocessor/stdint.c
+++ b/test/Preprocessor/stdint.c
@@ -380,15 +380,15 @@
 // MSP430:INT_FAST32_MAX_ 2147483647L
 // MSP430:UINT_FAST32_MAX_ 4294967295UL
 //
-// MSP430:INT64_MAX_ INT64_MAX
-// MSP430:INT64_MIN_ INT64_MIN
-// MSP430:UINT64_MAX_ UINT64_MAX
-// MSP430:INT_LEAST64_MIN_ INT_LEAST64_MIN
-// MSP430:INT_LEAST64_MAX_ INT_LEAST64_MAX
-// MSP430:UINT_LEAST64_MAX_ UINT_LEAST64_MAX
-// MSP430:INT_FAST64_MIN_ INT_FAST64_MIN
-// MSP430:INT_FAST64_MAX_ INT_FAST64_MAX
-// MSP430:UINT_FAST64_MAX_ UINT_FAST64_MAX
+// MSP430:INT64_MAX_ 9223372036854775807LL
+// MSP430:INT64_MIN_ (-9223372036854775807LL -1)
+// MSP430:UINT64_MAX_ 18446744073709551615ULL
+// MSP430:INT_LEAST64_MIN_ (-9223372036854775807LL -1)
+// MSP430:INT_LEAST64_MAX_ 9223372036854775807LL
+// MSP430:UINT_LEAST64_MAX_ 18446744073709551615ULL
+// MSP430:INT_FAST64_MIN_ (-9223372036854775807LL -1)
+// MSP430:INT_FAST64_MAX_ 9223372036854775807LL
+// MSP430:UINT_FAST64_MAX_ 18446744073709551615ULL
 //
 // MSP430:INTPTR_MIN_ (-32767 -1)
 // MSP430:INTPTR_MAX_ 32767
@@ -415,8 +415,8 @@
 // MSP430:UINT16_C_(0) 0U
 // MSP430:INT32_C_(0) 0L
 // MSP430:UINT32_C_(0) 0UL
-// MSP430:INT64_C_(0) INT64_C(0)
-// MSP430:UINT64_C_(0) UINT64_C(0)
+// MSP430:INT64_C_(0) 0LL
+// MSP430:UINT64_C_(0) 0ULL
 //
 // MSP430:INTMAX_C_(0) 0L
 // MSP430:UINTMAX_C_(0) 0UL