diff --git a/.gitattributes b/.gitattributes index dcebe8e6b7..010c2ad725 100644 --- a/.gitattributes +++ b/.gitattributes @@ -9798,7 +9798,6 @@ rtl/win32/Makefile.fpc svneol=native#text/plain rtl/win32/buildrtl.lpi svneol=native#text/plain rtl/win32/buildrtl.pp svneol=native#text/plain rtl/win32/classes.pp svneol=native#text/plain -rtl/win32/gprt0.as svneol=native#text/plain rtl/win32/initc.pp svneol=native#text/plain rtl/win32/objinc.inc svneol=native#text/plain rtl/win32/rtldefs.inc svneol=native#text/plain @@ -9809,11 +9808,8 @@ rtl/win32/sysinitcyg.pp svneol=native#text/plain rtl/win32/sysinitgprof.pp svneol=native#text/plain rtl/win32/sysinitpas.pp svneol=native#text/plain rtl/win32/system.pp svneol=native#text/plain -rtl/win32/wcygprt0.as svneol=native#text/plain -rtl/win32/wdllprt0.as svneol=native#text/plain rtl/win32/windows.pp svneol=native#text/plain rtl/win32/winsysut.pp svneol=native#text/plain -rtl/win32/wprt0.as svneol=native#text/plain rtl/win64/Makefile svneol=native#text/plain rtl/win64/Makefile.fpc svneol=native#text/plain rtl/win64/buildrtl.lpi svneol=native#text/plain diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index 319530645f..e030b73ffc 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -342,12 +342,7 @@ WININC=../win/wininc WINDIR=../win UNITPREFIX=rtl SYSTEMUNIT=system -ifneq ($(findstring 2.0.,$(FPC_VERSION)),) -LOADERS=wprt0 wdllprt0 gprt0 wcygprt0 -DLLS= -else DLLS=fpcmemdll -endif OBJPASDIR=$(RTL)/objpas include $(WININC)/makefile.inc WINDOWS_SOURCE_FILES=$(addprefix $(WININC)/,$(addsuffix .inc,$(WINDOWS_FILES))) @@ -3053,10 +3048,6 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES)) include $(PROCINC)/makefile.cpu SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) -wprt0$(OEXT) : wprt0.as -gprt0$(OEXT) : gprt0.as -wdllprt0$(OEXT) : wdllprt0.as -wcygprt0$(OEXT) : wcygprt0.as system$(PPUEXT) : system.pp $(SYSDEPS) $(COMPILER) -Us -Sg system.pp -Fi../win uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp diff --git a/rtl/win32/Makefile.fpc b/rtl/win32/Makefile.fpc index 8987613299..a518254675 100644 --- a/rtl/win32/Makefile.fpc +++ b/rtl/win32/Makefile.fpc @@ -53,13 +53,7 @@ WINDIR=../win UNITPREFIX=rtl SYSTEMUNIT=system - -ifneq ($(findstring 2.0.,$(FPC_VERSION)),) -LOADERS=wprt0 wdllprt0 gprt0 wcygprt0 -DLLS= -else DLLS=fpcmemdll -endif # Paths OBJPASDIR=$(RTL)/objpas @@ -90,18 +84,6 @@ SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES)) SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS) -# -# Loaders -# - -wprt0$(OEXT) : wprt0.as - -gprt0$(OEXT) : gprt0.as - -wdllprt0$(OEXT) : wdllprt0.as - -wcygprt0$(OEXT) : wcygprt0.as - # # Unit specific rules # diff --git a/rtl/win32/gprt0.as b/rtl/win32/gprt0.as deleted file mode 100644 index 124c677ec7..0000000000 --- a/rtl/win32/gprt0.as +++ /dev/null @@ -1,98 +0,0 @@ -//Startup code for WIN32 port of Free Pascal -//Written by P.Ozerski 1998 -// modified by Pierre Muller - .text - .globl _mainCRTStartup -_mainCRTStartup: - movb $1,operatingsystem_isconsole - jmp _start - - .globl _WinMainCRTStartup -_WinMainCRTStartup: - movb $0,operatingsystem_isconsole -_start: - subl $0x8,%esp - andl $0xfffffff0,%esp - push $_cmain - call _cygwin_crt0 - - .globl _cmain -_cmain: - subl $0x8,%esp - andl $0xfffffff0,%esp - - call __gmon_start__ - call ___main - - movl %esp,__stkptr - call _FPC_EXE_Entry - ret - - .globl __gmon_start__ -__gmon_start__: - pushl %ebp - movl __monstarted,%eax - leal 0x1(%eax),%edx - movl %esp,%ebp - movl %edx,__monstarted - testl %eax,%eax - jnz .Lnomonstart - pushl $etext /* Initialize gmon */ - pushl $_cmain - call _monstartup - addl $8,%esp -.Lnomonstart: - movl %ebp,%esp - popl %ebp - ret - - .globl asm_exit -asm_exit: - pushl %eax - call __mcleanup - popl %eax - pushl %eax - call exitprocess - -.text -.globl exitprocess -exitprocess: - jmp *.L10 - .balign 4,144 - -.text - .balign 4,144 - -.section .idata$2 - .rva .L7 - .long 0,0 - .rva .L6 - .rva .L8 - -.section .idata$4 -.L7: - .rva .L9 - .long 0 - -.section .idata$5 -.L8: - - -.section .idata$5 -.L10: - .rva .L9 - .long 0 - -.section .idata$6 -.L9: - .short 0 - .ascii "ExitProcess\000" - .balign 2,0 - -.section .idata$7 -.L6: - .ascii "kernel32.dll\000" - -.bss - .lcomm __monstarted,4 - .comm __stkptr,4 diff --git a/rtl/win32/wcygprt0.as b/rtl/win32/wcygprt0.as deleted file mode 100644 index 9325d86d3a..0000000000 --- a/rtl/win32/wcygprt0.as +++ /dev/null @@ -1,73 +0,0 @@ -//Startup code for WIN32 port of Free Pascal -//Written by P.Ozerski 1998 -// modified by Pierre Muller - .text - .globl _mainCRTStartup -_mainCRTStartup: - movb $1,operatingsystem_isconsole - jmp _start - - .globl _WinMainCRTStartup -_WinMainCRTStartup: - movb $0,operatingsystem_isconsole -_start: - subl $0x8,%esp - andl $0xfffffff0,%esp - push $_cmain - call _cygwin_crt0 - - .globl _cmain -_cmain: - subl $0x8,%esp - andl $0xfffffff0,%esp - call ___main - movl %esp,__stkptr - call _FPC_EXE_Entry - ret - - .globl asm_exit -asm_exit: - pushl %eax - call exitprocess - -.text -.globl exitprocess -exitprocess: - jmp *.L10 - .balign 4,144 - -.text - .balign 4,144 - -.section .idata$2 - .rva .L7 - .long 0,0 - .rva .L6 - .rva .L8 - -.section .idata$4 -.L7: - .rva .L9 - .long 0 - -.section .idata$5 -.L8: - - -.section .idata$5 -.L10: - .rva .L9 - .long 0 - -.section .idata$6 -.L9: - .short 0 - .ascii "ExitProcess\000" - .balign 2,0 - -.section .idata$7 -.L6: - .ascii "kernel32.dll\000" - -.bss - .comm __stkptr,4 diff --git a/rtl/win32/wdllprt0.as b/rtl/win32/wdllprt0.as deleted file mode 100644 index 78639c5b4c..0000000000 --- a/rtl/win32/wdllprt0.as +++ /dev/null @@ -1,76 +0,0 @@ -// DLL Startup code for WIN32 port of Free Pascal -// Written by P.Ozerski 16.10.1998 - .text - .globl _mainCRTStartup -_mainCRTStartup: - movb $1,operatingsystem_isconsole - jmp .LDLL_Entry - .globl _WinMainCRTStartup -_WinMainCRTStartup: - movb $0,operatingsystem_isconsole -.LDLL_Entry: - pushl %ebp - movl %esp,%ebp - pushl %ebx - pushl %esi - pushl %edi - movl 8(%ebp),%edi - movl %edi,SysInstance - movl 12(%ebp),%edi - movl %edi,operatingsystem_parameter_dllreason - movl 16(%ebp),%edi - movl %edi,operatingsystem_parameter_dllparam - movl %esp,__stkptr - call _FPC_DLL_Entry - popl %edi - popl %esi - popl %ebx - popl %ebp - ret $12 - - .globl asm_exit -asm_exit: - pushl %eax - call exitprocess - -.text -.globl exitprocess -exitprocess: - jmp *.L10 - .balign 4,144 - -.text - .balign 4,144 - -.section .idata$2 - .rva .L7 - .long 0,0 - .rva .L6 - .rva .L8 - -.section .idata$4 -.L7: - .rva .L9 - .long 0 - -.section .idata$5 -.L8: - - -.section .idata$5 -.L10: - .rva .L9 - .long 0 - -.section .idata$6 -.L9: - .short 0 - .ascii "ExitProcess\000" - .balign 2,0 - -.section .idata$7 -.L6: - .ascii "kernel32.dll\000" - -.bss - .comm __stkptr,4 diff --git a/rtl/win32/wprt0.as b/rtl/win32/wprt0.as deleted file mode 100644 index 2fb4f10994..0000000000 --- a/rtl/win32/wprt0.as +++ /dev/null @@ -1,61 +0,0 @@ -//Startup code for WIN32 port of Free Pascal -//Written by P.Ozerski 1998 -// modified by Pierre Muller - .text - .globl _mainCRTStartup -_mainCRTStartup: - movb $1,operatingsystem_isconsole - movl %esp,__stkptr - call _FPC_EXE_Entry - .globl _WinMainCRTStartup -_WinMainCRTStartup: - movb $0,operatingsystem_isconsole - movl %esp,__stkptr - call _FPC_EXE_Entry - - .globl asm_exit -asm_exit: - pushl %eax - call exitprocess - -.text -.globl exitprocess -exitprocess: - jmp *.L10 - .balign 4,144 - -.text - .balign 4,144 - -.section .idata$2 - .rva .L7 - .long 0,0 - .rva .L6 - .rva .L8 - -.section .idata$4 -.L7: - .rva .L9 - .long 0 - -.section .idata$5 -.L8: - - -.section .idata$5 -.L10: - .rva .L9 - .long 0 - -.section .idata$6 -.L9: - .short 0 - .ascii "ExitProcess\000" - .balign 2,0 - -.section .idata$7 -.L6: - .ascii "kernel32.dll\000" - -.bss - .comm __stkptr,4