From: Pascal Packaging Team <pkg-pascal-devel@lists.alioth.debian.org>
Date: Wed, 8 Feb 2017 09:53:35 +0000 (+0000)
Subject: kfreebsd-amd64_bootstrap
X-Git-Tag: archive/raspbian/3.0.0+dfsg-11+rpi1^2~34
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=08d74b7f2c803599538f0fc596b9e592951c0ba4;p=fpc.git

kfreebsd-amd64_bootstrap


Gbp-Pq: Name kfreebsd-amd64_bootstrap.patch
---

diff --git a/fpcsrc/compiler/systems/t_bsd.pas b/fpcsrc/compiler/systems/t_bsd.pas
index b35a78ae..2166ca59 100644
--- a/fpcsrc/compiler/systems/t_bsd.pas
+++ b/fpcsrc/compiler/systems/t_bsd.pas
@@ -187,13 +187,8 @@ begin
        DllCmd[2]:='strip --strip-unneeded $EXE'
      else
        DllCmd[2]:='strip -x $EXE';
-     { OpenBSD seems to use a wrong dynamic linker by default }
-     if target_info.system in systems_openbsd then
-      DynamicLinker:='/usr/libexec/ld.so'
-     else if target_info.system in systems_netbsd then
-      DynamicLinker:='/usr/libexec/ld.elf_so'
-     else
-       DynamicLinker:='';
+     { On Debian systems it seems we have to set the dynamicLinker }
+     DynamicLinker:='/lib/ld-kfreebsd-x86-64.so.1';
    end;
 end;
 
diff --git a/fpcsrc/rtl/bsd/sysos.inc b/fpcsrc/rtl/bsd/sysos.inc
index cd0be3b7..b6a1ec4e 100644
--- a/fpcsrc/rtl/bsd/sysos.inc
+++ b/fpcsrc/rtl/bsd/sysos.inc
@@ -23,7 +23,7 @@ type libcint=longint;
      plibcint=^libcint;
 
 {$if defined(FreeBSD) or defined(DragonFly)} // tested on x86
-function geterrnolocation: Plibcint; cdecl;external clib name '__error';
+function geterrnolocation: Plibcint; cdecl;external clib name '__errno_location';
 {$else}
 {$ifdef NetBSD} // from a sparc dump.
 function geterrnolocation: Plibcint; cdecl;external clib name '__errno';
diff --git a/fpcsrc/rtl/unix/initc.pp b/fpcsrc/rtl/unix/initc.pp
index 627d9612..9a692a6c 100644
--- a/fpcsrc/rtl/unix/initc.pp
+++ b/fpcsrc/rtl/unix/initc.pp
@@ -60,7 +60,7 @@ function geterrnolocation: pcint; cdecl;external clib name '__errno';
 {$endif}
 
 {$if defined(FreeBSD) or defined(DragonFly)} // tested on x86
-function geterrnolocation: pcint; cdecl;external clib name '__error';
+function geterrnolocation: pcint; cdecl;external clib name '__errno_location';
 {$endif}
 
 {$ifdef OpenBSD} // tested on x86