AROS: arm needs AROS_FLAVOUR_BINCOMPAT defines

git-svn-id: trunk@34895 -

compiler/systems/i_aros.pas

@@ -162,7 +162,7 @@ unit i_aros;
             flags        : [tf_files_case_aware, tf_smartlink_library, tf_has_winlike_resources];
             cpu          : cpu_arm;
             unit_env     : 'AROSUNITS';
-            extradefines : 'HASAMIGA';
+            extradefines : 'HASAMIGA;AROS_FLAVOUR_BINCOMPAT';
             exeext       : '';
             defext       : '.def';
             scriptext    : '.sh';

rtl/amicommon/dos.pp

@@ -111,7 +111,7 @@ end;
 
 function BADDR(bval: PtrInt): Pointer; Inline;
 begin
-  {$if defined(AROS) and (not defined(AROS_FLAVOUR_BINCOMPAT))}
+  {$if defined(AROS)}  // deactivated for now //and (not defined(AROS_FLAVOUR_BINCOMPAT))} 
   BADDR := Pointer(bval);
   {$else}
   BADDR:=Pointer(bval Shl 2);
@@ -120,7 +120,7 @@ end;
 
 function BSTR2STRING(s : Pointer): PChar; Inline;
 begin
-  {$if defined(AROS) and (not defined(AROS_FLAVOUR_BINCOMPAT))}
+  {$if defined(AROS)}  // deactivated for now //and (not defined(AROS_FLAVOUR_BINCOMPAT))}
   BSTR2STRING:=PChar(s);
   {$else}
   BSTR2STRING:=PChar(BADDR(PtrInt(s)))+1;
@@ -129,7 +129,7 @@ end;
 
 function BSTR2STRING(s : PtrInt): PChar; Inline;
 begin
-  {$if defined(AROS) and (not defined(AROS_FLAVOUR_BINCOMPAT))}
+  {$if defined(AROS)}  // deactivated for now //and (not defined(AROS_FLAVOUR_BINCOMPAT))}
   BSTR2STRING:=PChar(s);
   {$else}
   BSTR2STRING:=PChar(BADDR(s))+1;

rtl/amicommon/sysutils.pp

@@ -89,7 +89,7 @@ var
 
 function BADDR(bval: LongInt): Pointer; Inline;
 begin
-  {$if defined(AROS) and (not defined(AROS_FLAVOUR_BINCOMPAT))}
+  {$if defined(AROS)}  // deactivated for now //and (not defined(AROS_FLAVOUR_BINCOMPAT))}
   BADDR := Pointer(bval);
   {$else}
   BADDR:=Pointer(bval Shl 2);
@@ -98,7 +98,7 @@ end;
 
 function BSTR2STRING(s : Pointer): PChar; Inline;
 begin
-  {$if defined(AROS) and (not defined(AROS_FLAVOUR_BINCOMPAT))}
+  {$if defined(AROS)}  // deactivated for now //and (not defined(AROS_FLAVOUR_BINCOMPAT))}
   BSTR2STRING:=PChar(s);
   {$else}
   BSTR2STRING:=PChar(BADDR(PtrInt(s)))+1;
@@ -107,7 +107,7 @@ end;
 
 function BSTR2STRING(s : LongInt): PChar; Inline;
 begin
-  {$if defined(AROS) and (not defined(AROS_FLAVOUR_BINCOMPAT))}
+  {$if defined(AROS)}  // deactivated for now //and (not defined(AROS_FLAVOUR_BINCOMPAT))}
   BSTR2STRING:=PChar(s);
   {$else}
   BSTR2STRING:=PChar(BADDR(s))+1;

rtl/aros/doslibd.inc

@@ -544,7 +544,7 @@ type  // Checked OK 05.08.2011 ALB
   TDOSLibrary = record
     dl_Lib          : TLibrary;
     dl_Root         : PRootNode;
-    {$ifdef AROS_BINCOMPAT}
+    {$ifdef AROS_FLAVOUR_BINCOMPAT}
     dl_GV           : Pointer;
     dl_A2           : LongInt;
     dl_A5           : LongInt;

rtl/aros/i386/execd.inc

@@ -33,7 +33,7 @@ type  // Checked OK 05.08.2011 ALB
   TNode = record
     ln_Succ: PNode;
     ln_Pred: PNode;
-{$ifdef AROS_BINCOMPAT}
+{$ifdef AROS_FLAVOUR_BINCOMPAT}
     ln_Type: Byte;
     ln_Pri : ShortInt;
     ln_Name: PChar;