From: Carlos Laviola <claviola@debian.org>
Date: Mon, 13 Oct 2014 19:16:54 +0000 (+0000)
Subject: kfreebsd-amd64_bootstrap
X-Git-Tag: archive/raspbian/3.0.0+dfsg-11+rpi1~1^2^2^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=3346edcd2fc1238c1e9a4b2c5ec24553b68ddb83;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 4ef4c82b..b3c33517 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 5a1dd616..ca824a39 100644
--- a/fpcsrc/rtl/bsd/sysos.inc
+++ b/fpcsrc/rtl/bsd/sysos.inc
@@ -23,7 +23,7 @@ type libcint=longint;
      plibcint=^libcint;
 
 {$ifdef FreeBSD} // 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 9984627a..374ba73d 100644
--- a/fpcsrc/rtl/unix/initc.pp
+++ b/fpcsrc/rtl/unix/initc.pp
@@ -56,7 +56,7 @@ function geterrnolocation: pcint; cdecl;external clib name '__errno_location';
 {$endif}
 
 {$ifdef FreeBSD} // 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