Browse Source

Remove code testing for FPC_VERSION 1.X or 2.X

Pierre Muller 2 years ago
parent
commit
f2cb7ffce9

+ 0 - 4
rtl/darwin/Makefile

@@ -892,11 +892,7 @@ CTYPES_DEPS_OS=$(UNIXTYPEUNIT)$(PPUEXT)
 EXEINFO_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
 EXEINFO_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
 FPEXTRES_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
 FPEXTRES_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
 DOS_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT) $(UNIXUTILUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT)
 DOS_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT) $(UNIXUTILUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT)
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
 SYSTEMUNIT=system
-else
-SYSTEMUNIT="Error: Darwin is not supported for 1.0"
-endif
 ifdef RELEASE
 ifdef RELEASE
 override FPCOPT+=-Ur
 override FPCOPT+=-Ur
 endif
 endif

+ 0 - 4
rtl/darwin/Makefile.fpc

@@ -80,11 +80,7 @@ EXEINFO_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
 FPEXTRES_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
 FPEXTRES_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT)
 DOS_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT) $(UNIXUTILUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT)
 DOS_DEPS_OS=$(BASEUNIXUNIT)$(PPUEXT) $(UNIXUTILUNIT)$(PPUEXT) $(UNIXUNIT)$(PPUEXT)
 
 
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
 SYSTEMUNIT=system
-else
-SYSTEMUNIT="Error: Darwin is not supported for 1.0"
-endif
 
 
 # Use new feature from 1.0.5 version
 # Use new feature from 1.0.5 version
 # that generates release PPU files
 # that generates release PPU files

+ 0 - 5
rtl/dragonfly/Makefile

@@ -879,13 +879,8 @@ BSDPROCINC=$(BSDINC)/$(CPU_TARGET)
 UNIXINC=$(RTL)/unix
 UNIXINC=$(RTL)/unix
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 CPU_UNITS=
 CPU_UNITS=
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
 SYSTEMUNIT=system
 loaders+=gprt0
 loaders+=gprt0
-else
-SYSTEMUNIT=sysbsd
-override FPCOPT+=-dUNIX
-endif
 ifeq ($(ARCH),x86_64)
 ifeq ($(ARCH),x86_64)
 CPU_UNITS=x86 ports cpu
 CPU_UNITS=x86 ports cpu
 endif
 endif

+ 0 - 5
rtl/dragonfly/Makefile.fpc

@@ -67,13 +67,8 @@ UNIXINC=$(RTL)/unix
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 CPU_UNITS=
 CPU_UNITS=
 
 
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
 SYSTEMUNIT=system
 loaders+=gprt0
 loaders+=gprt0
-else
-SYSTEMUNIT=sysbsd
-override FPCOPT+=-dUNIX
-endif
 
 
 ifeq ($(ARCH),x86_64)
 ifeq ($(ARCH),x86_64)
 CPU_UNITS=x86 ports cpu
 CPU_UNITS=x86 ports cpu

+ 0 - 4
rtl/emx/Makefile

@@ -878,11 +878,7 @@ DOS_DEPS_OS=doscalls$(PPUEXT)
 SYSUTILS_DEPS_OS=dos$(PPUEXT)
 SYSUTILS_DEPS_OS=dos$(PPUEXT)
 DYNLIBS_DEPS_OD=doscalls($PPUEXT)
 DYNLIBS_DEPS_OD=doscalls($PPUEXT)
 UNITPREFIX=rtl
 UNITPREFIX=rtl
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
 SYSTEMUNIT=system
-else
-SYSTEMUNIT=sysemx
-endif
 ifdef RELEASE
 ifdef RELEASE
 override FPCOPT+=-Ur
 override FPCOPT+=-Ur
 endif
 endif

+ 0 - 4
rtl/emx/Makefile.fpc

@@ -52,11 +52,7 @@ DYNLIBS_DEPS_OD=doscalls($PPUEXT)
 
 
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 
 
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
 SYSTEMUNIT=system
-else
-SYSTEMUNIT=sysemx
-endif
 
 
 # Use new feature from 1.0.5 version
 # Use new feature from 1.0.5 version
 # that generates release PPU files
 # that generates release PPU files

+ 0 - 5
rtl/freebsd/Makefile

@@ -879,13 +879,8 @@ BSDPROCINC=$(BSDINC)/$(CPU_TARGET)
 UNIXINC=$(RTL)/unix
 UNIXINC=$(RTL)/unix
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 CPU_UNITS=
 CPU_UNITS=
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
 SYSTEMUNIT=system
 loaders+=gprt0
 loaders+=gprt0
-else
-SYSTEMUNIT=sysbsd
-override FPCOPT+=-dUNIX
-endif
 ifeq ($(ARCH),i386)
 ifeq ($(ARCH),i386)
 CPU_UNITS=x86 ports cpu mmx
 CPU_UNITS=x86 ports cpu mmx
 ASTARGET=--32
 ASTARGET=--32

+ 0 - 5
rtl/freebsd/Makefile.fpc

@@ -67,13 +67,8 @@ UNIXINC=$(RTL)/unix
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 CPU_UNITS=
 CPU_UNITS=
 
 
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
 SYSTEMUNIT=system
 loaders+=gprt0
 loaders+=gprt0
-else
-SYSTEMUNIT=sysbsd
-override FPCOPT+=-dUNIX
-endif
 
 
 ifeq ($(ARCH),i386)
 ifeq ($(ARCH),i386)
 CPU_UNITS=x86 ports cpu mmx
 CPU_UNITS=x86 ports cpu mmx

+ 0 - 4
rtl/macos/Makefile

@@ -878,12 +878,8 @@ ASMEXT=.s
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 SYSTEMUNIT=system
 SYSTEMUNIT=system
 ifdef RELEASE
 ifdef RELEASE
-ifeq ($(findstring 1.0.2,$(FPC_VERSION)),)
-ifeq ($(findstring 1.0.4,$(FPC_VERSION)),)
 override FPCOPT+=-Ur
 override FPCOPT+=-Ur
 endif
 endif
-endif
-endif
 OBJPASDIR=$(RTL)/objpas
 OBJPASDIR=$(RTL)/objpas
 GRAPHDIR=$(INC)/graph
 GRAPHDIR=$(INC)/graph
 DOS_DEPS_OS=$(UNIXUTILUNIT)$(PPUEXT) $(MACUTILSUNIT)$(PPUEXT)
 DOS_DEPS_OS=$(UNIXUTILUNIT)$(PPUEXT) $(MACUTILSUNIT)$(PPUEXT)

+ 0 - 4
rtl/macos/Makefile.fpc

@@ -53,12 +53,8 @@ SYSTEMUNIT=system
 # that generates release PPU files
 # that generates release PPU files
 # which will not be recompiled
 # which will not be recompiled
 ifdef RELEASE
 ifdef RELEASE
-ifeq ($(findstring 1.0.2,$(FPC_VERSION)),)
-ifeq ($(findstring 1.0.4,$(FPC_VERSION)),)
 override FPCOPT+=-Ur
 override FPCOPT+=-Ur
 endif
 endif
-endif
-endif
 
 
 # Paths
 # Paths
 OBJPASDIR=$(RTL)/objpas
 OBJPASDIR=$(RTL)/objpas

+ 0 - 4
rtl/nativent/Makefile

@@ -884,11 +884,7 @@ endif
 ifeq ($(ARCH),x86_64)
 ifeq ($(ARCH),x86_64)
 CPU_UNITS=x86 cpu
 CPU_UNITS=x86 cpu
 endif
 endif
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-DLLS=
-else
 DLLS=fpcmemdll
 DLLS=fpcmemdll
-endif
 OBJPASDIR=$(RTL)/objpas
 OBJPASDIR=$(RTL)/objpas
 WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
 WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES)))
 ifeq ($(CPU_OS_TARGET),i386-nativent)
 ifeq ($(CPU_OS_TARGET),i386-nativent)

+ 0 - 5
rtl/nativent/Makefile.fpc

@@ -66,12 +66,7 @@ ifeq ($(ARCH),x86_64)
 CPU_UNITS=x86 cpu
 CPU_UNITS=x86 cpu
 endif
 endif
 
 
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-#LOADERS=wprt0 wdllprt0 gprt0 wcygprt0
-DLLS=
-else
 DLLS=fpcmemdll
 DLLS=fpcmemdll
-endif
 
 
 # Paths
 # Paths
 OBJPASDIR=$(RTL)/objpas
 OBJPASDIR=$(RTL)/objpas

+ 0 - 4
rtl/os2/Makefile

@@ -879,11 +879,7 @@ DOSUNITEXT=pas
 PORTSUNITEXT=pas
 PORTSUNITEXT=pas
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 SYSUTILS_DEPS_OS=doscalls$(PPUEXT)
 SYSUTILS_DEPS_OS=doscalls$(PPUEXT)
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
 SYSTEMUNIT=system
-else
-SYSTEMUNIT=sysos2
-endif
 ifdef RELEASE
 ifdef RELEASE
 override FPCOPT+=-Ur
 override FPCOPT+=-Ur
 endif
 endif

+ 0 - 4
rtl/os2/Makefile.fpc

@@ -51,11 +51,7 @@ PORTSUNITEXT=pas
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 SYSUTILS_DEPS_OS=doscalls$(PPUEXT)
 SYSUTILS_DEPS_OS=doscalls$(PPUEXT)
 
 
-ifeq ($(findstring 1.0.,$(FPC_VERSION)),)
 SYSTEMUNIT=system
 SYSTEMUNIT=system
-else
-SYSTEMUNIT=sysos2
-endif
 
 
 # Use new feature from 1.0.5 version
 # Use new feature from 1.0.5 version
 # that generates release PPU files
 # that generates release PPU files

+ 0 - 4
rtl/qnx/Makefile.fpc

@@ -41,12 +41,8 @@ SYSTEMUNIT=system
 # that generates release PPU files
 # that generates release PPU files
 # which will not be recompiled
 # which will not be recompiled
 ifdef RELEASE
 ifdef RELEASE
-ifeq ($(findstring 1.0.2,$(FPC_VERSION)),)
-ifeq ($(findstring 1.0.4,$(FPC_VERSION)),)
 override FPCOPT+=-Ur
 override FPCOPT+=-Ur
 endif
 endif
-endif
-endif
 
 
 # Paths
 # Paths
 OBJPASDIR=$(RTL)/objpas
 OBJPASDIR=$(RTL)/objpas

+ 0 - 3
rtl/win64/Makefile

@@ -881,9 +881,6 @@ SYSUTILSDIR=$(WINDIR)
 SYSUTILS_OPT=-Fi../win
 SYSUTILS_OPT=-Fi../win
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 SYSTEMUNIT=system
 SYSTEMUNIT=system
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-LOADERS=wprt0 wdllprt0 gprt0 wcygprt0
-endif
 ifeq ($(ARCH),x86_64)
 ifeq ($(ARCH),x86_64)
 CPU_UNITS=cpu signals
 CPU_UNITS=cpu signals
 endif
 endif

+ 0 - 3
rtl/win64/Makefile.fpc

@@ -62,9 +62,6 @@ SYSUTILS_OPT=-Fi../win
 UNITPREFIX=rtl
 UNITPREFIX=rtl
 SYSTEMUNIT=system
 SYSTEMUNIT=system
 
 
-ifneq ($(findstring 2.0.,$(FPC_VERSION)),)
-LOADERS=wprt0 wdllprt0 gprt0 wcygprt0
-endif
 
 
 ifeq ($(ARCH),x86_64)
 ifeq ($(ARCH),x86_64)
 # signals unit is x86 specific for now
 # signals unit is x86 specific for now