improve fix for test with custom stdint.h

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

clang/test/Headers/Inputs/include/stdint.h

@@ -1,11 +1,23 @@
 #ifndef STDINT_H
 #define STDINT_H
 
+#ifdef __INT8_TYPE__
+typedef __INT8_TYPE__ int8_t;
+#endif
+typedef unsigned char uint8_t;
+
+#ifdef __INT16_TYPE__
+typedef __INT16_TYPE__ int16_t;
+typedef unsigned __INT16_TYPE__ uint16_t;
+#endif
+
 #ifdef __INT32_TYPE__
+typedef __INT32_TYPE__ int32_t;
 typedef unsigned __INT32_TYPE__ uint32_t;
 #endif
 
 #ifdef __INT64_TYPE__
+typedef __INT64_TYPE__ int64_t;
 typedef unsigned __INT64_TYPE__ uint64_t;
 #endif
 

clang/test/Headers/ms-intrin.cpp

@@ -37,24 +37,6 @@ typedef __SIZE_TYPE__ size_t;
 #include <intrin.h>
 
 #ifdef __ARM_ACLE
-// arm_acle.h needs some stdint types, but -ffreestanding prevents us from
-// getting it from stddef.h.  Work around it with these typedefs.
-#ifdef __INT8_TYPE__
-typedef __INT8_TYPE__ int8_t;
-#endif
-typedef unsigned char uint8_t;
-#ifdef __INT16_TYPE__
-typedef __INT16_TYPE__ int16_t;
-typedef unsigned __INT16_TYPE__ uint16_t;
-#endif
-#ifdef __INT32_TYPE__
-typedef __INT32_TYPE__ int32_t;
-typedef unsigned __INT32_TYPE__ uint32_t;
-#endif
-#ifdef __INT64_TYPE__
-typedef __INT64_TYPE__ int64_t;
-typedef unsigned __INT64_TYPE__ uint64_t;
-#endif
 #include <arm_acle.h>
 #endif