paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-12 14:29:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove OS specific rules for cpu unit and use CPUUNIT variable

Browse Source
This commit is contained in:
Pierre Muller 2023-09-26 14:52:42 +02:00
parent 97c60e25a9
commit bb3f9a2454
17 changed files with 29 additions and 134 deletions

16
rtl/aix/Makefile.fpc
View File

@ -69,11 +69,11 @@ SYSTEMUNIT=system
ifeq ($(ARCH),i386)
CPU_UNITS=cpu $(MMXUNIT)
CPU_UNITS=$(CPUUNIT) $(MMXUNIT)
endif
ifeq ($(ARCH),x86_64)
CPU_UNITS=cpu
CPU_UNITS=$(CPUUNIT)
SYSINIT_UNITS= # si_prc si_c si_dll
endif
@ -140,18 +140,6 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc)
$(SYSTEMUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
#
# Other system-independent RTL Units
#
ifeq ($(ARCH),x86_64)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
endif
#
# Other system-dependent RTL Units
#

13
rtl/android/Makefile.fpc
View File

@ -72,7 +72,7 @@ SYSINIT_UNITS=
LOADERS=prt0 dllprt0
ifeq ($(findstring $(ARCH),i386 x86_64 arm),$(ARCH))
CPU_UNITS=cpu
CPU_UNITS=$(CPUUNIT)
endif
ifeq ($(ARCH),i386)
CPU_UNITS+=$(MMXUNIT)
@ -159,14 +159,3 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc)
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
#
# Other $(SYSTEMUNIT)-independent RTL Units
#
ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT)
else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
endif
$(COMPILER) $(PROCINC)/cpu.pp

4
rtl/aros/Makefile.fpc
View File

@ -56,11 +56,11 @@ endif
OBJPASDIR=$(RTL)/objpas
ifeq ($(ARCH),i386)
CPU_UNITS=cpu $(MMXUNIT) $(LINEINFOUNIT)
CPU_UNITS=$(CPUUNIT) $(MMXUNIT) $(LINEINFOUNIT)
endif
ifeq ($(ARCH),x86_64)
CPU_UNITS=cpu
CPU_UNITS=$(CPUUNIT)
endif

13
rtl/dragonfly/Makefile.fpc
View File

@ -72,7 +72,7 @@ SYSTEMUNIT=system
loaders+=gprt0
ifeq ($(ARCH),x86_64)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) $(CPUUNIT)
endif
@ -147,14 +147,3 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc)
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(RTLCONSTSUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
#
# Other system-independent RTL Units
#
ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT)
else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
endif

16
rtl/freebsd/Makefile.fpc
View File

@ -72,12 +72,12 @@ SYSTEMUNIT=system
loaders+=gprt0
ifeq ($(ARCH),i386)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu $(MMXUNIT)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) $(CPUUNIT) $(MMXUNIT)
ASTARGET=--32
endif
ifeq ($(ARCH),x86_64)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) $(CPUUNIT)
ASTARGET=--64
endif
@ -153,15 +153,3 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc)
$(SORTBASEUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
#
# Other system-independent RTL Units
#
ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT)
$(COMPILER) $<
else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
endif

5
rtl/go32v2/Makefile.fpc
View File

@ -9,7 +9,7 @@ units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUN
go32 dpmiexcp $(INITCUNIT) $(PORTSUNIT) profile dxetype dxeload emu387 \
dos $(CMEMUNIT) $(SORTBASEUNIT) \
sysutils classes $(MATHUNIT) $(TYPINFOUNIT) \
cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(CTYPESUNIT) $(FGLUNIT) \
$(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) $(CTYPESUNIT) $(FGLUNIT) \
msmouse $(CHARSETUNIT) $(CPALLUNIT) \
$(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(UNICODEDATAUNIT) \
$(TYPESUNIT) $(SYSCONSTUNIT) $(RTLCONSTSUNIT) \
@ -133,9 +133,6 @@ classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
#
# Other system-independent RTL Units
#
cpu$(PPUEXT) : $(PROCINC)/cpu.pp system$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
$(EXECPPAS)
matrix$(PPUEXT) : $(INC)/matrix.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/matrix.pp

4
rtl/haiku/Makefile.fpc
View File

@ -60,12 +60,12 @@ DYNLIBSINCDIR=$(UNIXINC)
ifeq ($(ARCH),i386)
LOADERS=cprt0 dllcprt0
CPU_UNITS=cpu $(MMXUNIT)
CPU_UNITS=$(CPUUNIT) $(MMXUNIT)
endif
ifeq ($(ARCH),x86_64)
LOADERS=
CPU_UNITS=cpu
CPU_UNITS=$(CPUUNIT)
endif
ifneq ($(findstring $(ARCH),x86_64 i386),)

2
rtl/linux/Makefile.fpc
View File

@ -132,7 +132,7 @@ endif
ifeq ($(ARCH),arm)
override LOADERS+=ucprt0
CPU_UNITS=cpu
CPU_UNITS=$(CPUUNIT)
endif
ifeq ($(ARCH),sparc)

11
rtl/msxdos/Makefile.fpc
View File

@ -8,14 +8,14 @@ main=rtl
units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) $(CHARSETUNIT) $(CPALLUNIT) \
$(GETOPTSUNIT) $(EXEINFOUNIT) $(HEAPTRCUNIT)
#$(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) dos $(HEAPTRCUNIT) $(LNFODWRFUNIT) $(SYSCONSTUNIT) sysutils \
# $(MATHUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(RTLCONSTSUNIT) $(TYPINFOUNIT) cpu $(TYPESUNIT) \
# $(MATHUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUNIT) $(RTLCONSTSUNIT) $(TYPINFOUNIT) $(CPUUNIT) $(TYPESUNIT) \
# $(GETOPTSUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes \
# msmouse $(PORTSUNIT) \
# $(CHARSETUNIT) $(CPALLUNIT) $(CTYPESUNIT) \
# $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) $(UNICODEDATAUNIT)
# $(CMEMUNIT)
# $(INITCUNIT) profile dxetype dxeload emu387 \
# cpu $(MMXUNIT) \
# $(CPUUNIT) $(MMXUNIT) \
# vesamode \
# rsts=$(MATHUNIT) $(TYPINFOUNIT) classes dateutil $(SYSCONSTUNIT)
implicitunits= $(CP_UNITS)
@ -103,13 +103,6 @@ classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
$(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp
$(EXECPPAS)
#
# Other system-independent RTL Units
#
cpu$(PPUEXT) : $(PROCINC)/cpu.pp sysutils$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
$(EXECPPAS)
#
# Other system-dependent RTL Units
#

4
rtl/nativent/Makefile.fpc
View File

@ -56,11 +56,11 @@ SYSTEMUNIT=system
CPU_UNITS=
ifeq ($(ARCH),i386)
CPU_UNITS=cpu $(MMXUNIT)
CPU_UNITS=$(CPUUNIT) $(MMXUNIT)
endif
ifeq ($(ARCH),x86_64)
CPU_UNITS=$(X86UNIT) cpu
CPU_UNITS=$(X86UNIT) $(CPUUNIT)
endif
DLLS=fpcmemdll

13
rtl/netbsd/Makefile.fpc
View File

@ -45,7 +45,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
$(UNIXUNIT) \
dos \
sysutils $(TYPINFOUNIT) $(MATHUNIT) \
cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
$(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
$(ERRORSUNIT)
[prerules]
@ -81,10 +81,10 @@ endif
OBJPASDIR=$(RTL)/objpas
ifeq ($(ARCH),x86_64)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) $(CPUUNIT)
endif
ifeq ($(ARCH),i386)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu $(MMXUNIT)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) $(CPUUNIT) $(MMXUNIT)
endif
@ -154,13 +154,6 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc)
# Other system-independent RTL Units
#
ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT)
else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
endif
$(COMPILER) $<
fpmkunit$(PPUEXT) : $(COMMON)/fpmkunit.pp classes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<

8
rtl/netwlibc/Makefile.fpc
View File

@ -11,7 +11,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(E
$(LINEINFOUNIT) $(LNFODWRFUNIT) $(HEAPTRCUNIT) \
nwsnut libc dos $(SYSCONSTUNIT) \
$(INITCUNIT) sysutils $(TYPESUNIT) $(TYPINFOUNIT) $(SORTBASEUNIT) $(FGLUNIT) classes \
cpu $(MMXUNIT) $(GETOPTSUNIT) \
$(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) \
$(CHARSETUNIT) $(CPALLUNIT) \
$(RTLCONSTSUNIT) $(MATHUNIT) \
$(DYNLIBSUNIT) $(CMEMUNIT) $(CTYPESUNIT) \
@ -151,12 +151,6 @@ classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
tthread.inc $(FGLUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp
#
# Other system-independent RTL Units
#
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
#
# Other system-dependent RTL Units
#

17
rtl/openbsd/Makefile.fpc
View File

@ -45,7 +45,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
$(UNIXUNIT) \
dos \
sysutils $(TYPINFOUNIT) $(MATHUNIT) \
cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
$(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
$(ERRORSUNIT)
[prerules]
@ -87,10 +87,10 @@ SYSINIT_UNITS=si_prc si_c si_dll si_g
LOADERS=prt0
ifeq ($(ARCH),x86_64)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) $(CPUUNIT)
endif
ifeq ($(ARCH),i386)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu $(MMXUNIT)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) $(CPUUNIT) $(MMXUNIT)
endif
# Paths
@ -169,15 +169,4 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc)
sysutils$(PPUEXT) $(TYPINFOUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
#
# Other system-independent RTL Units
#
ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT)
$(COMPILER) $<
else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
endif

8
rtl/qnx/Makefile.fpc
View File

@ -9,7 +9,7 @@ main=rtl
loaders=cprt0 crti crtn
units=system $(UUCHARUNIT) dos $(OBJPASUNIT) objects $(STRINGSUNIT) \
sysutils $(TYPINFOUNIT) $(MATHUNIT) \
cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) posix
$(CPUUNIT) $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) posix
rsts=$(MATHUNIT) $(TYPINFOUNIT)
[require]
@ -106,12 +106,6 @@ sysutils$(PPUEXT) : $(POSIXINC)/sysutils.pp $(wildcard $(OBJPASDIR)/*.inc) \
$(OBJPASUNIT)$(PPUEXT) dos$(PPUEXT)
$(COMPILER) -I$(OBJPASDIR) $(POSIXINC)/sysutils.pp
#
# Other system-independent RTL Units
#
cpu$(PPUEXT) : $(PROCINC)/cpu.pp system$(PPUEXT)
#
# Other system-dependent RTL Units
#

16
rtl/solaris/Makefile.fpc
View File

@ -66,11 +66,11 @@ SYSTEMUNIT=system
ifeq ($(ARCH),i386)
CPU_UNITS=cpu $(MMXUNIT)
CPU_UNITS=$(CPUUNIT) $(MMXUNIT)
endif
ifeq ($(ARCH),x86_64)
CPU_UNITS=cpu
CPU_UNITS=$(CPUUNIT)
SYSINIT_UNITS= # si_prc si_c si_dll
endif
@ -138,15 +138,3 @@ classes$(PPUEXT) : $(UNIXINC)/classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc)
$(SYSTEMUNIT)$(PPUEXT) $(FGLUNIT)$(PPUEXT) $(SORTBASEUNIT)$(PPUEXT)
$(COMPILER) -Fi$(OBJPASDIR)/classes $(UNIXINC)/classes.pp
#
# Other system-independent RTL Units
#
ifneq ($(findstring $(ARCH),x86_64 i386),)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) sysutils$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
endif

4
rtl/symbian/Makefile.fpc
View File

@ -45,11 +45,11 @@ endif
OBJPASDIR=$(RTL)/objpas
ifeq ($(ARCH),i386)
CPU_UNITS=cpu $(MMXUNIT)
CPU_UNITS=$(CPUUNIT) $(MMXUNIT)
endif
ifeq ($(ARCH),arm)
CPU_UNITS=cpu
CPU_UNITS=$(CPUUNIT)
endif
ifneq ($(findstring $(ARCH),i386),)

9
rtl/win16/Makefile.fpc
View File

@ -8,7 +8,7 @@ loaders=prt0s prt0m prt0c prt0l prt0h
units=system $(UUCHARUNIT) $(OBJPASUNIT) $(STRINGSUNIT) $(ISO7185UNIT) $(EXTPASUNIT) dos \
$(WINTYPESUNIT) $(WINPROCSUNIT) $(WIN31UNIT) $(PORTSUNIT) $(DYNLIBSUNIT) $(SORTBASEUNIT) \
$(SYSCONSTUNIT) $(RTLCONSTSUNIT) sysutils $(MATHUNIT) $(TYPESUNIT) $(TYPINFOUNIT) $(FGLUNIT) \
classes $(CHARSETUNIT) cpu $(GETOPTSUNIT) $(CPALLUNIT) \
classes $(CHARSETUNIT) $(CPUUNIT) $(GETOPTSUNIT) $(CPALLUNIT) \
$(UNICODEDATAUNIT) $(CHARACTERUNIT) $(CTYPESUNIT)
implicitunits=$(CP_UNITS)
@ -107,10 +107,3 @@ classes$(PPUEXT) : classes.pp $(wildcard $(OBJPASDIR)/classes/*.inc) \
$(COMPILER) -Fi$(OBJPASDIR)/classes classes.pp
$(EXECPPAS)
#
# Other system-independent RTL Units
#
cpu$(PPUEXT) : $(PROCINC)/cpu.pp sysutils$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
$(EXECPPAS)