Control: tag -1 patch

The patch fpc-arm64-part2.patch is WRONG! See
http://lists.freepascal.org/pipermail/fpc-devel/2015-October/036024.html

Please replace it with fpc-aarch64-cprt0.patch, which includes a fix
for i386 (see bug #800811).

Here's what I tested:

dpkg-source -x fpc_3.0.0~rc1+dfsg-1.dsc 
cd fpc-3.0.0~rc1+dfsg/
zcat ../fpc-arm64-part1.patch.gz | patch -p1
cat ../fpc-aarch64-cprt0.patch | patch -p1
cat ../fpc-arm64-part3.patch | patch -p1
cat ../fpc-arm64-part4.patch | patch -p1
FPCMAKE=/tmp/bin/fpcmake PP=/tmp/bin/ppca64 dpkg-buildpackage -B -d
--- a/fpcsrc/compiler/systems/t_linux.pas
+++ b/fpcsrc/compiler/systems/t_linux.pas
@@ -149,6 +149,14 @@
   if not Dontlinkstdlibpath Then
     LibrarySearchPath.AddPath(sysrootpath,'/usr/lib/x86_64-linux-gnu',true);
 {$endif x86_64}
+{$ifdef i386}
+  if not Dontlinkstdlibpath Then
+    LibrarySearchPath.AddPath(sysrootpath,'/usr/lib/i386-linux-gnu',true);
+{$endif i386}
+{$ifdef aarch64}
+  if not Dontlinkstdlibpath Then
+    LibrarySearchPath.AddPath(sysrootpath,'/usr/lib/aarch64-linux-gnu',true);
+{$endif aarch64}
 end;
 
 {$ifdef m68k}
--- a/fpcsrc/rtl/linux/aarch64/cprt0.as
+++ b/fpcsrc/rtl/linux/aarch64/cprt0.as
@@ -50,16 +50,6 @@
 	/* This should never happen */
 	b	abort
 
-	.globl	_init
-	.type	_init,#function
-_init:
-	ret
-
-	.globl	_fini
-	.type	_fini,#function
-_fini:
-	ret
-
 	.globl	_haltproc
 	.type	_haltproc,#function
 _haltproc:

Reply via email to