From b1249dcc32f83506745c5ca6edaaaf87251df759 Mon Sep 17 00:00:00 2001 From: pierre Date: Tue, 29 Sep 2020 14:53:00 +0000 Subject: [PATCH] * Merge commit #45720 ------------------------------------------------------------------------ r45720 | pierre | 2020-07-02 16:26:13 +0000 (Thu, 02 Jul 2020) | 1 line Obsolete system_mips_embedded, as it is a duplicate of system_mipseb_embedded ------------------------------------------------------------------------ --- Merging r45720 into '.': U compiler/systems.inc U compiler/systems.pas --- Recording mergeinfo for merge of r45720 into '.': U . git-svn-id: branches/fixes_3_2@47004 - --- compiler/systems.inc | 2 +- compiler/systems.pas | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/systems.inc b/compiler/systems.inc index 2ce3891f42..0c36c5cb03 100644 --- a/compiler/systems.inc +++ b/compiler/systems.inc @@ -140,7 +140,7 @@ obsolete_system_vm_embedded,{ 53 } obsolete_system_ia64_embedded,{ 54 } system_x86_64_embedded, { 55 } - system_mips_embedded, { 56 } + obsolete_system_mips_embedded, { 56 } { duplicate of system_mipseb_embedded, 81 } system_arm_embedded, { 57 } system_powerpc64_embedded, { 58 } system_i386_symbian, { 59 } diff --git a/compiler/systems.pas b/compiler/systems.pas index 69d9d047ba..e1cce1d571 100644 --- a/compiler/systems.pas +++ b/compiler/systems.pas @@ -279,7 +279,7 @@ interface system_powerpc_embedded, system_sparc_embedded,obsolete_system_vm_embedded, obsolete_system_ia64_embedded,system_x86_64_embedded, - system_mips_embedded,system_arm_embedded, + obsolete_system_mips_embedded,system_arm_embedded, system_powerpc64_embedded,system_avr_embedded, system_jvm_java32,system_mipseb_embedded,system_mipsel_embedded, system_i8086_embedded];