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 b35a78aecbd2360416f511d02b360d113ea1d959..2166ca59923bed4500b746424955c8ff40789388 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 cd0be3b7171a83c718aadca4dde653268fdc3bfb..b6a1ec4eaa3a821ec2d6a1805760079a8becf748 100644 (file)
--- 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 627d96124b05cc36b2cf36bad8fb78680df8e7fc..9a692a6c442ecb5cb4cb72737a0c8d5d931b66b2 100644 (file)
--- 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