diff --git a/compiler/options.pas b/compiler/options.pas index a302daaf51..7a608c5149 100644 --- a/compiler/options.pas +++ b/compiler/options.pas @@ -2454,7 +2454,6 @@ begin {$endif cpufpemu} end; - { now we can defined cpu and cpu type } def_system_macro('CPU'+Cputypestr[init_settings.cputype]); diff --git a/compiler/systems/i_linux.pas b/compiler/systems/i_linux.pas index 931285f3ca..4d18c74a0d 100644 --- a/compiler/systems/i_linux.pas +++ b/compiler/systems/i_linux.pas @@ -532,7 +532,7 @@ unit i_linux; abi : abi_default ); -{$ifdef ARMEL} +{$ifdef FPC_ARMEL} system_arm_linux_info : tsysteminfo = ( system : system_arm_Linux; @@ -592,7 +592,7 @@ unit i_linux; stacksize : 262144; abi : abi_eabi ); -{$else ARMEL} +{$else FPC_ARMEL} system_arm_linux_info : tsysteminfo = ( system : system_arm_Linux; @@ -652,7 +652,7 @@ unit i_linux; stacksize : 262144; abi : abi_default ); -{$endif ARMEL} +{$endif FPC_ARMEL} implementation