Homogenize with other OSes by also using CPU_UNITS make variable

rtl/aros/Makefile.fpc

@@ -11,7 +11,7 @@ units=$(SYSTEMUNIT) heaptrc uuchar objpas macpas iso7185 extpas buildrtl cpall
 implicitunits=$(SYSINITUNITS) athreads dos sysutils \
       ctypes strings rtlconsts sysconst math types \
       typinfo sortbase fgl classes charset character getopts \
-      fpwidestring fpintres exeinfo $(CPUUNITS) \
+      fpwidestring fpintres exeinfo $(CPU_UNITS) \
       cp1250 cp1251 cp1252 cp1253 cp1254 cp1255 cp1256 cp1257 cp1258 \
       cp437 cp646 cp737 cp775 cp850 cp852 cp855 cp856 cp857 cp860 cp861 cp862 \
       cp863 cp864 cp865 cp866 cp869 cp874 cp3021 cp8859_1 cp8859_2 cp8859_3 cp8859_4 \
@@ -60,11 +60,11 @@ endif
 OBJPASDIR=$(RTL)/objpas
 
 ifeq ($(ARCH),i386)
-CPUUNITS=cpu mmx lineinfo
+CPU_UNITS=cpu mmx lineinfo
 endif
 
 ifeq ($(ARCH),x86_64)
-CPUUNITS=cpu
+CPU_UNITS=cpu
 endif
 
 

rtl/haiku/Makefile.fpc

@@ -11,7 +11,7 @@ units=system $(SYSINITUNITS) uuchar baseunix unixtype ctypes objpas macpas iso71
       errors dos dl \
       sysconst sysutils \
       types charset cpall character typinfo sortbase classes fgl math \
-      cpu $(CPUUNITS) getopts heaptrc lineinfo lnfodwrf \
+      $(CPU_UNITS) getopts heaptrc lineinfo lnfodwrf \
       rtlconsts unix unixutil termio initc \
       cmem \
       dynlibs cwstring cthreads \
@@ -62,14 +62,17 @@ INC=$(RTL)/inc
 PROCINC=$(RTL)/$(CPU_TARGET)
 UNIXINC=$(RTL)/unix
 HAIKUINC=$(RTL)/haiku
-LOADERS=cprt0 dllcprt0
-CPUUNITS=mmx
 SYSINITUNITS=si_c si_dllc
 UNITPREFIX=rtl
 
+ifeq ($(ARCH),i386)
+LOADERS=cprt0 dllcprt0
+CPU_UNITS=cpu mmx
+endif
+
 ifeq ($(ARCH),x86_64)
-override LOADERS=
-override CPUUNITS=
+LOADERS=
+CPU_UNITS=cpu
 endif