+ added support for x86_64-android target.

git-svn-id: trunk@39956 -

.gitattributes

@@ -8807,6 +8807,7 @@ rtl/android/prt0.as svneol=native#text/plain
 rtl/android/sysandroid.inc svneol=native#text/plain
 rtl/android/sysandroidh.inc svneol=native#text/plain
 rtl/android/unixandroid.inc svneol=native#text/plain
+rtl/android/x86_64/sysnr.inc svneol=native#text/plain
 rtl/arm/arm.inc svneol=native#text/plain
 rtl/arm/armdefines.inc svneol=native#text/plain
 rtl/arm/cpu.pp svneol=native#text/pascal

compiler/systems.inc

@@ -186,7 +186,8 @@
              system_riscv64_linux,      { 97 }
              system_riscv64_embedded,   { 98 }
              system_riscv32_embedded,   { 99 }
-             system_aarch64_android     { 100 }
+             system_aarch64_android,    { 100 }
+             system_x86_64_android      { 101 }
        );
 
      type

compiler/systems.pas

@@ -229,7 +229,7 @@ interface
        system_any = system_none;
 
        systems_wince = [system_arm_wince,system_i386_wince];
-       systems_android = [system_arm_android, system_aarch64_android, system_i386_android, system_mipsel_android];
+       systems_android = [system_arm_android, system_aarch64_android, system_i386_android, system_x86_64_android, system_mipsel_android];
        systems_linux = [system_i386_linux,system_x86_64_linux,system_powerpc_linux,system_powerpc64_linux,
                        system_arm_linux,system_sparc_linux,system_sparc64_linux,system_m68k_linux,
                        system_x86_6432_linux,system_mipseb_linux,system_mipsel_linux,system_aarch64_linux,
@@ -908,6 +908,10 @@ begin
    default_target(system_powerpc_aix);
    {$define default_target_set}
   {$endif}
+  {$ifdef android}
+   {$define default_target_set}
+   default_target(system_x86_64_android);
+  {$endif}
   {$ifndef default_target_set}
     default_target(system_powerpc_linux);
   {$endif default_target_set}

compiler/systems/i_android.pas

@@ -227,6 +227,72 @@ unit i_android;
              llvmdatalayout : 'e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-n32:64-S128'
            );
 
+        system_x86_64_android_info : tsysteminfo =
+           (
+             system       : system_x86_64_android;
+             name         : 'Android for x86-64';
+             shortname    : 'Android';
+             flags        : [tf_needs_symbol_size,tf_needs_symbol_type,tf_files_case_sensitive,
+                             tf_needs_dwarf_cfi,tf_has_winlike_resources,
+                             {tf_pic_uses_got,} tf_pic_default, tf_smartlink_sections,
+                             tf_safecall_exceptions, tf_safecall_clearstack];
+             cpu          : cpu_x86_64;
+             unit_env     : 'ANDROIDUNITS';
+             extradefines : 'UNIX;HASUNIX';
+             exeext       : '';
+             defext       : '.def';
+             scriptext    : '.sh';
+             smartext     : '.sl';
+             unitext      : '.ppu';
+             unitlibext   : '.ppl';
+             asmext       : '.s';
+             objext       : '.o';
+             resext       : '.res';
+             resobjext    : '.or';
+             sharedlibext : '.so';
+             staticlibext : '.a';
+             staticlibprefix : 'libp';
+             sharedlibprefix : 'lib';
+             sharedClibext : '.so';
+             staticClibext : '.a';
+             staticClibprefix : 'lib';
+             sharedClibprefix : 'lib';
+             importlibprefix : 'libimp';
+             importlibext : '.a';
+             Cprefix      : '';
+             newline      : #10;
+             dirsep       : '/';
+             assem        : as_x86_64_elf64;
+             assemextern  : as_gas;
+             link         : ld_none;
+             linkextern   : ld_android;
+             ar           : ar_gnu_ar;
+             res          : res_elf;
+             dbg          : dbg_dwarf2;
+             script       : script_unix;
+             endian       : endian_little;
+             alignment    :
+               (
+                 procalign       : 16;
+                 loopalign       : 8;
+                 jumpalign       : 0;
+                 constalignmin   : 0;
+                 constalignmax   : 8;
+                 varalignmin     : 0;
+                 varalignmax     : 16;
+                 localalignmin   : 4;
+                 localalignmax   : 16;
+                 recordalignmin  : 0;
+                 recordalignmax  : 16;
+                 maxCrecordalign : 16
+               );
+             first_parm_offset : 16;
+             stacksize    : 8*1024*1024;
+             stackalign   : 16;
+             abi : abi_default;
+             llvmdatalayout : 'e-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-s0:64:64-f80:128:128-n8:16:32:64-S128';
+           );
+
        system_mipsel_android_info : tsysteminfo =
           (
             system       : system_mipsel_android;
@@ -300,6 +366,11 @@ initialization
     set_source_info(system_i386_android_info);
   {$endif}
 {$endif CPUI386}
+{$ifdef CPUX86_64}
+  {$ifdef android}
+    set_source_info(system_x86_64_android_info);
+  {$endif}
+{$endif CPUX86_64}
 {$ifdef CPUARM}
   {$ifdef android}
     set_source_info(system_arm_android_info);

compiler/systems/t_android.pas

@@ -175,11 +175,11 @@ begin
      ExtDbgCmd[1]:='objcopy --only-keep-debug $EXE $DBG';
      ExtDbgCmd[2]:='objcopy --add-gnu-debuglink=$DBG $EXE';
      ExtDbgCmd[3]:='strip --strip-unneeded $EXE';
-{$ifdef cpu64bit}
+{$ifdef cpu64bitalu}
      DynamicLinker:='/system/bin/linker64';
 {$else}
      DynamicLinker:='/system/bin/linker';
-{$endif cpu64bit}
+{$endif cpu64bitalu}
    end;
 end;
 
@@ -500,6 +500,11 @@ initialization
   RegisterExport(system_i386_android,texportlibandroid);
   RegisterTarget(system_i386_android_info);
 {$endif I386}
+{$ifdef X86_64}
+  RegisterImport(system_x86_64_android,timportlibandroid);
+  RegisterExport(system_x86_64_android,texportlibandroid);
+  RegisterTarget(system_x86_64_android_info);
+{$endif X86_64}
 {$ifdef MIPSEL}
   RegisterImport(system_mipsel_android,timportlibandroid);
   RegisterExport(system_mipsel_android,texportlibandroid);

compiler/utils/ppuutils/ppudump.pp

@@ -188,7 +188,8 @@ const
   { 97 }  'Linux-RiscV64',
   { 98 }  'Embedded-RiscV32',
   { 99 }  'Embedded-RiscV64',
-  { 100 } 'Android-AArch64'
+  { 100 } 'Android-AArch64',
+  { 101 } 'Android-x86-64'
   );
 
 const

compiler/x86_64/cpuelf.pas

@@ -677,7 +677,7 @@ implementation
         supported_targets : [system_x86_64_linux,system_x86_64_freebsd,
                              system_x86_64_openbsd,system_x86_64_netbsd,
                              system_x86_64_dragonfly,system_x86_64_solaris,
-                             system_x86_64_aros];
+                             system_x86_64_aros,system_x86_64_android];
         flags : [af_outputbinary,af_smartlink_sections,af_supports_dwarf];
         labelprefix : '.L';
         comment : '';

compiler/x86_64/cputarg.pas

@@ -57,6 +57,9 @@ implementation
     {$ifndef NOTARGETEMBEDDED}
       ,t_embed
     {$endif}
+    {$ifndef NOTARGETANDROID}
+      ,t_android
+    {$endif}
 
 {**************************************
              Assemblers

packages/fpmkunit/src/fpmkunit.pp

@@ -218,7 +218,7 @@ Const
     { iphonesim}( false, true,  false, false, false, true,  false, false, false, false, false, false, false, false, false, false,  false,  false),
     { aix    }  ( false, false, false, true,  false, false, false, true,  false, false, false, false, false, false, false, false,  false,  false),
     { java }    ( false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false,  false,  false),
-    { android } ( false, true,  false, false, false, false, true,  false, false, false, false, true,  true , false, true,  false,  false,  false),
+    { android } ( false, true,  false, false, false, true,  true,  false, false, false, false, true,  true , false, true,  false,  false,  false),
     { nativent }( false, true,  false, false, false, false, false, false, false, false, false, false, false, false, false, false,  false,  false),
     { msdos }   ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false,  false,  false),
     { wii }     ( false, false, false, true , false, false, false, false, false, false, false, false, false, false, false, false,  false,  false),

rtl/Makefile.fpc

@@ -39,6 +39,7 @@ dirs_wii=wii
 dirs_aix=aix
 dirs_java=java
 dirs_i386_android=android
+dirs_x86_64_android=android
 dirs_arm_android=android
 dirs_aarch64_android=android
 dirs_mipsel_android=android

rtl/android/x86_64/sysnr.inc

@@ -0,0 +1,245 @@
+// Available syscalls for x86_64-android.
+// This file is autogenerated by the genandroidsyscalls.py script. 
+// Script location: https://svn.freepascal.org/svn/fpcbuild/scripts/android
+
+const
+  syscall_nr_read = 0;
+  syscall_nr_write = 1;
+  syscall_nr_close = 3;
+  syscall_nr_fstat = 5;
+  syscall_nr_fstat64 = syscall_nr_fstat;
+  syscall_nr_lseek = 8;
+  syscall_nr_mmap = 9;
+  syscall_nr_mmap64 = syscall_nr_mmap;
+  syscall_nr_mprotect = 10;
+  syscall_nr_munmap = 11;
+  syscall_nr_brk = 12;
+  syscall_nr_rt_sigaction = 13;
+  syscall_nr_rt_sigprocmask = 14;
+  syscall_nr_rt_sigreturn = 15;
+  syscall_nr_ioctl = 16;
+  syscall_nr_pread64 = 17;
+  syscall_nr_pwrite64 = 18;
+  syscall_nr_readv = 19;
+  syscall_nr_writev = 20;
+  syscall_nr_sched_yield = 24;
+  syscall_nr_mremap = 25;
+  syscall_nr_msync = 26;
+  syscall_nr_mincore = 27;
+  syscall_nr_madvise = 28;
+  syscall_nr_dup = 32;
+  syscall_nr_nanosleep = 35;
+  syscall_nr_getitimer = 36;
+  syscall_nr_setitimer = 38;
+  syscall_nr_getpid = 39;
+  syscall_nr_sendfile = 40;
+  syscall_nr_socket = 41;
+  syscall_nr_connect = 42;
+  syscall_nr_sendto = 44;
+  syscall_nr_recvfrom = 45;
+  syscall_nr_sendmsg = 46;
+  syscall_nr_recvmsg = 47;
+  syscall_nr_shutdown = 48;
+  syscall_nr_bind = 49;
+  syscall_nr_listen = 50;
+  syscall_nr_getsockname = 51;
+  syscall_nr_getpeername = 52;
+  syscall_nr_socketpair = 53;
+  syscall_nr_setsockopt = 54;
+  syscall_nr_getsockopt = 55;
+  syscall_nr_clone = 56;
+  syscall_nr_vfork = 58;
+  syscall_nr_execve = 59;
+  syscall_nr_exit = 60;
+  syscall_nr_wait4 = 61;
+  syscall_nr_kill = 62;
+  syscall_nr_uname = 63;
+  syscall_nr_fcntl = 72;
+  syscall_nr_flock = 73;
+  syscall_nr_fsync = 74;
+  syscall_nr_fdatasync = 75;
+  syscall_nr_truncate = 76;
+  syscall_nr_ftruncate = 77;
+  syscall_nr_ftruncate64 = syscall_nr_ftruncate;
+  syscall_nr_getcwd = 79;
+  syscall_nr_chdir = 80;
+  syscall_nr_fchdir = 81;
+  syscall_nr_fchmod = 91;
+  syscall_nr_fchown = 93;
+  syscall_nr_umask = 95;
+  syscall_nr_gettimeofday = 96;
+  syscall_nr_getrlimit = 97;
+  syscall_nr_getrusage = 98;
+  syscall_nr_sysinfo = 99;
+  syscall_nr_times = 100;
+  syscall_nr_ptrace = 101;
+  syscall_nr_getuid = 102;
+  syscall_nr_syslog = 103; // Blacklisted. Do not use.
+  syscall_nr_klogctl = syscall_nr_syslog; // Blacklisted. Do not use.
+  syscall_nr_getgid = 104;
+  syscall_nr_setuid = 105; // Blacklisted. Do not use.
+  syscall_nr_setgid = 106; // Blacklisted. Do not use.
+  syscall_nr_geteuid = 107;
+  syscall_nr_getegid = 108;
+  syscall_nr_setpgid = 109;
+  syscall_nr_getppid = 110;
+  syscall_nr_setsid = 112;
+  syscall_nr_setreuid = 113; // Blacklisted. Do not use.
+  syscall_nr_setregid = 114;
+  syscall_nr_getgroups = 115;
+  syscall_nr_setgroups = 116; // Blacklisted. Do not use.
+  syscall_nr_setresuid = 117;
+  syscall_nr_getresuid = 118;
+  syscall_nr_setresgid = 119; // Blacklisted. Do not use.
+  syscall_nr_getresgid = 120;
+  syscall_nr_getpgid = 121;
+  syscall_nr_setfsuid = 122; // Blacklisted. Do not use.
+  syscall_nr_setfsgid = 123; // Blacklisted. Do not use.
+  syscall_nr_getsid = 124;
+  syscall_nr_capget = 125;
+  syscall_nr_capset = 126;
+  syscall_nr_rt_sigpending = 127;
+  syscall_nr_rt_sigtimedwait = 128;
+  syscall_nr_rt_sigqueueinfo = 129;
+  syscall_nr_rt_sigsuspend = 130;
+  syscall_nr_sigaltstack = 131;
+  syscall_nr_personality = 135;
+  syscall_nr_statfs = 137;
+  syscall_nr_fstatfs = 138;
+  syscall_nr_getpriority = 140;
+  syscall_nr_setpriority = 141;
+  syscall_nr_sched_setparam = 142;
+  syscall_nr_sched_getparam = 143;
+  syscall_nr_sched_setscheduler = 144;
+  syscall_nr_sched_getscheduler = 145;
+  syscall_nr_sched_get_priority_max = 146;
+  syscall_nr_sched_get_priority_min = 147;
+  syscall_nr_sched_rr_get_interval = 148;
+  syscall_nr_mlock = 149;
+  syscall_nr_munlock = 150;
+  syscall_nr_mlockall = 151;
+  syscall_nr_munlockall = 152;
+  syscall_nr_pivot_root = 155;
+  syscall_nr_prctl = 157;
+  syscall_nr_arch_prctl = 158;
+  syscall_nr_adjtimex = 159; // Blacklisted. Do not use.
+  syscall_nr_setrlimit = 160;
+  syscall_nr_chroot = 161; // Blacklisted. Do not use.
+  syscall_nr_sync = 162;
+  syscall_nr_acct = 163; // Blacklisted. Do not use.
+  syscall_nr_settimeofday = 164; // Blacklisted. Do not use.
+  syscall_nr_mount = 165; // Blacklisted. Do not use.
+  syscall_nr_umount2 = 166; // Blacklisted. Do not use.
+  syscall_nr_swapon = 167; // Blacklisted. Do not use.
+  syscall_nr_swapoff = 168; // Blacklisted. Do not use.
+  syscall_nr_reboot = 169; // Blacklisted. Do not use.
+  syscall_nr_sethostname = 170; // Blacklisted. Do not use.
+  syscall_nr_setdomainname = 171; // Blacklisted. Do not use.
+  syscall_nr_init_module = 175; // Blacklisted. Do not use.
+  syscall_nr_delete_module = 176; // Blacklisted. Do not use.
+  syscall_nr_quotactl = 179;
+  syscall_nr_gettid = 186;
+  syscall_nr_readahead = 187;
+  syscall_nr_setxattr = 188;
+  syscall_nr_lsetxattr = 189;
+  syscall_nr_fsetxattr = 190;
+  syscall_nr_getxattr = 191;
+  syscall_nr_lgetxattr = 192;
+  syscall_nr_fgetxattr = 193;
+  syscall_nr_listxattr = 194;
+  syscall_nr_llistxattr = 195;
+  syscall_nr_flistxattr = 196;
+  syscall_nr_removexattr = 197;
+  syscall_nr_lremovexattr = 198;
+  syscall_nr_fremovexattr = 199;
+  syscall_nr_tkill = 200;
+  syscall_nr_futex = 202;
+  syscall_nr_sched_setaffinity = 203;
+  syscall_nr_sched_getaffinity = 204;
+  syscall_nr_io_setup = 206;
+  syscall_nr_io_destroy = 207;
+  syscall_nr_io_getevents = 208;
+  syscall_nr_io_submit = 209;
+  syscall_nr_io_cancel = 210;
+  syscall_nr_getdents64 = 217;
+  syscall_nr_set_tid_address = 218;
+  syscall_nr_restart_syscall = 219;
+  syscall_nr_fadvise64 = 221;
+  syscall_nr_timer_create = 222;
+  syscall_nr_timer_settime = 223;
+  syscall_nr_timer_gettime = 224;
+  syscall_nr_timer_getoverrun = 225;
+  syscall_nr_timer_delete = 226;
+  syscall_nr_clock_settime = 227; // Blacklisted. Do not use.
+  syscall_nr_clock_gettime = 228;
+  syscall_nr_clock_getres = 229;
+  syscall_nr_clock_nanosleep = 230;
+  syscall_nr_exit_group = 231;
+  syscall_nr_epoll_ctl = 233;
+  syscall_nr_tgkill = 234;
+  syscall_nr_waitid = 247;
+  syscall_nr_ioprio_set = 251;
+  syscall_nr_ioprio_get = 252;
+  syscall_nr_inotify_add_watch = 254;
+  syscall_nr_inotify_rm_watch = 255;
+  syscall_nr_openat = 257;
+  syscall_nr_mkdirat = 258;
+  syscall_nr_mknodat = 259;
+  syscall_nr_fchownat = 260;
+  syscall_nr_newfstatat = 262;
+  syscall_nr_fstatat = syscall_nr_newfstatat;
+  syscall_nr_fstatat64 = syscall_nr_newfstatat;
+  syscall_nr_unlinkat = 263;
+  syscall_nr_renameat = 264;
+  syscall_nr_linkat = 265;
+  syscall_nr_symlinkat = 266;
+  syscall_nr_readlinkat = 267;
+  syscall_nr_fchmodat = 268;
+  syscall_nr_faccessat = 269;
+  syscall_nr_pselect6 = 270;
+  syscall_nr_ppoll = 271;
+  syscall_nr_unshare = 272;
+  syscall_nr_splice = 275;
+  syscall_nr_tee = 276;
+  syscall_nr_sync_file_range = 277;
+  syscall_nr_vmsplice = 278;
+  syscall_nr_utimensat = 280;
+  syscall_nr_epoll_pwait = 281;
+  syscall_nr_timerfd_create = 283;
+  syscall_nr_fallocate = 285;
+  syscall_nr_fallocate64 = syscall_nr_fallocate;
+  syscall_nr_timerfd_settime = 286;
+  syscall_nr_timerfd_gettime = 287;
+  syscall_nr_accept4 = 288;
+  syscall_nr_signalfd4 = 289;
+  syscall_nr_eventfd2 = 290;
+  syscall_nr_eventfd = syscall_nr_eventfd2;
+  syscall_nr_epoll_create1 = 291;
+  syscall_nr_dup3 = 292;
+  syscall_nr_pipe2 = 293;
+  syscall_nr_inotify_init1 = 294;
+  syscall_nr_preadv = 295;
+  syscall_nr_pwritev = 296;
+  syscall_nr_rt_tgsigqueueinfo = 297;
+  syscall_nr_perf_event_open = 298;
+  syscall_nr_recvmmsg = 299;
+  syscall_nr_prlimit64 = 302;
+  syscall_nr_prlimit = syscall_nr_prlimit64;
+  syscall_nr_clock_adjtime = 305; // Blacklisted. Do not use.
+  syscall_nr_syncfs = 306;
+  syscall_nr_sendmmsg = 307;
+  syscall_nr_setns = 308;
+  syscall_nr_getcpu = 309;
+  syscall_nr_process_vm_readv = 310;
+  syscall_nr_process_vm_writev = 311;
+  syscall_nr_sched_setattr = 314;
+  syscall_nr_sched_getattr = 315;
+  syscall_nr_renameat2 = 316;
+  syscall_nr_seccomp = 317;
+  syscall_nr_getrandom = 318;
+  syscall_nr_memfd_create = 319;
+  syscall_nr_execveat = 322;
+  syscall_nr_mlock2 = 325;
+  syscall_nr_copy_file_range = 326;
+  syscall_nr_preadv2 = 327;
+  syscall_nr_pwritev2 = 328;

utils/fpcm/fpcmmain.pp

@@ -143,7 +143,7 @@ interface
         { wii }     ( false, false, true,  false, false, false, false, false, false, false, false, false, false, false,   false, false, false, false, false, false,  false),
         { aix }     ( false, false, true,  false, false, false, true,  false, false, false, false, false, false, false,   false, false, false, false, false, false,  false),
         { java }    ( false, false, false, false, false, false, false, false, false, false, false, false, false, false,   true,  false, false, false, false, false,  false),
-        { android } ( true,  false, false, false, false, true,  false, false, false, false, false, true,  false, false,   true,  false, true,  false, false, false,  false),
+        { android } ( true,  false, false, false, true,  true,  false, false, false, false, false, true,  false, false,   true,  false, true,  false, false, false,  false),
         { msdos }   ( false, false, false, false, false, false, false, false, false, false, false, false, false, false,   false, true , false, false, false, false,  false),
         { aros }    ( true,  false, false, false, true,  true,  false, false, false, false, false, false, false, false,   false, false, false, false, false, false,  false),
         {dragonfly} ( false, false, false, false, true,  false, false, false, false, false, false, false, false, false,   false, false, false, false, false, false,  false),