2
0
Эх сурвалжийг харах

* Fixed compilation for mips-linux.

git-svn-id: trunk@26732 -
yury 11 жил өмнө
parent
commit
e0c8a4701e

+ 3 - 1
compiler/mips/cputarg.pas

@@ -47,7 +47,9 @@ implementation
       ,t_linux
     {$endif}
     {$ifndef NOTARGETANDROID}
-      ,t_android
+      {$ifdef MIPSEL}
+        ,t_android
+      {$endif MIPSEL}
     {$endif}
 
 {**************************************

+ 1 - 10
compiler/systems/t_android.pas

@@ -114,22 +114,13 @@ end;
 
 
 procedure TLinkerAndroid.SetDefaultInfo;
-{
-  This will also detect which libc version will be used
-}
-
-const
-{$ifdef arm}       platform_select='';{$endif} {unknown :( }
-{$ifdef i386}      platform_select='';{$endif} {unknown :( }
-{$ifdef mipsel}    platform_select='';{$endif} {unknown :( }
-
 var
   s: string;
 begin
   with Info do
    begin
      { Specify correct max-page-size and common-page-size to prevent big gaps between sections in resulting executable }
-     s:='ld '+platform_select+'-z max-page-size=0x1000 -z common-page-size=0x1000 -z noexecstack -z now $OPT -L. -T $RES -o $EXE';
+     s:='ld -z max-page-size=0x1000 -z common-page-size=0x1000 -z noexecstack -z now $OPT -L. -T $RES -o $EXE';
      ExeCmd[1]:=s + ' --entry=_fpc_start';
      DllCmd[1]:=s + ' -shared -soname $SONAME';
      DllCmd[2]:='strip --strip-unneeded $EXE';