Remove OS rules for mmx unit and use MMXUNIT variable

This commit is contained in:
Pierre Muller 2023-09-13 22:00:15 +00:00
parent a56c329937
commit 9c9ac092a1
15 changed files with 16 additions and 44 deletions

View File

@ -64,7 +64,7 @@ SYSTEMUNIT=system
ifeq ($(ARCH),i386)
CPU_UNITS=cpu mmx
CPU_UNITS=cpu $(MMXUNIT)
endif
ifeq ($(ARCH),x86_64)
@ -184,9 +184,6 @@ cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
endif
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/mmx.pp
#
# Other system-dependent RTL Units
#

View File

@ -63,7 +63,7 @@ ifeq ($(findstring $(ARCH),i386 x86_64 arm),$(ARCH))
CPU_UNITS=cpu
endif
ifeq ($(ARCH),i386)
CPU_UNITS+=mmx
CPU_UNITS+=$(MMXUNIT)
endif
SYSTEMUNIT=system
@ -207,9 +207,6 @@ cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
endif
$(COMPILER) $(PROCINC)/cpu.pp
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/mmx.pp
cthreads$(PPUEXT) : $(UNIXINC)/cthreads.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(UNIXINC)/cthreads.pp

View File

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

View File

@ -186,8 +186,6 @@ else
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
endif
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
#
# Other system-dependent RTL Units
#

View File

@ -66,7 +66,7 @@ SYSTEMUNIT=system
loaders+=gprt0
ifeq ($(ARCH),i386)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu mmx
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu $(MMXUNIT)
ASTARGET=--32
endif
@ -200,9 +200,6 @@ cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
endif
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
#
# Other system-dependent RTL Units
#

View File

@ -9,7 +9,7 @@ units=system $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(EXTPASUN
go32 dpmiexcp initc $(PORTSUNIT) profile dxetype dxeload emu387 \
dos $(CMEMUNIT) $(SORTBASEUNIT) \
sysutils classes math typinfo \
cpu mmx $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) ctypes $(FGLUNIT) \
cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) $(LNFODWRFUNIT) ctypes $(FGLUNIT) \
msmouse $(CHARSETUNIT) $(CPALLUNIT) \
$(CHARACTERUNIT) $(FPWIDESTRINGUNIT) $(UNICODEDATAUNIT) \
types sysconst rtlconst \
@ -155,10 +155,6 @@ cpu$(PPUEXT) : $(PROCINC)/cpu.pp system$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
$(EXECPPAS)
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) system$(PPUEXT)
$(COMPILER) $(PROCINC)/mmx.pp
$(EXECPPAS)
matrix$(PPUEXT) : $(INC)/matrix.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(INC)/matrix.pp
$(EXECPPAS)

View File

@ -58,7 +58,7 @@ UNITPREFIX=rtl
ifeq ($(ARCH),i386)
LOADERS=cprt0 dllcprt0
CPU_UNITS=cpu mmx
CPU_UNITS=cpu $(MMXUNIT)
endif
ifeq ($(ARCH),x86_64)

View File

@ -15,7 +15,7 @@ units=system si_prc $(UUCHARUNIT) $(OBJPASUNIT) $(ISO7185UNIT) $(STRINGSUNIT) $(
# $(FPWIDESTRINGUNIT) $(CHARACTERUNIT) $(UNICODEDATAUNIT)
# $(CMEMUNIT)
# initc profile dxetype dxeload emu387 \
# cpu mmx \
# cpu $(MMXUNIT) \
# vesamode \
# rsts=math typinfo classes dateutil sysconst
implicitunits= $(CP_UNITS)

View File

@ -55,7 +55,7 @@ SYSTEMUNIT=system
CPU_UNITS=
ifeq ($(ARCH),i386)
CPU_UNITS=cpu mmx
CPU_UNITS=cpu $(MMXUNIT)
endif
ifeq ($(ARCH),x86_64)

View File

@ -45,7 +45,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
unix \
dos \
sysutils typinfo math \
cpu mmx $(GETOPTSUNIT) $(HEAPTRCUNIT) \
cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
$(ERRORSUNIT)
[prerules]
@ -78,7 +78,7 @@ ifeq ($(ARCH),x86_64)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu
endif
ifeq ($(ARCH),i386)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu mmx
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu $(MMXUNIT)
endif
@ -193,9 +193,6 @@ cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
endif
$(COMPILER) $<
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
fpmkunit$(PPUEXT) : $(COMMON)/fpmkunit.pp classes$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<

View File

@ -11,7 +11,7 @@ units=$(SYSTEMUNIT) $(UUCHARUNIT) $(OBJPASUNIT) $(MACPASUNIT) $(ISO7185UNIT) $(E
$(LINEINFOUNIT) $(LNFODWRFUNIT) $(HEAPTRCUNIT) \
nwsnut libc dos sysconst \
initc sysutils types typinfo $(SORTBASEUNIT) $(FGLUNIT) classes \
cpu mmx $(GETOPTSUNIT) \
cpu $(MMXUNIT) $(GETOPTSUNIT) \
$(CHARSETUNIT) $(CPALLUNIT) \
rtlconsts math \
dynlibs $(CMEMUNIT) ctypes \
@ -177,8 +177,6 @@ sysconst$(PPUEXT) : $(OBJPASDIR)/sysconst.pp $(OBJPASUNIT)$(PPUEXT) $(SYSTEMUNIT
cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
ctypes$(PPUEXT) : $(INC)/ctypes.pp $(SYSTEMUNIT)$(PPUEXT)
#

View File

@ -45,7 +45,7 @@ libunits=$(SYSTEMUNIT) $(OBJPASUNIT) $(STRINGSUNIT) \
unix \
dos \
sysutils typinfo math \
cpu mmx $(GETOPTSUNIT) $(HEAPTRCUNIT) \
cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) \
$(ERRORSUNIT)
[prerules]
@ -84,7 +84,7 @@ ifeq ($(ARCH),x86_64)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu
endif
ifeq ($(ARCH),i386)
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu mmx
CPU_UNITS=$(X86UNIT) $(PORTSUNIT) cpu $(MMXUNIT)
endif
# Paths
@ -225,9 +225,6 @@ cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
endif
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<
bsd$(PPUEXT) : $(BSDINC)/bsd.pas initc$(PPUEXT) unix$(PPUEXT) syscall$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $<

View File

@ -9,7 +9,7 @@ main=rtl
loaders=cprt0 crti crtn
units=system $(UUCHARUNIT) dos $(OBJPASUNIT) objects $(STRINGSUNIT) \
sysutils typinfo math \
cpu mmx $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) posix
cpu $(MMXUNIT) $(GETOPTSUNIT) $(HEAPTRCUNIT) $(LINEINFOUNIT) posix
rsts=math typinfo
[require]
@ -118,8 +118,6 @@ math$(PPUEXT): $(OBJPASDIR)/math.pp $(OBJPASUNIT)$(PPUEXT) sysutils$(PPUEXT)
cpu$(PPUEXT) : $(PROCINC)/cpu.pp system$(PPUEXT)
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) system$(PPUEXT)
#
# Other system-dependent RTL Units
#

View File

@ -63,7 +63,7 @@ SYSTEMUNIT=system
ifeq ($(ARCH),i386)
CPU_UNITS=cpu mmx
CPU_UNITS=cpu $(MMXUNIT)
endif
ifeq ($(ARCH),x86_64)
@ -183,9 +183,6 @@ cpu$(PPUEXT) : $(PROCINC)/cpu.pp $(SYSTEMUNIT)$(PPUEXT) $(OBJPASUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/cpu.pp
endif
mmx$(PPUEXT) : $(PROCINC)/mmx.pp cpu$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)
$(COMPILER) $(PROCINC)/mmx.pp
#
# Other system-dependent RTL Units
#

View File

@ -45,7 +45,7 @@ endif
OBJPASDIR=$(RTL)/objpas
ifeq ($(ARCH),i386)
CPU_UNITS=cpu mmx
CPU_UNITS=cpu $(MMXUNIT)
endif
ifeq ($(ARCH),arm)