Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(467)

Unified Diff: runtime/platform/globals.h

Issue 2757783003: Set TARGET_OS_* from GN, falling back to HOST_OS_*. (Closed)
Patch Set: . Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/BUILD.gn ('k') | runtime/vm/constants_arm.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/platform/globals.h
diff --git a/runtime/platform/globals.h b/runtime/platform/globals.h
index c504430fd09aeb7529b915b095fcb11b167e385e..56eea83ce31a6c1f33349bc296c4845a1263e7f1 100644
--- a/runtime/platform/globals.h
+++ b/runtime/platform/globals.h
@@ -102,9 +102,6 @@
// the value defined in TargetConditionals.h
#define HOST_OS_MACOS 1
#if TARGET_OS_IPHONE
-// Test for this #define by saying '#if TARGET_OS_IOS' rather than the usual
-// '#if defined(TARGET_OS_IOS)'. TARGET_OS_IOS is defined to be 0 in
-// XCode >= 7.0. See Issue #24453.
#define HOST_OS_IOS 1
#endif
@@ -310,12 +307,9 @@ typedef simd128_value_t fpu_register_t;
#error Automatic compiler detection failed.
#endif
-#if !defined(TARGET_ARCH_MIPS)
-#if !defined(TARGET_ARCH_ARM)
-#if !defined(TARGET_ARCH_X64)
-#if !defined(TARGET_ARCH_IA32)
-#if !defined(TARGET_ARCH_ARM64)
-#if !defined(TARGET_ARCH_DBC)
+#if !defined(TARGET_ARCH_MIPS) && !defined(TARGET_ARCH_ARM) && \
+ !defined(TARGET_ARCH_X64) && !defined(TARGET_ARCH_IA32) && \
+ !defined(TARGET_ARCH_ARM64) && !defined(TARGET_ARCH_DBC)
// No target architecture specified pick the one matching the host architecture.
#if defined(HOST_ARCH_MIPS)
#define TARGET_ARCH_MIPS 1
@@ -331,11 +325,6 @@ typedef simd128_value_t fpu_register_t;
#error Automatic target architecture detection failed.
#endif
#endif
-#endif
-#endif
-#endif
-#endif
-#endif
// Verify that host and target architectures match, we cannot
// have a 64 bit Dart VM generating 32 bit code or vice-versa.
@@ -384,17 +373,27 @@ typedef simd128_value_t fpu_register_t;
#endif
-#if defined(TARGET_ARCH_ARM)
-#if defined(TARGET_ABI_IOS) && defined(TARGET_ABI_EABI)
-#error Both TARGET_ABI_IOS and TARGET_ABI_EABI defined.
-#elif !defined(TARGET_ABI_IOS) && !defined(TARGET_ABI_EABI)
-#if defined(HOST_OS_MAC)
-#define TARGET_ABI_IOS 1
+#if !defined(TARGET_OS_ANDROID) && !defined(TARGET_OS_FUCHSIA) && \
+ !defined(TARGET_OS_MACOS_IOS) && !defined(TARGET_OS_LINUX) && \
+ !defined(TARGET_OS_MACOS) && !defined(TARGET_OS_WINDOWS)
+// No target OS specified; pick the one matching the host OS.
+#if defined(HOST_OS_ANDROID)
+#define TARGET_OS_ANDROID 1
+#elif defined(HOST_OS_FUCHSIA)
+#define TARGET_OS_FUCHSIA 1
+#elif defined(HOST_OS_IOS)
+#define TARGET_OS_MACOS 1
+#define TARGET_OS_MACOS_IOS 1
+#elif defined(HOST_OS_LINUX)
+#define TARGET_OS_LINUX 1
+#elif defined(HOST_OS_MACOS)
+#define TARGET_OS_MACOS 1
+#elif defined(HOST_OS_WINDOWS)
+#define TARGET_OS_WINDOWS 1
#else
-#define TARGET_ABI_EABI 1
+#error Automatic target OS detection failed.
#endif
#endif
-#endif // TARGET_ARCH_ARM
// Short form printf format specifiers
« no previous file with comments | « runtime/BUILD.gn ('k') | runtime/vm/constants_arm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698