* riscv64-linux: generate PIC for all units as it is required for shared libraries

git-svn-id: https://svn.freepascal.org/svn/fpc/trunk@48948 3ad0048d-3df7-0310-abae-a5850022a9f2
author: florian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2> 2021-03-13 16:33:31 +0000
committer: florian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2> 2021-03-13 16:33:31 +0000
commit: f4b984d2356cc47030adc7378858c428a399a589 (patch)
tree: 5478024647b68ff414045a087325b219886ad07d
parent: 6c91aee6685d5f1d8e6faf2d536ca9aadcc91e25 (diff)
download: fpc-f4b984d2356cc47030adc7378858c428a399a589.tar.gz
6 files changed, 171 insertions, 169 deletions
diff --git a/Makefile b/Makefile
index eec3486abd..da2e0ee429 100644
--- a/Makefile
+++ b/Makefile
@@ -1692,7 +1692,7 @@ ifdef CREATESHARED
 override FPCOPT+=-Cg
 endif
 ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),)
-ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)
+ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel riscv64),)
 override FPCOPT+=-Cg
 endif
 endif
diff --git a/compiler/systems/i_linux.pas b/compiler/systems/i_linux.pas
index ac384ebd0d..8d43330105 100644
--- a/compiler/systems/i_linux.pas
+++ b/compiler/systems/i_linux.pas
@@ -1177,7 +1177,7 @@ unit i_linux;
             system       : system_riscv64_linux;
             name         : 'Linux for RISC-V 64';
             shortname    : 'Linux';
-            flags        : [tf_needs_symbol_size,tf_smartlink_sections,tf_needs_dwarf_cfi,
+            flags        : [tf_needs_symbol_size,tf_library_needs_pic,tf_smartlink_sections,tf_needs_dwarf_cfi,
                             tf_needs_symbol_type,tf_files_case_sensitive,
                             tf_requires_proper_alignment,tf_has_winlike_resources,
                             tf_supports_hidden_symbols
diff --git a/rtl/Makefile b/rtl/Makefile
index a47a10caa4..ac60065d3a 100644
--- a/rtl/Makefile
+++ b/rtl/Makefile
@@ -1525,7 +1525,7 @@ ifdef CREATESHARED
 override FPCOPT+=-Cg
 endif
 ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),)
-ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)
+ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel riscv64),)
 override FPCOPT+=-Cg
 endif
 endif
diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile
index 4db1d00e38..c40ae83c96 100644
--- a/rtl/linux/Makefile
+++ b/rtl/linux/Makefile
@@ -3772,7 +3772,7 @@ ifdef CREATESHARED
 override FPCOPT+=-Cg
 endif
 ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),)
-ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)
+ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel riscv64),)
 override FPCOPT+=-Cg
 endif
 endif
diff --git a/utils/fpcm/fpcmake.inc b/utils/fpcm/fpcmake.inc
index a0a5341c05..0525342e08 100644
--- a/utils/fpcm/fpcmake.inc
+++ b/utils/fpcm/fpcmake.inc
@@ -1579,8 +1579,8 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '# on unix-like systems'#010+
   'ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linu'+
   'x solaris),)'#010+
-  'ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)'#010+
-  'override FPC','OPT+=-Cg'#010+
+  'ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel riscv64),)'#010+
+  'over','ride FPCOPT+=-Cg'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -1594,7 +1594,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'ifdef GCCLIBDIR'#010+
   'override FPCOPT+=-Fl$(GCCLIBDIR)'#010+
   'ifdef FPCMAKEGCCLIBDIR'#010+
-  'override FPCMAKEOPT+=-Fl$(FPCM','AKEGCCLIBDIR)'#010+
+  'override FPCMAKEOPT+=-','Fl$(FPCMAKEGCCLIBDIR)'#010+
   'else'#010+
   'override FPCMAKEOPT+=-Fl$(GCCLIBDIR)'#010+
   'endif'#010+
@@ -1607,7 +1607,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '[command_end]'#010+
   '# Add commandline options last so they can override'#010+
   'ifdef OPT'#010+
-  'override FPCOPT+=$(OP','T)'#010+
+  'override FPCO','PT+=$(OPT)'#010+
   'endif'#010+
   #010+
   '# Override options to compile the fpmake-binary with command-line opti'+
@@ -1617,8 +1617,8 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'endif'#010+
   #010+
   '# Add defines from FPCOPTDEF to FPCOPT'#010+
-  'ifdef FPCOPTDEF'#010+
-  'o','verride FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+
+  'ifdef FPC','OPTDEF'#010+
+  'override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))'#010+
   'endif'#010+
   #010+
   '# Was a config file specified ?'#010+
@@ -1629,7 +1629,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '# Use the environment to pass commandline options?'#010+
   'ifdef USEENV'#010+
   'override FPCEXTCMD:=$(FPCOPT)'#010+
-  'override FPC','OPT:=!FPCEXTCMD'#010+
+  'over','ride FPCOPT:=!FPCEXTCMD'#010+
   'export FPCEXTCMD'#010+
   'endif'#010+
   #010+
@@ -1641,7 +1641,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'endif'#010+
   #010+
   'ifdef ACROSSCOMPILE'#010+
-  'override ','FPCOPT+=$(CROSSOPT)'#010+
+  'o','verride FPCOPT+=$(CROSSOPT)'#010+
   'endif'#010+
   #010+
   '# Compiler commandline'#010+
@@ -1650,7 +1650,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '# also call ppas if with command option -s'#010+
   '# but only if the FULL_SOURCE and FULL_TARGET are equal'#010+
   '# or if -sh is used'#010+
-  'ifneq (,$(findstring -sh ',',$(COMPILER)))'#010+
+  'ifneq (,$(findstr','ing -sh ,$(COMPILER)))'#010+
   'UseEXECPPAS=1'#010+
   'endif'#010+
   'ifneq (,$(findstring -s ,$(COMPILER)))'#010+
@@ -1664,7 +1664,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'ifdef RUNBATCH'#010+
   'EXECPPAS:=@$(RUNBATCH) $(PPAS)'#010+
   'else'#010+
-  'EXECPPAS:=@$','(PPAS)'#010+
+  'EXEC','PPAS:=@$(PPAS)'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -1676,8 +1676,8 @@ const fpcmakeini : array[0..256,1..240] of char=(
   #010+
   '.PHONY: fpc_loaders'#010+
   #010+
-  'ifneq ($(TARGET_LOADERS),)'#010+
-  'overri','de ALLTARGET+=fpc_loaders'#010+
+  'ifneq ($(TARGET_LOADERS),',')'#010+
+  'override ALLTARGET+=fpc_loaders'#010+
   'override CLEANTARGET+=fpc_loaders_clean'#010+
   'override INSTALLTARGET+=fpc_loaders_install'#010+
   #010+
@@ -1685,8 +1685,8 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'endif'#010+
   #010+
   '%$(OEXT): %$(LOADEREXT)'#010+
-  'ifdef COMPILER_UNITTARGETDIR'#010+
-  '       ',' $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+
+  'ifdef COMPILER_UNITTARGETDIR',#010+
+  '        $(AS) -o $(COMPILER_UNITTARGETDIR)/$*$(OEXT) $<'#010+
   'else'#010+
   '        $(AS) -o $*$(OEXT) $<'#010+
   'endif'#010+
@@ -1695,7 +1695,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   #010+
   'fpc_loaders_clean:'#010+
   'ifdef COMPILER_UNITTARGETDIR'#010+
-  '        -$(DEL) $(addprefix $(COMPILER_UNITTA','RGETDIR)/,$(LOADEROFILE'+
+  '        -$(DEL) $(addprefix $(COMPILE','R_UNITTARGETDIR)/,$(LOADEROFILE'+
   'S))'#010+
   'else'#010+
   '        -$(DEL) $(LOADEROFILES)'#010+
@@ -1705,7 +1705,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
   'ifdef COMPILER_UNITTARGETDIR'#010+
   '        $(INSTALL) $(addprefix $(COMPILER_UNITTARGETDIR)/,$(LOADEROFIL'+
-  'ES)) $(INSTAL','L_UNITDIR)'#010+
+  'ES)) ','$(INSTALL_UNITDIR)'#010+
   'else'#010+
   '        $(INSTALL) $(LOADEROFILES) $(INSTALL_UNITDIR)'#010+
   'endif'#010+
@@ -1714,17 +1714,18 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '[unitrules]'#010+
   '#####################################################################'#010+
   '# Units'#010+
-  '#####################################################################'#010+
+  '################################################################','####'+
+  '#'#010+
   #010+
-  '.','PHONY: fpc_units'#010+
+  '.PHONY: fpc_units'#010+
   #010+
   'ifneq ($(TARGET_UNITS)$(TARGET_IMPLICITUNITS),)'#010+
   'override ALLTARGET+=fpc_units'#010+
   #010+
   'override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))'#010+
   'override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITU'+
-  'NITS))'#010+
-  'overr','ide INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
+  'NITS','))'#010+
+  'override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
   'override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)'#010+
   'endif'#010+
   #010+
@@ -1732,7 +1733,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   #010+
   #010+
   '[exerules]'#010+
-  '##########################################','##########################'+
+  '##################################','##################################'+
   '#'#010+
   '# Exes'#010+
   '#####################################################################'#010+
@@ -1742,23 +1743,23 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '# Programs are not needed for a cross installation'#010+
   'ifndef CROSSINSTALL'#010+
   'ifneq ($(TARGET_PROGRAMS),)'#010+
-  'override EXEFILES','=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
+  'override ','EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS))'#010+
   'override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffi'+
   'x $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuf'+
-  'fix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IM','PORTLIBPREF'+
+  'fix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addpre','fix $(IMPORTLIBPREF'+
   'IX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS)))'#010+
   'override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS))'#010+
   #010+
   'override ALLTARGET+=fpc_exes'#010+
   'override INSTALLEXEFILES+=$(EXEFILES)'#010+
-  'override CLEANEXEFILES+=$(EXEFILES) $(EXE','OFILES)'#010+
+  'override CLEANEXEFILES+=$(EXEFILE','S) $(EXEOFILES)'#010+
   'override CLEANEXEDBGFILES+=$(EXEDBGFILES)'#010+
   'ifeq ($(OS_TARGET),os2)'#010+
   'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
   'endif'#010+
   'ifeq ($(OS_TARGET),emx)'#010+
-  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGRAMS))'#010+
-  'en','dif'#010+
+  'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_PROGR','AMS))'#010+
+  'endif'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -1768,7 +1769,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '[rstrules]'#010+
   '#####################################################################'#010+
   '# Resource strings'#010+
-  '###################################################','#################'+
+  '###########################################','#########################'+
   '#'#010+
   #010+
   'ifdef TARGET_RSTS'#010+
@@ -1780,32 +1781,31 @@ const fpcmakeini : array[0..256,1..240] of char=(
   #010+
   '[examplerules]'#010+
   '#####################################################################'#010+
-  '# Examples'#010+
-  '#####','###############################################################'+
-  '#'#010+
+  '# Exampl','es'#010+
+  '#####################################################################'#010+
   #010+
   '.PHONY: fpc_examples'#010+
   #010+
   'ifneq ($(TARGET_EXAMPLES),)'#010+
   'HASEXAMPLES=1'#010+
   'override EXAMPLESOURCEFILES=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPL'+
-  'ES)) $(addsuffix .pas,$(TARGET_EXAMPLES)',') $(addsuffix .lpr,$(TARGET_'+
+  'ES)) $(addsuffix .pas,$(TARGET_E','XAMPLES)) $(addsuffix .lpr,$(TARGET_'+
   'EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))'#010+
   'override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))'#010+
   'override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(adds'+
-  'uffix $(LTOEXT),$(TARGET_EXA','MPLES)) $(addprefix $(STATICLIBPREFIX),$'+
+  'uffix $(LTOEXT),$(TA','RGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$'+
   '(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES))) $(addprefix $(IMPORTLI'+
   'BPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))'#010+
-  'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAMPLES))'+
+  'override EXAMPLEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_EXAM','PLES'+
+  '))'#010+
   #010+
-  #010,
   'override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)'#010+
   'override CLEANEXEDBGFILES+=$(EXAMPLEDBGFILES)'#010+
   'ifeq ($(OS_TARGET),os2)'#010+
   'override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
   'endif'#010+
   'ifeq ($(OS_TARGET),emx)'#010+
-  'override CLEANEX','EFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
+  'override',' CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))'#010+
   'endif'#010+
   'endif'#010+
   'ifneq ($(TARGET_EXAMPLEDIRS),)'#010+
@@ -1817,15 +1817,15 @@ const fpcmakeini : array[0..256,1..240] of char=(
   #010+
   #010+
   '[compilerules]'#010+
-  '##################################','##################################'+
+  '##########################','##########################################'+
   '#'#010+
   '# General compile rules'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_all fpc_smart fpc_debug fpc_release fpc_shared'#010+
   #010+
-  '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)'#010+
-  '     ','   @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
+  '$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGE','T)'#010+
+  '        @$(ECHOREDIR) Compiled > $(FPCMADE)'#010+
   #010+
   'fpc_all: $(FPCMADE)'#010+
   #010+
@@ -1838,7 +1838,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'fpc_release:'#010+
   '        $(MAKE) all RELEASE=1'#010+
   #010+
-  '# General compile rules, available fo','r both possible .pp and .pas ex'+
+  '# General compile rules, avai','lable for both possible .pp and .pas ex'+
   'tensions'#010+
   #010+
   '.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) $(LTOEXT) .pas .lpr .dpr .pp .r'+
@@ -1848,7 +1848,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '        $(MKDIRTREE) $(COMPILER_UNITTARGETDIR)'#010+
   #010+
   '$(COMPILER_TARGETDIR):'#010+
-  '        $(MKDIRTREE) $(','COMPILER_TARGETDIR)'#010+
+  '        $(MKDIR','TREE) $(COMPILER_TARGETDIR)'#010+
   #010+
   '%$(PPUEXT): %.pp'#010+
   '        $(COMPILER) $<'#010+
@@ -1863,7 +1863,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '        $(EXECPPAS)'#010+
   #010+
   '%$(EXEEXT): %.pas'#010+
-  '        $(COMPILE','R) $<'#010+
+  '        $','(COMPILER) $<'#010+
   '        $(EXECPPAS)'#010+
   #010+
   '%$(EXEEXT): %.lpr'#010+
@@ -1877,19 +1877,20 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '%.res: %.rc'#010+
   '        windres -i $< -o $@'#010+
   #010+
-  '# Search paths for .ppu, .pp, .pas, .lpr, .dpr'#010+
-  'v','path %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
+  '# Search paths for .ppu, .pp, .pas, .lpr',', .dpr'#010+
+  'vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
   'vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
   'vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
   'vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)'#010+
-  'vpath %.inc $(','COMPILER_INCLUDEDIR)'#010+
+  'vpath ','%.inc $(COMPILER_INCLUDEDIR)'#010+
   'vpath %$(OEXT) $(COMPILER_UNITTARGETDIR)'#010+
   'vpath %$(LTOEXT) $(COMPILER_UNITTARGETDIR)'#010+
   'vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)'#010+
   #010+
   '[sharedrules]'#010+
-  '#####################################################################'#010+
-  '# Libra','ry'#010+
+  '#####################################################################',
+  #010+
+  '# Library'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_shared'#010+
@@ -1901,7 +1902,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'endif'#010+
   #010+
   'ifndef SHARED_LIBNAME'#010+
-  'SHARED_LIBNAME=','$(PACKAGE_NAME)'#010+
+  'SHARED_','LIBNAME=$(PACKAGE_NAME)'#010+
   'endif'#010+
   #010+
   'ifndef SHARED_FULLNAME'#010+
@@ -1911,7 +1912,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   #010+
   '# Default sharedlib units are all unit objects'#010+
   'ifndef SHARED_LIBUNITS'#010+
-  'SHARED_LIBUNITS:=$(TARGET_UNI','TS) $(TARGET_IMPLICITUNITS)'#010+
+  'SHARED_LIBUNITS:=$(TA','RGET_UNITS) $(TARGET_IMPLICITUNITS)'#010+
   'override SHARED_LIBUNITS:=$(filter-out $(INSTALL_BUILDUNIT),$(SHARED_L'+
   'IBUNITS))'#010+
   'endif'#010+
@@ -1919,16 +1920,16 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'fpc_shared:'#010+
   'ifdef HASSHAREDLIB'#010+
   '        $(MAKE) all CREATESHARED=1 LINKSHARED=1 CREATESMART=1'#010+
-  'ifneq ($(SHARED_BUILD),n)'#010+
-  '      ','  $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR)'+
-  ' -o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)'#010+
+  'ifneq ($(SHARED_BUILD),n',')'#010+
+  '        $(PPUMOVE) -q $(SHARED_LIBUNITS) -i$(COMPILER_UNITTARGETDIR) -'+
+  'o$(SHARED_FULLNAME) -d$(COMPILER_UNITTARGETDIR) -P$(BINUTILSPREFIX)'#010+
   'endif'#010+
   'else'#010+
   '        @$(ECHO) Shared Libraries not supported'#010+
   'endif'#010+
   #010+
   'fpc_shared_install:'#010+
-  'ifneq ($(SHARED_BUILD)',',n)'#010+
+  'ifneq ($(SHARE','D_BUILD),n)'#010+
   'ifneq ($(SHARED_LIBUNITS),)'#010+
   'ifneq ($(wildcard $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME)),)'#010+
   '        $(INSTALL) $(COMPILER_UNITTARGETDIR)/$(SHARED_FULLNAME) $(INST'+
@@ -1938,7 +1939,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'endif'#010+
   #010+
   '[installrules]'#010+
-  '#######################','#############################################'+
+  '###############','#####################################################'+
   '#'#010+
   '# Install rules'#010+
   '#####################################################################'#010+
@@ -1946,7 +1947,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '.PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall'#010+
   #010+
   'ifdef INSTALL_UNITS'#010+
-  'override INSTALLPPUFILES+=$(','addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
+  'override INSTALLPPUF','ILES+=$(addsuffix $(PPUEXT),$(INSTALL_UNITS))'#010+
   'endif'#010+
   #010+
   'ifdef INSTALL_BUILDUNIT'#010+
@@ -1955,28 +1956,28 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'endif'#010+
   #010+
   'ifdef INSTALLPPUFILES'#010+
-  '# Avoid getting the same name twice as some install E','XE fail'#010+
+  '# Avoid getting the same name twice as some i','nstall EXE fail'#010+
   '# in this case, happends for instance for OS/2 target'#010+
   'ifneq ($(IMPORTLIBPREFIX)-$(STATICLIBEXT),$(STATICLIBPREFIX)-$(STATICL'+
   'IBEXT))'#010+
   'override INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFI'+
-  'LES)) $(subst $(PPUEXT),$(LTOE','XT),$(INSTALLPPUFILES)) $(addprefix $('+
+  'LES)) $(subst $(PPUEXT','),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+
   'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+
   ') $(addprefix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(I'+
   'NSTALLPPUFILES)))'#010+
   'else'#010+
-  'override INSTALLPPULINKFILES:=$(subst $','(PPUEXT),$(OEXT),$(INSTALLPPU'+
+  'override INSTALLPPULINKFILES:=$','(subst $(PPUEXT),$(OEXT),$(INSTALLPPU'+
   'FILES)) $(subst $(PPUEXT),$(LTOEXT),$(INSTALLPPUFILES)) $(addprefix $('+
   'STATICLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(INSTALLPPUFILES))'+
   ')'#010+
   'endif'#010+
   #010+
   'ifneq ($(UNITTARGETDIRPREFIX),)'#010+
-  'override INSTALLPPUFILENAMES:=','$(notdir $(INSTALLPPUFILES))'#010+
+  'override INSTALLPPUFIL','ENAMES:=$(notdir $(INSTALLPPUFILES))'#010+
   'override INSTALLPPULINKFILENAMES:=$(notdir $(INSTALLPPULINKFILES))'#010+
   'override INSTALLPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(INSTALLP'+
   'PUFILENAMES))'#010+
-  'override INSTALLPPULINKFILES=$(wildcard $(addprefix $(UNITTA','RGETDIRP'+
+  'override INSTALLPPULINKFILES=$(wildcard $(addprefix ','$(UNITTARGETDIRP'+
   'REFIX),$(INSTALLPPULINKFILENAMES)))'#010+
   'endif'#010+
   '# Implicitly install Package.fpc'#010+
@@ -1985,7 +1986,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   #010+
   'ifdef INSTALLEXEFILES'#010+
   'ifneq ($(TARGETDIRPREFIX),)'#010+
-  'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(notdi','r $('+
+  'override INSTALLEXEFILES:=$(addprefix $(TARGETDIRPREFIX)',',$(notdir $('+
   'INSTALLEXEFILES)))'#010+
   'endif'#010+
   'endif'#010+
@@ -1996,13 +1997,13 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '        $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)'#010+
   'endif'#010+
   'ifdef INSTALL_CREATEPACKAGEFPC'#010+
-  'ifdef FPCMAKE'#010+
-  '# I','f the fpcpackage variable is set then create and install Package.'+
-  'fpc,'#010+
+  'ifdef FPC','MAKE'#010+
+  '# If the fpcpackage variable is set then create and install Package.fp'+
+  'c,'#010+
   '# a safety check is done if Makefile.fpc is available'#010+
   'ifdef PACKAGE_VERSION'#010+
   'ifneq ($(wildcard Makefile.fpc),)'#010+
-  '        $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.','fpc'#010+
+  '        $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) M','akefile.fpc'#010+
   '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
   '        $(INSTALL) Package.fpc $(INSTALL_UNITDIR)'#010+
   'endif'#010+
@@ -2012,14 +2013,14 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'ifdef INSTALLPPUFILES'#010+
   '        $(MKDIR) $(INSTALL_UNITDIR)'#010+
   '        $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)'#010+
-  'ifneq ($(IN','STALLPPULINKFILES),)'#010+
+  'ifn','eq ($(INSTALLPPULINKFILES),)'#010+
   '        $(INSTALL) $(INSTALLPPULINKFILES) $(INSTALL_UNITDIR)'#010+
   'endif'#010+
   'ifneq ($(wildcard $(LIB_FULLNAME)),)'#010+
   '        $(MKDIR) $(INSTALL_LIBDIR)'#010+
   '        $(INSTALL) $(LIB_FULLNAME) $(INSTALL_LIBDIR)'#010+
   'ifdef inUnix'#010+
-  '        ln -sf',' $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
+  '      ','  ln -sf $(LIB_FULLNAME) $(INSTALL_LIBDIR)/$(LIB_NAME)'#010+
   'endif'#010+
   'endif'#010+
   'endif'#010+
@@ -2029,7 +2030,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'endif'#010+
   #010+
   'fpc_sourceinstall: distclean'#010+
-  '        $(MKDIR) $(INSTALL_S','OURCEDIR)'#010+
+  '        $(MKDIR) $(I','NSTALL_SOURCEDIR)'#010+
   '        $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR)'#010+
   #010+
   'fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(T'+
@@ -2037,7 +2038,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'ifdef HASEXAMPLES'#010+
   '        $(MKDIR) $(INSTALL_EXAMPLEDIR)'#010+
   'endif'#010+
-  'ifdef EXAMPLESOURCEFIL','ES'#010+
+  'ifdef EXAMPLES','OURCEFILES'#010+
   '        $(COPY) $(EXAMPLESOURCEFILES) $(INSTALL_EXAMPLEDIR)'#010+
   'endif'#010+
   'ifdef TARGET_EXAMPLEDIRS'#010+
@@ -2046,7 +2047,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'endif'#010+
   #010+
   '[distinstallrules]'#010+
-  '########################################','############################'+
+  '################################','####################################'+
   '#'#010+
   '# Dist Install'#010+
   '#####################################################################'#010+
@@ -2057,16 +2058,15 @@ const fpcmakeini : array[0..256,1..240] of char=(
   #010+
   #010+
   '[zipinstallrules]'#010+
-  '#######################################','#############################'+
+  '###############################','#####################################'+
   '#'#010+
   '# Zip'#010+
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_zipinstall fpc_zipsourceinstall fpc_zipexampleinstall'#010+
   #010+
-  '# Temporary path to pack a file, can only use a single deep'#010+
-  '# sub','dir, because the deltree can'#039't see the whole tree to remove'+
-  #010+
+  '# Temporary path to pack a file, can only use a single de','ep'#010+
+  '# subdir, because the deltree can'#039't see the whole tree to remove'#010+
   'ifndef PACKDIR'#010+
   'ifndef inUnix'#010+
   'PACKDIR=$(BASEDIR)/../fpc-pack'#010+
@@ -2077,7 +2077,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   #010+
   '# Maybe create default zipname from packagename'#010+
   'ifndef ZIPNAME'#010+
-  'ifdef DIST_ZIPNAM','E'#010+
+  'ifdef DIS','T_ZIPNAME'#010+
   'ZIPNAME=$(DIST_ZIPNAME)'#010+
   'else'#010+
   'ZIPNAME=$(PACKAGE_NAME)'#010+
@@ -2091,9 +2091,9 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '# ZipTarget'#010+
   'ifndef ZIPTARGET'#010+
   'ifdef DIST_ZIPTARGET'#010+
-  'ZIPTARGET=DIST_ZIPTARGET'#010+
+  'ZIPTARGET=DIST_ZIPTARGET',#010+
   'else'#010+
-  'ZI','PTARGET=install'#010+
+  'ZIPTARGET=install'#010+
   'endif'#010+
   'endif'#010+
   #010+
@@ -2109,7 +2109,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'USEZIPWRAPPER=1'#010+
   'endif'#010+
   #010+
-  '# We need to be able to run in the current OS so ','fix'#010+
+  '# We need to be able to run in the curren','t OS so fix'#010+
   '# the path separator'#010+
   'ifdef USEZIPWRAPPER'#010+
   'ZIPPATHSEP=$(PATHSEP)'#010+
@@ -2119,13 +2119,13 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'endif'#010+
   #010+
   '# Create commands to create the zip/tar file'#010+
-  'ZIPCMD_CDPACK:=cd $(subst /,$(ZIP','PATHSEP),$(PACKDIR))'#010+
+  'ZIPCMD_CDPACK:=cd $(subst',' /,$(ZIPPATHSEP),$(PACKDIR))'#010+
   'ZIPCMD_CDBASE:=cd $(subst /,$(ZIPPATHSEP),$(BASEDIR))'#010+
   'ifdef USETAR'#010+
   'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME)$(TAREXT)'#010+
   'ZIPCMD_ZIP:=$(TARPROG) c$(TAROPT)f $(ZIPDESTFILE) *'#010+
   'else'#010+
-  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FULLZIPNAME',')$(ZIPEXT)'#010+
+  'ZIPDESTFILE:=$(DIST_DESTDIR)/$(FUL','LZIPNAME)$(ZIPEXT)'#010+
   'ZIPCMD_ZIP:=$(subst /,$(ZIPPATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDES'+
   'TFILE) *'#010+
   'endif'#010+
@@ -2133,13 +2133,13 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'fpc_zipinstall:'#010+
   '        $(MAKE) $(ZIPTARGET) INSTALL_PREFIX=$(PACKDIR) ZIPINSTALL=1'#010+
   '        $(MKDIR) $(DIST_DESTDIR)'#010+
-  '        $(DEL) $(ZIPDESTFI','LE)'#010+
+  '        $(DEL) $(Z','IPDESTFILE)'#010+
   'ifdef USEZIPWRAPPER'#010+
   '# Handle gecho separate as we need to espace \ with \\'#010+
   'ifneq ($(ECHOREDIR),echo)'#010+
   '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDPACK))" > $(ZIPWRAPPE'+
   'R)'#010+
-  '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" >> $(ZIP','WRAPPE'+
+  '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_ZIP))" ','>> $(ZIPWRAPPE'+
   'R)'#010+
   '        $(ECHOREDIR) -e "$(subst \,\\,$(ZIPCMD_CDBASE))" >> $(ZIPWRAPP'+
   'ER)'#010+
@@ -2148,7 +2148,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '        echo $(ZIPCMD_ZIP) >> $(ZIPWRAPPER)'#010+
   '        echo $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)'#010+
   'endif'#010+
-  'ifdef inU','nix'#010+
+  'i','fdef inUnix'#010+
   '        /bin/sh $(ZIPWRAPPER)'#010+
   'else'#010+
   'ifdef RUNBATCH'#010+
@@ -2161,7 +2161,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'else'#010+
   '        $(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)'#010+
   'endif'#010+
-  '        $(DEL','TREE) $(PACKDIR)'#010+
+  '     ','   $(DELTREE) $(PACKDIR)'#010+
   #010+
   'fpc_zipsourceinstall:'#010+
   '        $(MAKE) fpc_zipinstall ZIPTARGET=sourceinstall ZIPSUFFIX=$(ZIP'+
@@ -2169,8 +2169,8 @@ const fpcmakeini : array[0..256,1..240] of char=(
   #010+
   'fpc_zipexampleinstall:'#010+
   'ifdef HASEXAMPLES'#010+
-  '        $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=$(ZI'+
-  'PEXA','MPLESUFFIX)'#010+
+  '        $(MAKE) fpc_zipinstall ZIPTARGET=exampleinstall ZIPSUFFIX=','$('+
+  'ZIPEXAMPLESUFFIX)'#010+
   'endif'#010+
   #010+
   'fpc_zipdistinstall:'#010+
@@ -2180,7 +2180,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '[cleanrules]'#010+
   '#####################################################################'#010+
   '# Clean rules'#010+
-  '#################################################','###################'+
+  '#########################################','###########################'+
   '#'#010+
   #010+
   '.PHONY: fpc_clean fpc_cleanall fpc_distclean'#010+
@@ -2189,8 +2189,8 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES'+
   '))'#010+
   'override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDB'+
-  'GFILES))'#010+
-  'endif',#010+
+  'GFILES','))'#010+
+  'endif'#010+
   #010+
   'ifdef CLEAN_PROGRAMS'#010+
   'override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(E'+
@@ -2198,26 +2198,26 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix '+
   '$(EXEDBGEXT), $(CLEAN_PROGRAMS)))'#010+
   'endif'#010+
-  #010+
-  'ifdef CL','EAN_UNITS'#010+
+  #010,
+  'ifdef CLEAN_UNITS'#010+
   'override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))'#010+
   'endif'#010+
   #010+
   'ifdef CLEANPPUFILES'#010+
   'override CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES)'+
-  ') $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(STATICLI'+
-  'B','PREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addp'+
+  ') $(subst $(PPUEXT),$(LTOEXT),$(CLEANPPUFILES)) $(addprefix $(S','TATIC'+
+  'LIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUFILES))) $(addp'+
   'refix $(IMPORTLIBPREFIX),$(subst $(PPUEXT),$(STATICLIBEXT),$(CLEANPPUF'+
   'ILES)))'#010+
   'ifdef DEBUGSYMEXT'#010+
-  'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANPP'+
-  'UFILES)',')'#010+
+  'override CLEANPPULINKFILES+=$(subst $(PPUEXT),$(DEBUGSYMEXT),$(CLEANP',
+  'PUFILES))'#010+
   'endif'#010+
   'override CLEANPPUFILENAMES:=$(CLEANPPUFILES)'#010+
   'override CLEANPPUFILES=$(addprefix $(UNITTARGETDIRPREFIX),$(CLEANPPUFI'+
   'LENAMES))'#010+
   'override CLEANPPULINKFILENAMES:=$(CLEANPPULINKFILES)'#010+
-  'override CLEANPPULINKFILES=$(wildcard $(addprefix $(UN','ITTARGETDIRPRE'+
+  'override CLEANPPULINKFILES=$(wildcard $(addpre','fix $(UNITTARGETDIRPRE'+
   'FIX),$(CLEANPPULINKFILENAMES)))'#010+
   'endif'#010+
   #010+
@@ -2227,7 +2227,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'endif'#010+
   '# DELTREE instead of DEL because on Mac OS X these are directories'#010+
   'ifdef CLEANEXEDBGFILES'#010+
-  '        -$(D','ELTREE) $(CLEANEXEDBGFILES)'#010+
+  '    ','    -$(DELTREE) $(CLEANEXEDBGFILES)'#010+
   'endif'#010+
   'ifdef CLEANPPUFILES'#010+
   '        -$(DEL) $(CLEANPPUFILES)'#010+
@@ -2236,7 +2236,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '        -$(DEL) $(CLEANPPULINKFILES)'#010+
   'endif'#010+
   'ifdef CLEANRSTFILES'#010+
-  '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(C','LEANRSTFILES))'+
+  '        -$(DEL) $(addprefix $(UNITTARGETDIRPRE','FIX),$(CLEANRSTFILES))'+
   #010+
   'endif'#010+
   'ifdef CLEAN_FILES'#010+
@@ -2246,7 +2246,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '        -$(DEL) $(LIB_NAME) $(LIB_FULLNAME)'#010+
   'endif'#010+
   '        -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT)'#010+
-  '        -$(DEL) $(FPCEXTFILE)',' $(REDIRFILE) script*.res link*.res *_s'+
+  '        -$(DEL) $(FPC','EXTFILE) $(REDIRFILE) script*.res link*.res *_s'+
   'cript.res *_link.res'#010+
   '        -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BA'+
   'TCHEXT)'#010+
@@ -2255,7 +2255,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'ifdef CLEANEXEFILES'#010+
   '        -$(DEL) $(CLEANEXEFILES)'#010+
   'endif'#010+
-  'ifdef COMPILE','R_UNITTARGETDIR'#010+
+  'ifdef',' COMPILER_UNITTARGETDIR'#010+
   'ifdef CLEANPPUFILES'#010+
   '        -$(DEL) $(CLEANPPUFILES)'#010+
   'endif'#010+
@@ -2263,8 +2263,9 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '        -$(DEL) $(CLEANPPULINKFILES)'#010+
   'endif'#010+
   'ifdef CLEANRSTFILES'#010+
-  '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))'#010+
-  'end','if'#010+
+  '        -$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFIL','ES))'+
+  #010+
+  'endif'#010+
   'endif'#010+
   'ifdef CLEAN_FILES'#010+
   '        -$(DEL) $(CLEAN_FILES)'#010+
@@ -2273,14 +2274,14 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '        -$(DELTREE) bin'#010+
   '        -$(DEL) *$(OEXT) *$(LTOEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *'+
   '$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)'#010+
-  'ifneq ($(PPU','EXT),.ppu)'#010+
+  'ifne','q ($(PPUEXT),.ppu)'#010+
   '        -$(DEL) *.o *.ppu *.a'#010+
   'endif'#010+
   '        -$(DELTREE) *$(SMARTEXT)'#010+
   '        -$(DEL) fpcmade.* Package.fpc *.fpm'#010+
   '        -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_scr'+
   'ipt.res *_link.res'#010+
-  '        -$(DEL) $(PPAS) *_p','pas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$('+
+  '        -$(DEL) $(P','PAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$('+
   'BATCHEXT)'#010+
   'ifdef AOUTEXT'#010+
   '        -$(DEL) *$(AOUTEXT)'#010+
@@ -2290,7 +2291,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'endif'#010+
   'ifdef LOCALFPMAKEBIN'#010+
   '        -$(DEL) $(LOCALFPMAKEBIN)'#010+
-  '        -$(DEL) $(FPMAKEBINOBJ',')'#010+
+  '        -$(DEL) $(FPMA','KEBINOBJ)'#010+
   'endif'#010+
   #010+
   'fpc_distclean: cleanall'#010+
@@ -2302,8 +2303,8 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '#####################################################################'#010+
   #010+
   '.PHONY: fpc_baseinfo'#010+
-  #010+
-  'override',' INFORULES+=fpc_baseinfo'#010+
+  #010,
+  'override INFORULES+=fpc_baseinfo'#010+
   #010+
   'fpc_baseinfo:'#010+
   '        @$(ECHO)'#010+
@@ -2311,86 +2312,86 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '        @$(ECHO)  Package Name..... $(PACKAGE_NAME)'#010+
   '        @$(ECHO)  Package Version.. $(PACKAGE_VERSION)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  == C','onfiguration info =='#010+
+  '        @$(ECH','O)  == Configuration info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  FPC.......... $(FPC)'#010+
   '        @$(ECHO)  FPC Version.. $(FPC_VERSION)'#010+
   '        @$(ECHO)  Source CPU... $(CPU_SOURCE)'#010+
   '        @$(ECHO)  Target CPU... $(CPU_TARGET)'#010+
-  '        @$(ECHO)  Source',' OS.... $(OS_SOURCE)'#010+
+  '        @$(ECHO)','  Source OS.... $(OS_SOURCE)'#010+
   '        @$(ECHO)  Target OS.... $(OS_TARGET)'#010+
   '        @$(ECHO)  Full Source.. $(FULL_SOURCE)'#010+
   '        @$(ECHO)  Full Target.. $(FULL_TARGET)'#010+
   '        @$(ECHO)  SourceSuffix. $(SOURCESUFFIX)'#010+
-  '        @$(ECHO)  TargetSuffix. ','$(TARGETSUFFIX)'#010+
+  '        @$(ECHO)  Target','Suffix. $(TARGETSUFFIX)'#010+
   '        @$(ECHO)  FPC fpmake... $(FPCFPMAKE)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Directory info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Required pkgs... $(REQUIRE_PACKAGES)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  Basedir.........',' $(BASEDIR)'#010+
+  '        @$(ECHO)  Basedir.','........ $(BASEDIR)'#010+
   '        @$(ECHO)  FPCDir.......... $(FPCDIR)'#010+
   '        @$(ECHO)  CrossBinDir..... $(CROSSBINDIR)'#010+
   '        @$(ECHO)  UnitsDir........ $(UNITSDIR)'#010+
   '        @$(ECHO)  PackagesDir..... $(PACKAGESDIR)'#010+
   '        @$(ECHO)'#010+
-  '        @$(ECHO)  G','CC library..... $(GCCLIBDIR)'#010+
+  '        @$(','ECHO)  GCC library..... $(GCCLIBDIR)'#010+
   '        @$(ECHO)  Other library... $(OTHERLIBDIR)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  == Tools info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  As........ $(AS)'#010+
   '        @$(ECHO)  Ld........ $(LD)'#010+
-  '        @$(ECHO)  Ar..','...... $(AR)'#010+
+  '        @$(ECH','O)  Ar........ $(AR)'#010+
   '        @$(ECHO)  Rc........ $(RC)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Mv........ $(MVPROG)'#010+
   '        @$(ECHO)  Cp........ $(CPPROG)'#010+
   '        @$(ECHO)  Rm........ $(RMPROG)'#010+
   '        @$(ECHO)  GInstall.. $(GINSTALL)'#010+
-  '        @$(ECHO) ',' Echo...... $(ECHO)'#010+
+  '        @','$(ECHO)  Echo...... $(ECHO)'#010+
   '        @$(ECHO)  Shell..... $(SHELL)'#010+
   '        @$(ECHO)  Date...... $(DATE)'#010+
   '        @$(ECHO)  FPCMake... $(FPCMAKE)'#010+
   '        @$(ECHO)  PPUMove... $(PPUMOVE)'#010+
   '        @$(ECHO)  Zip....... $(ZIPPROG)'#010+
-  '        @$(ECHO)'#010+
-  '        ','@$(ECHO)  == Object info =='#010+
+  '        @$(ECHO)'#010,
+  '        @$(ECHO)  == Object info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Target Loaders........ $(TARGET_LOADERS)'#010+
   '        @$(ECHO)  Target Units.......... $(TARGET_UNITS)'#010+
   '        @$(ECHO)  Target Implicit Units. $(TARGET_IMPLICITUNITS)'#010+
-  '        @$(ECH','O)  Target Programs....... $(TARGET_PROGRAMS)'#010+
+  '      ','  @$(ECHO)  Target Programs....... $(TARGET_PROGRAMS)'#010+
   '        @$(ECHO)  Target Dirs........... $(TARGET_DIRS)'#010+
   '        @$(ECHO)  Target Examples....... $(TARGET_EXAMPLES)'#010+
   '        @$(ECHO)  Target ExampleDirs.... $(TARGET_EXAMPLEDIRS)'#010+
-  '        @$(ECHO',')'#010+
+  '       ',' @$(ECHO)'#010+
   '        @$(ECHO)  Clean Units......... $(CLEAN_UNITS)'#010+
   '        @$(ECHO)  Clean Files......... $(CLEAN_FILES)'#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  Install Units....... $(INSTALL_UNITS)'#010+
-  '        @$(ECHO)  Install Files....... $(INSTALL_FILES)'#010+
-  ' ','       @$(ECHO)'#010+
+  '        @$(ECHO)  Install Files....... $(INSTALL_','FILES)'#010+
+  '        @$(ECHO)'#010+
   '        @$(ECHO)  == Install info =='#010+
   '        @$(ECHO)'#010+
   '        @$(ECHO)  DateStr.............. $(DATESTR)'#010+
   '        @$(ECHO)  ZipName.............. $(ZIPNAME)'#010+
   '        @$(ECHO)  ZipPrefix............ $(ZIPPREFIX)'#010+
-  '        @$(ECHO',')  ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
+  '       ',' @$(ECHO)  ZipCrossPrefix....... $(ZIPCROSSPREFIX)'#010+
   '        @$(ECHO)  ZipSuffix............ $(ZIPSUFFIX)'#010+
   '        @$(ECHO)  FullZipName.......... $(FULLZIPNAME)'#010+
   '        @$(ECHO)  Install FPC Package.. $(INSTALL_FPCPACKAGE)'#010+
   '        @$(ECHO)'#010+
-  '        @$','(ECHO)  Install base dir..... $(INSTALL_BASEDIR)'#010+
+  '  ','      @$(ECHO)  Install base dir..... $(INSTALL_BASEDIR)'#010+
   '        @$(ECHO)  Install binary dir... $(INSTALL_BINDIR)'#010+
   '        @$(ECHO)  Install library dir.. $(INSTALL_LIBDIR)'#010+
   '        @$(ECHO)  Install units dir.... $(INSTALL_UNITDIR)'#010+
-  '        @$(ECHO)','  Install source dir... $(INSTALL_SOURCEDIR)'#010+
+  '        ','@$(ECHO)  Install source dir... $(INSTALL_SOURCEDIR)'#010+
   '        @$(ECHO)  Install doc dir...... $(INSTALL_DOCDIR)'#010+
   '        @$(ECHO)  Install example dir.. $(INSTALL_EXAMPLEDIR)'#010+
   '        @$(ECHO)  Install data dir..... $(INSTALL_DATADIR)'#010+
-  '        @$(ECHO)',#010+
+  '        ','@$(ECHO)'#010+
   '        @$(ECHO)  Dist destination dir. $(DIST_DESTDIR)'#010+
   '        @$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)'#010+
   '        @$(ECHO)'#010+
@@ -2398,7 +2399,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '[inforules]'#010+
   '#####################################################################'#010+
   '# Info rules'#010+
-  '##############','######################################################'+
+  '######','##############################################################'+
   '#'#010+
   #010+
   '.PHONY: fpc_info'#010+
@@ -2408,7 +2409,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '[makefilerules]'#010+
   '#####################################################################'#010+
   '# Rebuild Makefile'#010+
-  '####################################','################################'+
+  '############################','########################################'+
   '#'#010+
   #010+
   '.PHONY: fpc_makefile fpc_makefiles fpc_makefile_sub1 fpc_makefile_sub2'+
@@ -2419,16 +2420,16 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '        $(FPCMAKE) -w -T$(OS_TARGET) Makefile.fpc'#010+
   #010+
   'fpc_makefile_sub1:'#010+
-  'ifdef TARGET_DIRS'#010+
-  '   ','     $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TAR'+
-  'GET_DIRS))'#010+
+  'ifdef TARGET_','DIRS'#010+
+  '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
+  'T_DIRS))'#010+
   'endif'#010+
   'ifdef TARGET_EXAMPLEDIRS'#010+
   '        $(FPCMAKE) -w -T$(OS_TARGET) $(addsuffix /Makefile.fpc,$(TARGE'+
   'T_EXAMPLEDIRS))'#010+
   'endif'#010+
   #010+
-  'fpc_makefile_sub2: $(addsuffix _makefile','_dirs,$(TARGET_DIRS) $(TARGE'+
+  'fpc_makefile_sub2: $(addsuffix _','makefile_dirs,$(TARGET_DIRS) $(TARGE'+
   'T_EXAMPLEDIRS))'#010+
   #010+
   'fpc_makefile_dirs: fpc_makefile_sub1 fpc_makefile_sub2'#010+
@@ -2436,8 +2437,9 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'fpc_makefiles: fpc_makefile fpc_makefile_dirs'#010+
   #010+
   '[localmakefile]'#010+
-  '#####################################################################'#010+
-  '# Loca','l Makefile'#010+
+  '####################################################################','#'+
+  #010+
+  '# Local Makefile'#010+
   '#####################################################################'#010+
   #010+
   'ifneq ($(wildcard fpcmake.loc),)'#010+
@@ -2447,16 +2449,16 @@ const fpcmakeini : array[0..256,1..240] of char=(
   #010+
   '[userrules]'#010+
   '#####################################################################'#010+
-  '# Users rules'#010+
-  '#','###################################################################'+
-  '#'#010+
+  '# Users',' rules'#010+
+  '#####################################################################'#010+
   #010+
   '[lclrules]'#010+
   '#####################################################################'#010+
   '# LCL Rules'#010+
-  '#####################################################################'#010+
+  '#####################################################################',
+  #010+
   #010+
-  '# LCL ','Platform'#010+
+  '# LCL Platform'#010+
   'ifndef LCL_PLATFORM'#010+
   'ifneq ($(findstring $(OS_TARGET),win32 win64),)'#010+
   'LCL_PLATFORM=win32'#010+
@@ -2468,7 +2470,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   #010+
   '# Check if the specified LCLDIR is correct'#010+
   'ifdef LCLDIR'#010+
-  'override LCLDIR:=$(subst \,/,$(LC','LDIR))'#010+
+  'override LCLDIR:=$(subst ','\,/,$(LCLDIR))'#010+
   'ifeq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
   'override LCLDIR=wrong'#010+
   'endif'#010+
@@ -2479,7 +2481,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '# Check if the default LCLDIR is correct'#010+
   'ifdef DEFAULT_LCLDIR'#010+
   'override LCLDIR:=$(subst \,/,$(DEFAULT_LCLDIR))'#010+
-  'ifeq ($(w','ildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
+  'i','feq ($(wildcard $(LCLDIR)/units/$(LCL_PLATFORM)),)'#010+
   'override LCLDIR=wrong'#010+
   'endif'#010+
   'endif'#010+
@@ -2487,7 +2489,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '# Check for development version'#010+
   'ifeq ($(LCLDIR),wrong)'#010+
   'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
-  ' $(addsuffix /units/$(LCL_PLATFORM),$','(BASEDIR)/lcl $(BASEDIR)))))'#010+
+  ' $(addsuffix /units/$(LCL_PLA','TFORM),$(BASEDIR)/lcl $(BASEDIR)))))'#010+
   'ifeq ($(LCLDIR),)'#010+
   'override LCLDIR=wrong'#010+
   'endif'#010+
@@ -2496,7 +2498,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '# Check for release version'#010+
   'ifeq ($(LCLDIR),wrong)'#010+
   'override LCLDIR=$(subst /units/$(LCL_PLATFORM),,$(firstword $(wildcard'+
-  ' $(addsuffix /lib/lazarus/units/$(LCL','_PLATFORM),/usr/local /usr))))'#010+
+  ' $(addsuffix /lib/lazarus/uni','ts/$(LCL_PLATFORM),/usr/local /usr))))'#010+
   'ifeq ($(LCLDIR),)'#010+
   'override LCLDIR=wrong'#010+
   'endif'#010+
@@ -2505,7 +2507,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   '# Generate dirs'#010+
   'override LCLUNITDIR=$(wildcard $(LCLDIR)/units/$(LCL_PLATFORM) $(LCLDI'+
   'R)/units)'#010+
-  'override LCLCOMPONENTDIR=$(wildcard $(LCLDIR)/.. $(LCLDIR)/.','./compon'+
+  'override LCLCOMPONENTDIR=$(wildcard $(LCLDIR)/.. $(L','CLDIR)/../compon'+
   'ents $(LCLDIR)/components)'#010+
   'export LCLDIR LCLUNITDIR LCLCOMPONENTDIR'#010+
   #010+
@@ -2514,7 +2516,7 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'override COMPILER_UNITDIR+=$(LCLUNITDIR)'#010+
   #010+
   '[lclinforules]'#010+
-  '#################################','###################################'+
+  '#########################','###########################################'+
   '#'#010+
   '# LCL Info rules'#010+
   '#####################################################################'#010+
@@ -2525,19 +2527,19 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'lclinfo:'#010+
   '        @$(ECHO)  == LCL info =='#010+
   '        @$(ECHO)'#010+
-  '        @$(','ECHO)  Platform............. $(LCL_PLATFORM)'#010+
+  '   ','     @$(ECHO)  Platform............. $(LCL_PLATFORM)'#010+
   '        @$(ECHO)  LCLDIR............... $(LCLDIR)'#010+
   '        @$(ECHO)  LCL Unit dir......... $(LCLUNITDIR)'#010+
   '        @$(ECHO)  LCL Component dir.... $(LCLCOMPONENTDIR)'#010+
   '        @$(ECHO)'#010+
   #010+
-  '[fpmakeprerule','s]'#010+
+  '[fpmak','eprerules]'#010+
   '#####################################################################'#010+
   '# fpmake prerules'#010+
   '#####################################################################'#010+
   'FPMAKEBIN=fpmake$(SRCEXEEXT)'#010+
-  'FPMAKEBINOBJ=fpmake$(OEXT) fpmake$(LTOEXT)'#010+
-  'LOCALFP','MAKEBIN=.$(PATHSEP)$(FPMAKEBIN)'#010+
+  'FPMAKEBINOBJ=fpmake$(OEXT) fpmake$(LTOEXT)',#010+
+  'LOCALFPMAKEBIN=.$(PATHSEP)$(FPMAKEBIN)'#010+
   #010+
   '# Convert the OS_TARGET and CPU_TARGET options to fpmake'#039's --os an'+
   'd --cpu parameters'#010+
@@ -2547,57 +2549,57 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'ifdef CPU_TARGET'#010+
   'FPC_TARGETOPT+=--cpu=$(CPU_TARGET)'#010+
   'endif'#010+
-  #010+
-  '# Get th','e location of the bootstrap-fpmkunit units'#010+
+  #010,
+  '# Get the location of the bootstrap-fpmkunit units'#010+
   'PACKAGEDIR_FPMKUNIT:=$(firstword $(subst /Makefile.fpc,,$(strip $(wild'+
   'card $(addsuffix /fpmkunit/Makefile.fpc,$(PACKAGESDIR))))))'#010+
   'ifneq ($(PACKAGEDIR_FPMKUNIT),)'#010+
-  'UNITDIR_FPMAKE_FPMKUNIT=$(PACKAGEDI','R_FPMKUNIT)/units_bs/$(SOURCESUFF'+
+  'UNITDIR_FPMAKE_FPMKUNIT=$(P','ACKAGEDIR_FPMKUNIT)/units_bs/$(SOURCESUFF'+
   'IX)'#010+
   'override COMPILER_FPMAKE_UNITDIR=$(UNITDIR_FPMAKE_FPMKUNIT)'#010+
   'FPMKUNIT_SRC=$(PACKAGEDIR_FPMKUNIT)/src/fpmkunit.pp'#010+
   'FPMKUNIT_PPU=$(UNITDIR_FPMAKE_FPMKUNIT)/fpmkunit.ppu'#010+
   'endif'#010+
   #010+
-  'ifdef FPMAKE_SKIP_CONFIG'#010+
-  'overri','de FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+
+  'ifdef FPMAKE_SKIP_CONFI','G'#010+
+  'override FPMAKE_BUILD_OPT+=$(FPMAKE_SKIP_CONFIG)'#010+
   'endif'#010+
   #010+
   '[fpmakerules]'#010+
   '#####################################################################'#010+
   '# fpmake rules'#010+
   '#####################################################################'#010+
-  '.PHONY: fpc_fpmake fp','c_fpmake_clean fpc_fpmake_install fpc_fpmake_ex'+
+  '.PHONY: fpc_f','pmake fpc_fpmake_clean fpc_fpmake_install fpc_fpmake_ex'+
   'ampleinstall'#010+
   #010+
   '# Do not pass the Makefile'#039's unit and binary target locations. fpm'+
   'ake uses it'#039's own.'#010+
   'override FPCOPT:=$(filter-out -FU%,$(FPCOPT))'#010+
-  'override FPCOPT:=$(filter-out -FE%,$(FPCOPT))'#010+
-  '# ','Compose general fpmake-parameters'#010+
+  'override FPCOPT:=$(filter-out -FE%,$(FPC','OPT))'#010+
+  '# Compose general fpmake-parameters'#010+
   'ifdef FPMAKEOPT'#010+
   'FPMAKE_OPT+=$(FPMAKEOPT)'#010+
   'endif'#010+
   'FPMAKE_OPT+=--localunitdir=$(FPCDIR)'#010+
   'FPMAKE_OPT+=--globalunitdir=$(FPCDIR)/packages'#010+
   'FPMAKE_OPT+=$(FPC_TARGETOPT)'#010+
-  'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))'#010+
-  'FPMAKE_','OPT+=--compiler=$(FPC)'#010+
+  'FPMAKE_OPT+=$(addprefix -o ,$(FPCOPT))',#010+
+  'FPMAKE_OPT+=--compiler=$(FPC)'#010+
   'FPMAKE_OPT+=-bu'#010+
   #010+
   'FPMAKE_INSTALL_OPT+=--unitinstalldir=$(INSTALL_UNITDIR)'#010+
   'ifdef UNIXHier'#010+
   'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_PREFIX)'#010+
   'FPMAKE_INSTALL_OPT+=--baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSI'+
-  'ON)'#010+
+  'ON)'#010,
   'else'#010+
-  'FPM','AKE_INSTALL_OPT+=--prefix=$(INSTALL_BASEDIR)'#010+
+  'FPMAKE_INSTALL_OPT+=--prefix=$(INSTALL_BASEDIR)'#010+
   'endif'#010+
   #010+
   'override ALLTARGET+=fpc_fpmake'#010+
   'override INSTALLTARGET+=fpc_fpmake_install'#010+
   'override EXAMPLEINSTALLTARGET+=fpc_fpmake_exampleinstall'#010+
-  '# If no fpmake exists and (dist)clean is called, do not t','ry to build'+
+  '# If no fpmake exists and (dist)clean is called, ','do not try to build'+
   ' fpmake, it will'#010+
   '# most often fail because the dependencies are cleared.'#010+
   '# In case of a clean, simply do nothing'#010+
@@ -2605,29 +2607,29 @@ const fpcmakeini : array[0..256,1..240] of char=(
   'override CLEANTARGET+=fpc_fpmake_clean'#010+
   'endif'#010+
   #010+
-  '$(FPMKUNIT_PPU): $(FPMKUNIT_SRC',')'#010+
+  '$(FPMKUNIT_PPU): $(FPMK','UNIT_SRC)'#010+
   '            $(MAKE) -C $(PACKAGEDIR_FPMKUNIT) bootstrap $(addprefix OP'+
   'T=,$(FPMAKE_BUILD_OPT))'#010+
   #010+
   '$(FPMAKEBIN): fpmake.pp $(FPMKUNIT_PPU)'#010+
   '        $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITD'+
-  'IR)) $(FPMAKE_BUILD_OPT)'#010+
+  'IR)) $(FPMAKE_BUILD_OPT)'#010,
   #010+
-  'fpc_fpm','ake: $(FPMAKEBIN)'#010+
+  'fpc_fpmake: $(FPMAKEBIN)'#010+
   '            $(LOCALFPMAKEBIN) compile $(FPMAKE_OPT)'#010+
   #010+
   'fpc_fpmake_clean: $(FPMAKEBIN)'#010+
   '            $(LOCALFPMAKEBIN) clean $(FPMAKE_OPT)'#010+
   #010+
   'fpc_fpmake_install: $(FPMAKEBIN)'#010+
-  '            $(LOCALFPMAKEBIN) install $(FPMAKE_OPT) $(','FPMAKE_INSTALL'+
+  '            $(LOCALFPMAKEBIN) install $(FPMAKE','_OPT) $(FPMAKE_INSTALL'+
   '_OPT)'#010+
   #010+
   '# This is not completely valid. Exampleinstall should only install the'+
   ' examples, while'#010+
   '# fpmake -ie installs everything, including the examples. This also me'+
   'ans that on'#010+
-  '# a distinstall fpmake install wil be called twice','.'#010+
+  '# a distinstall fpmake install wil be call','ed twice.'#010+
   'fpc_fpmake_exampleinstall: $(FPMAKEBIN)'#010+
   '            $(LOCALFPMAKEBIN) install -ie $(FPMAKE_OPT) $(FPMAKE_INSTA'+
   'LL_OPT)'#010
diff --git a/utils/fpcm/fpcmake.ini b/utils/fpcm/fpcmake.ini
index 13ab23ea6e..8af5b1ce10 100644
--- a/utils/fpcm/fpcmake.ini
+++ b/utils/fpcm/fpcmake.ini
@@ -1517,7 +1517,7 @@ endif
 # create always pic'ed code on x86_64, mips and mipsel
 # on unix-like systems
 ifneq ($(findstring $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),)
-ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel),)
+ifneq ($(findstring $(CPU_TARGET),x86_64 mips mipsel riscv64),)
 override FPCOPT+=-Cg
 endif
 endif
author	florian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>	2021-03-13 16:33:31 +0000
committer	florian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>	2021-03-13 16:33:31 +0000
commit	f4b984d2356cc47030adc7378858c428a399a589 (patch)
tree	5478024647b68ff414045a087325b219886ad07d
parent	6c91aee6685d5f1d8e6faf2d536ca9aadcc91e25 (diff)
download	fpc-f4b984d2356cc47030adc7378858c428a399a589.tar.gz