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

Unified Diff: runtime/vm/disassembler_arm.cc

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
Index: runtime/vm/disassembler_arm.cc
diff --git a/runtime/vm/disassembler_arm.cc b/runtime/vm/disassembler_arm.cc
index 8c6d5fdee6afcec7d9768e6bce267cc93364a250..1d40b142f7915e1a9c1bc41f5cc62aae31ae4c3b 100644
--- a/runtime/vm/disassembler_arm.cc
+++ b/runtime/vm/disassembler_arm.cc
@@ -112,14 +112,12 @@ void ARMDecoder::PrintCondition(Instr* instr) {
// formatting, except for register alias pp (r5).
// See for example the command "objdump -d <binary file>".
static const char* reg_names[kNumberOfCpuRegisters] = {
-#if defined(TARGET_ABI_IOS)
+#if defined(TARGET_OS_MACOS) || TARGET_OS_IOS
"r0", "r1", "r2", "r3", "r4", "pp", "r6", "fp",
"r8", "r9", "thr", "r11", "ip", "sp", "lr", "pc",
-#elif defined(TARGET_ABI_EABI)
+#else
"r0", "r1", "r2", "r3", "r4", "pp", "r6", "r7",
"r8", "r9", "thr", "fp", "ip", "sp", "lr", "pc",
-#else
-#error Unknown ABI
#endif
};

Powered by Google App Engine
This is Rietveld 408576698