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 4ef4c82b876838b6e97c1af2d0d8491322889bc3..b3c335173bbde029a1decbdeb98e35b915eb1684 100644 (file)
--- 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 5a1dd61666ced6c444bc709e3449f877cd73690b..ca824a396bc0ff0b4b398a9204a8e9ace9e14d78 100644 (file)
--- 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 9984627a02b19b71ce74f91de4224f9cd4c243be..374ba73d5c489bf655f010cfbb99cae9399a3214 100644 (file)
--- 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