diff options
Diffstat (limited to 'lang/fpc/files')
| -rw-r--r-- | lang/fpc/files/patch-compiler-systems-t_bsd.pas | 36 | ||||
| -rw-r--r-- | lang/fpc/files/patch-compiler-utils_samplecfg | 6 |
2 files changed, 3 insertions, 39 deletions
diff --git a/lang/fpc/files/patch-compiler-systems-t_bsd.pas b/lang/fpc/files/patch-compiler-systems-t_bsd.pas deleted file mode 100644 index 527acf812024..000000000000 --- a/lang/fpc/files/patch-compiler-systems-t_bsd.pas +++ /dev/null @@ -1,36 +0,0 @@ ---- compiler/systems/t_bsd.pas 2012-04-22 14:47:06.000000000 -0500 -+++ compiler/systems/t_bsd.pas 2013-10-01 21:07:10.000000000 -0500 -@@ -484,10 +484,19 @@ - if linklibc and - not IsDarwin Then - begin -- if librarysearchpath.FindFile('crtbegin.o',false,s) then -- LinkRes.AddFileName(s); - if librarysearchpath.FindFile('crti.o',false,s) then - LinkRes.AddFileName(s); -+ if cs_create_pic in current_settings.moduleswitches then -+ begin -+ if librarysearchpath.FindFile('crtbeginS.o',false,s) then -+ LinkRes.AddFileName(s); -+ end -+ else -+ if (cs_link_staticflag in current_settings.globalswitches) and -+ librarysearchpath.FindFile('crtbeginT.o',false,s) then -+ LinkRes.AddFileName(s) -+ else if librarysearchpath.FindFile('crtbegin.o',false,s) then -+ LinkRes.AddFileName(s); - end; - { main objectfiles } - while not ObjectFiles.Empty do -@@ -572,7 +581,10 @@ - if linklibc and - not IsDarwin Then - begin -- Fl1:=librarysearchpath.FindFile('crtend.o',false,s1); -+ if cs_create_pic in current_settings.moduleswitches then -+ Fl1:=librarysearchpath.FindFile('crtendS.o',false,s1) -+ else -+ Fl1:=librarysearchpath.FindFile('crtend.o',false,s1); - Fl2:=librarysearchpath.FindFile('crtn.o',false,s2); - if Fl1 or Fl2 then - begin diff --git a/lang/fpc/files/patch-compiler-utils_samplecfg b/lang/fpc/files/patch-compiler-utils_samplecfg index 68a4b2f1ae24..901f71d8cf35 100644 --- a/lang/fpc/files/patch-compiler-utils_samplecfg +++ b/lang/fpc/files/patch-compiler-utils_samplecfg @@ -1,6 +1,6 @@ ---- compiler/utils/samplecfg 2011-12-10 07:59:24.000000000 -0500 -+++ compiler/utils/samplecfg 2012-02-23 15:47:13.000000000 -0500 -@@ -37,8 +37,8 @@ +--- compiler/utils/samplecfg.orig 2015-08-06 19:47:53 UTC ++++ compiler/utils/samplecfg +@@ -38,8 +38,8 @@ sysfpdir=$sysfpdirbase2/text # Detect if we have write permission in sysdir. if [ -w "$sysdir" ] ; then echo Write permission in $sysdir. |