paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-15 20:39:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 44002 from trunk:

Browse Source 
* android: Changed additions to the linker script to prevent misalignment of the .data section. It fixes crash when linking using recent versions of LD where the "relro" option is default. Issue .
* android: Always pass "-z relro" to the linker.
........

git-svn-id: branches/fixes_3_2@44044 -
This commit is contained in:
yury 2020-01-26 22:08:13 +00:00
parent eeb8c747d5
commit abe5757702
1 changed files with 2 additions and 2 deletions

4
compiler/systems/t_android.pas
View File

@ -168,7 +168,7 @@ 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 -z max-page-size=0x1000 -z common-page-size=0x1000 -z noexecstack -z now --build-id $OPT -L. -T $RES -o $EXE';
s:='ld -z max-page-size=0x1000 -z common-page-size=0x1000 -z noexecstack -z now -z relro --build-id $OPT -L. -T $RES -o $EXE';
ExeCmd[1]:=s + ' --entry=_start';
DllCmd[1]:=s + ' -shared -soname $SONAME';
DllCmd[2]:='strip --strip-unneeded $EXE';
@ -354,7 +354,7 @@ begin
add(' KEEP (*(.fpc .fpc.n_version .fpc.n_links))');
add(' }');
add('}');
add('INSERT BEFORE .data1');
add('INSERT AFTER .data1');
// Define different aliases for normal and JNI libraries
if FJNIOnLoadName <> '' then