From d9ac2f58ad8d311f12c102e7dcd050969f668384 Mon Sep 17 00:00:00 2001 From: Pierre Muller Date: Thu, 24 Mar 2022 21:23:18 +0000 Subject: [PATCH] Revert "Add trunk only system_CPU_OS values to ensure that the same integervlaue is uused for system_aarch64_darwin" This reverts commit 313643ea1c4dccab324562696a89c46da373625f. --- compiler/systems.inc | 17 +---------------- compiler/utils/ppuutils/ppudump.pp | 8 -------- 2 files changed, 1 insertion(+), 24 deletions(-) diff --git a/compiler/systems.inc b/compiler/systems.inc index 9495866314..0c36c5cb03 100644 --- a/compiler/systems.inc +++ b/compiler/systems.inc @@ -187,22 +187,7 @@ system_aarch64_android, { 100 } system_x86_64_android, { 101 } system_x86_64_haiku, { 102 } - trunk_only_system_xtensa_embedded, { 103 } - trunk_only_system_xtensa_freertos, { 104 } - trunk_only_system_xtensa_linux, { 105 } - trunk_only_system_arm_freertos, { 106 } - trunk_only_system_aarch64_win64, { 107 } - trunk_only_system_z80_embedded, { 108 } - trunk_only_system_z80_zxspectrum, { 109 } - trunk_only_system_z80_msxdos, { 110 } - system_aarch64_darwin, { 111 } - trunk_only_system_z80_amstradcpc, { 112 } - trunk_only_system_m68k_sinclairql, { 113 } - trunk_only_system_wasm32_wasi, { 114 } - trunk_only_system_aarch64_freebsd, { 115 } - trunk_only_system_aarch64_embedded, { 116 } - trunk_only_system_mips64_linux, { 117 } - trunk_only_system_mips64el_linux { 118 } + system_aarch64_darwin { 111 (in trunk) } ); type diff --git a/compiler/utils/ppuutils/ppudump.pp b/compiler/utils/ppuutils/ppudump.pp index bd1165b0b5..3418e628e0 100644 --- a/compiler/utils/ppuutils/ppudump.pp +++ b/compiler/utils/ppuutils/ppudump.pp @@ -215,14 +215,6 @@ const { 100 } 'Android-AArch64', { 101 } 'Android-x86-64', { 102 } 'Haiku-x86-64', - { 103 } 'Embedded-Xtensa', - { 104 } 'FreeRTos-Xtensa', - { 105 } 'Linux-Xtensa', - { 106 } 'FreeRTos-arm', - { 107 } 'Win64-AArch64', - { 108 } 'Embedded-Z80', - { 109 } 'ZXSpectrum-Z80', - { 110 } 'MSX-DOS-Z80', { 111 } 'Darwin-AArch64' );