2
0
Эх сурвалжийг харах

* makefiles updated after the msdos loader changes

git-svn-id: trunk@24810 -
nickysn 12 жил өмнө
parent
commit
54ec2f4b4b

+ 76 - 76
rtl/msdos/Makefile

@@ -556,223 +556,223 @@ ifeq ($(FULL_TARGET),i8086-msdos)
 override TARGET_UNITS+=system uuchar objpas strings dos crt heaptrc lineinfo sysconst sysutils math macpas iso7185 rtlconst typinfo varutils variants types dateutil convutil strutils stdconvs matrix ucomplex getopts fgl classes objects msmouse ports
 endif
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i386-android)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),powerpc-aix)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),x86_64-netbsd)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),x86_64-openbsd)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),arm-android)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),powerpc64-aix)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),mips-linux)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),jvm-java)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),jvm-android)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 ifeq ($(FULL_TARGET),i8086-msdos)
-override TARGET_LOADERS+=prt0 prt0t # exceptn fpu
+override TARGET_LOADERS+=prt0s prt0t # exceptn fpu
 endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
@@ -2391,9 +2391,9 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
 include $(PROCINC)/makefile.cpu
 SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
-prt0$(OEXT) : prt0.asm
-	nasm -f obj -o $(UNITTARGETDIRPREFIX)prt0$(OEXT) prt0.asm
-prt0t$(OEXT) : prt0t.asm
+prt0s$(OEXT) : prt0s.asm prt0st.asm
+	nasm -f obj -o $(UNITTARGETDIRPREFIX)prt0s$(OEXT) prt0s.asm
+prt0t$(OEXT) : prt0t.asm prt0st.asm
 	nasm -f obj -o $(UNITTARGETDIRPREFIX)prt0t$(OEXT) prt0t.asm
 system$(PPUEXT) : system.pp $(SYSDEPS)
 	$(COMPILER) -Us -Sg system.pp

+ 4 - 4
rtl/msdos/Makefile.fpc

@@ -4,7 +4,7 @@
 [package]
 main=rtl
 [target]
-loaders=prt0 prt0t # exceptn fpu
+loaders=prt0s prt0t # exceptn fpu
 units=system uuchar objpas strings dos crt heaptrc lineinfo sysconst sysutils \
       math macpas iso7185 rtlconst typinfo varutils variants types dateutil \
       convutil strutils stdconvs matrix ucomplex getopts fgl classes objects \
@@ -62,9 +62,9 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 #
 # Loaders
 #
-prt0$(OEXT) : prt0.asm
-        nasm -f obj -o $(UNITTARGETDIRPREFIX)prt0$(OEXT) prt0.asm
-prt0t$(OEXT) : prt0t.asm
+prt0s$(OEXT) : prt0s.asm prt0st.asm
+        nasm -f obj -o $(UNITTARGETDIRPREFIX)prt0s$(OEXT) prt0s.asm
+prt0t$(OEXT) : prt0t.asm prt0st.asm
         nasm -f obj -o $(UNITTARGETDIRPREFIX)prt0t$(OEXT) prt0t.asm
 #
 # System Units (System, Objpas, Strings)