paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-11 18:49:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

* make eabihf/eabi changeable at compilation time

Browse Source 
git-svn-id: trunk@44706 -
(cherry picked from commit 9d7261a60b)
This commit is contained in:
florian 2020-04-12 18:05:49 +00:00 committed by Pierre Muller
parent 15194c6ee9
commit 3498d78aad
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/systems.pas
View File

@ -420,9 +420,9 @@ interface
(name: 'AIX' ; supported:{$if defined(powerpc) or defined(powerpc64)}true{$else}false{$endif}), (name: 'AIX' ; supported:{$if defined(powerpc) or defined(powerpc64)}true{$else}false{$endif}),
(name: 'DARWIN' ; supported:{$if defined(powerpc) or defined(powerpc64)}true{$else}false{$endif}), (name: 'DARWIN' ; supported:{$if defined(powerpc) or defined(powerpc64)}true{$else}false{$endif}),
(name: 'ELFV2' ; supported:{$if defined(powerpc64)}true{$else}false{$endif}), (name: 'ELFV2' ; supported:{$if defined(powerpc64)}true{$else}false{$endif}),
(name: 'EABI' ; supported:{$ifdef FPC_ARMEL}true{$else}false{$endif}), (name: 'EABI' ; supported:{$if defined(arm)}true{$else}false{$endif}),
(name: 'ARMEB' ; supported:{$ifdef FPC_ARMEB}true{$else}false{$endif}), (name: 'ARMEB' ; supported:{$ifdef FPC_ARMEB}true{$else}false{$endif}),
(name: 'EABIHF' ; supported:{$ifdef FPC_ARMHF}true{$else}false{$endif}), (name: 'EABIHF' ; supported:{$if defined(arm)}true{$else}false{$endif}),
(name: 'OLDWIN32GNU'; supported:{$ifdef I386}true{$else}false{$endif}), (name: 'OLDWIN32GNU'; supported:{$ifdef I386}true{$else}false{$endif}),
(name: 'AARCH64IOS'; supported:{$ifdef aarch64}true{$else}false{$endif}), (name: 'AARCH64IOS'; supported:{$ifdef aarch64}true{$else}false{$endif}),
(name: 'LINUX386_SYSV'; supported:{$if defined(i386)}true{$else}false{$endif}) (name: 'LINUX386_SYSV'; supported:{$if defined(i386)}true{$else}false{$endif})

16
compiler/systems/t_linux.pas
View File

@ -155,12 +155,16 @@ begin
{$ifdef arm} {$ifdef arm}
{ some newer Debian have the crt*.o files at uncommon locations, { some newer Debian have the crt*.o files at uncommon locations,
for other arm flavours, this cannot hurt } for other arm flavours, this cannot hurt }
{$ifdef FPC_ARMHF} if target_info.abi=abi_eabihf then
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/arm-linux-gnueabihf',true); begin
{$endif FPC_ARMHF} LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/arm-linux-gnueabihf',true);
{$ifdef FPC_ARMEL} LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib/arm-linux-gnueabihf',true);
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/arm-linux-gnueabi',true); end;
{$endif} if target_info.abi=abi_eabi then
begin
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/arm-linux-gnueabi',true);
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/lib/arm-linux-gnueabi',true);
end;
{$endif arm} {$endif arm}
{$ifdef x86_64} {$ifdef x86_64}
LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/x86_64-linux-gnu',true); LibrarySearchPath.AddLibraryPath(sysrootpath,'=/usr/lib/x86_64-linux-gnu',true);