From 1d7e2bb6cb285a61bed1f36d6520d6e86d6e3719 Mon Sep 17 00:00:00 2001 From: peter Date: Mon, 18 Jun 2001 20:36:28 +0000 Subject: [PATCH] * -Ur added --- rtl/beos/Makefile | 9 ++++++++- rtl/beos/Makefile.fpc | 11 +++++++++++ rtl/freebsd/Makefile.fpc | 12 +++++++++++- rtl/go32v1/Makefile | 9 ++++++++- rtl/go32v1/Makefile.fpc | 11 +++++++++++ rtl/go32v2/Makefile | 9 ++++++++- rtl/go32v2/Makefile.fpc | 11 +++++++++++ rtl/go32v2/dpmiexcp.pp | 12 +++++++++--- rtl/linux/Makefile | 10 ++++++++-- rtl/linux/Makefile.fpc | 12 +++++++++++- rtl/os2/Makefile | 9 ++++++++- rtl/os2/Makefile.fpc | 11 +++++++++++ rtl/win32/Makefile | 10 ++++++++-- rtl/win32/Makefile.fpc | 12 +++++++++++- 14 files changed, 134 insertions(+), 14 deletions(-) diff --git a/rtl/beos/Makefile b/rtl/beos/Makefile index 36ae7c12e9..2dcbec9bbf 100644 --- a/rtl/beos/Makefile +++ b/rtl/beos/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/06] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/10] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -125,6 +125,13 @@ INC=$(RTL)/inc PROCINC=$(RTL)/$(CPU_TARGET) UNIXINC=$(RTL)/unix UNITPREFIX=rtl +ifdef RELEASE +ifneq ($(findstring 1.0.2,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.4,$(FPC_VERSION)),) +override FPCOPT+=-Ur +endif +endif +endif OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph override TARGET_UNITS+=system objpas strings beos dos sysutils typinfo math varutils cpu mmx getopts heaptrc lineinfo diff --git a/rtl/beos/Makefile.fpc b/rtl/beos/Makefile.fpc index b970e2560c..7136fb4a93 100644 --- a/rtl/beos/Makefile.fpc +++ b/rtl/beos/Makefile.fpc @@ -38,6 +38,17 @@ UNIXINC=$(RTL)/unix UNITPREFIX=rtl +# Use new feature from 1.0.5 version +# that generates release PPU files +# which will not be recompiled +ifdef RELEASE +ifneq ($(findstring 1.0.2,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.4,$(FPC_VERSION)),) +override FPCOPT+=-Ur +endif +endif +endif + # Paths OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph diff --git a/rtl/freebsd/Makefile.fpc b/rtl/freebsd/Makefile.fpc index f04cbd9104..b5fa5e1497 100644 --- a/rtl/freebsd/Makefile.fpc +++ b/rtl/freebsd/Makefile.fpc @@ -25,7 +25,6 @@ fpcpackage=y [default] fpcdir=../.. target=freebsd -cpu=i386 [compiler] includedir=$(INC) $(PROCINC) $(UNIXINC) @@ -60,6 +59,17 @@ override FPCOPT+=-dUNIX PRT0=prt0_10 endif +# Use new feature from 1.0.5 version +# that generates release PPU files +# which will not be recompiled +ifdef RELEASE +ifneq ($(findstring 1.0.2,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.4,$(FPC_VERSION)),) +override FPCOPT+=-Ur +endif +endif +endif + # Paths OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph diff --git a/rtl/go32v1/Makefile b/rtl/go32v1/Makefile index 95a37b82dd..a214544afb 100644 --- a/rtl/go32v1/Makefile +++ b/rtl/go32v1/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/06] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/10] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -123,6 +123,13 @@ override PACKAGE_NAME=rtl RTL=.. INC=../inc PROCINC=../$(CPU_TARGET) +ifdef RELEASE +ifneq ($(findstring 1.0.2,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.4,$(FPC_VERSION)),) +override FPCOPT+=-Ur +endif +endif +endif OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph SYSTEMUNIT=system diff --git a/rtl/go32v1/Makefile.fpc b/rtl/go32v1/Makefile.fpc index b6c2e735f8..c7f2213362 100644 --- a/rtl/go32v1/Makefile.fpc +++ b/rtl/go32v1/Makefile.fpc @@ -36,6 +36,17 @@ RTL=.. INC=../inc PROCINC=../$(CPU_TARGET) +# Use new feature from 1.0.5 version +# that generates release PPU files +# which will not be recompiled +ifdef RELEASE +ifneq ($(findstring 1.0.2,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.4,$(FPC_VERSION)),) +override FPCOPT+=-Ur +endif +endif +endif + # Paths OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph diff --git a/rtl/go32v2/Makefile b/rtl/go32v2/Makefile index 92b4b3f157..2dacd5729d 100644 --- a/rtl/go32v2/Makefile +++ b/rtl/go32v2/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/06] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/10] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -124,6 +124,13 @@ RTL=.. INC=../inc PROCINC=../$(CPU_TARGET) UNITPREFIX=rtl +ifdef RELEASE +ifneq ($(findstring 1.0.2,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.4,$(FPC_VERSION)),) +override FPCOPT+=-Ur +endif +endif +endif OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph ifdef EXCEPTIONS_IN_SYSTEM diff --git a/rtl/go32v2/Makefile.fpc b/rtl/go32v2/Makefile.fpc index 3ce37a7a0a..3cf99fa949 100644 --- a/rtl/go32v2/Makefile.fpc +++ b/rtl/go32v2/Makefile.fpc @@ -40,6 +40,17 @@ PROCINC=../$(CPU_TARGET) UNITPREFIX=rtl +# Use new feature from 1.0.5 version +# that generates release PPU files +# which will not be recompiled +ifdef RELEASE +ifneq ($(findstring 1.0.2,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.4,$(FPC_VERSION)),) +override FPCOPT+=-Ur +endif +endif +endif + # Paths OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph diff --git a/rtl/go32v2/dpmiexcp.pp b/rtl/go32v2/dpmiexcp.pp index 4c8d6f93d7..b4bb58adf8 100644 --- a/rtl/go32v2/dpmiexcp.pp +++ b/rtl/go32v2/dpmiexcp.pp @@ -1032,7 +1032,10 @@ begin { if a subfunction calls runerror !! } exceptions_on:=not exceptions_on; v2prt0_exceptions_on:=exceptions_on; - for i:=0 to EXCEPTIONCOUNT-1 do + { Exceptions 18 and 19 settings generates a bug in + the DJGPP debug code PM } + + for i:=0 to 17{EXCEPTIONCOUNT-1} do begin if get_pm_exception_handler(i,_except) then begin @@ -1288,7 +1291,7 @@ begin { the first 18 exceptions start at offset +8 since exception #18 and #19 had to be put in front of the table. } _except.offset:=@djgpp_exception_table + 8; - for i:=0 to ExceptionCount-3 do + for i:=0 to 17 do begin except_ori[i] := _except; { New value to set } inc(_except.offset,4); { This is the size of push n, jmp } @@ -1480,7 +1483,10 @@ end; {$endif IN_SYSTEM} { $Log$ - Revision 1.5 2001-06-13 18:27:14 peter + Revision 1.6 2001-06-18 20:36:29 peter + * -Ur added + + Revision 1.5 2001/06/13 18:27:14 peter * missing exceptions for restoring (merged) Revision 1.4 2000/10/05 21:56:45 pierre diff --git a/rtl/linux/Makefile b/rtl/linux/Makefile index 9363a0769d..fbe1182164 100644 --- a/rtl/linux/Makefile +++ b/rtl/linux/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/06] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/10] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -58,7 +58,6 @@ else BASEDIR=. endif override OS_TARGET=linux -override CPU_TARGET=i386 ifndef FPC ifdef PP FPC=$(PP) @@ -135,6 +134,13 @@ LINUXUNIT=linux PRT0=prt0_10 override FPCOPT+=-dUNIX endif +ifdef RELEASE +ifneq ($(findstring 1.0.2,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.4,$(FPC_VERSION)),) +override FPCOPT+=-Ur +endif +endif +endif OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph ifndef USELIBGGI diff --git a/rtl/linux/Makefile.fpc b/rtl/linux/Makefile.fpc index cb20c2e6d3..4486bdd862 100644 --- a/rtl/linux/Makefile.fpc +++ b/rtl/linux/Makefile.fpc @@ -28,7 +28,6 @@ fpcpackage=y [default] fpcdir=../.. target=linux -cpu=i386 [compiler] includedir=$(INC) $(PROCINC) $(UNIXINC) @@ -64,6 +63,17 @@ PRT0=prt0_10 override FPCOPT+=-dUNIX endif +# Use new feature from 1.0.5 version +# that generates release PPU files +# which will not be recompiled +ifdef RELEASE +ifneq ($(findstring 1.0.2,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.4,$(FPC_VERSION)),) +override FPCOPT+=-Ur +endif +endif +endif + # Paths OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph diff --git a/rtl/os2/Makefile b/rtl/os2/Makefile index 01b7754161..31678b9cfb 100644 --- a/rtl/os2/Makefile +++ b/rtl/os2/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/06] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/10] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -129,6 +129,13 @@ SYSTEMUNIT=system else SYSTEMUNIT=sysos2 endif +ifdef RELEASE +ifneq ($(findstring 1.0.2,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.4,$(FPC_VERSION)),) +override FPCOPT+=-Ur +endif +endif +endif OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph override TARGET_UNITS+=$(SYSTEMUNIT) objpas strings ports os2def doscalls moncalls kbdcalls moucalls viocalls pmbitmap pmwin pmgpi dive dos crt objects printer sysutils math typinfo varutils ucomplex cpu mmx getopts heaptrc lineinfo dynlibs video mouse keyboard diff --git a/rtl/os2/Makefile.fpc b/rtl/os2/Makefile.fpc index c4bed64fc8..a1cb9fa1a3 100644 --- a/rtl/os2/Makefile.fpc +++ b/rtl/os2/Makefile.fpc @@ -46,6 +46,17 @@ else SYSTEMUNIT=sysos2 endif +# Use new feature from 1.0.5 version +# that generates release PPU files +# which will not be recompiled +ifdef RELEASE +ifneq ($(findstring 1.0.2,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.4,$(FPC_VERSION)),) +override FPCOPT+=-Ur +endif +endif +endif + # Paths OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index dc9fea0374..2c370de71f 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/06] +# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/10] # default: all override PATH:=$(subst \,/,$(PATH)) @@ -58,7 +58,6 @@ else BASEDIR=. endif override OS_TARGET=win32 -override CPU_TARGET=i386 ifndef FPC ifdef PP FPC=$(PP) @@ -132,6 +131,13 @@ else SYSTEMUNIT=syswin32 PRT0=wprt0_10 endif +ifdef RELEASE +ifneq ($(findstring 1.0.2,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.4,$(FPC_VERSION)),) +override FPCOPT+=-Ur +endif +endif +endif OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph include $(WININC)/makefile.inc diff --git a/rtl/win32/Makefile.fpc b/rtl/win32/Makefile.fpc index d4317c26b3..07e01848ba 100644 --- a/rtl/win32/Makefile.fpc +++ b/rtl/win32/Makefile.fpc @@ -25,7 +25,6 @@ fpcpackage=y [default] fpcdir=../.. target=win32 -cpu=i386 [compiler] includedir=$(INC) $(PROCINC) @@ -49,6 +48,17 @@ SYSTEMUNIT=syswin32 PRT0=wprt0_10 endif +# Use new feature from 1.0.5 version +# that generates release PPU files +# which will not be recompiled +ifdef RELEASE +ifneq ($(findstring 1.0.2,$(FPC_VERSION)),) +ifneq ($(findstring 1.0.4,$(FPC_VERSION)),) +override FPCOPT+=-Ur +endif +endif +endif + # Paths OBJPASDIR=$(RTL)/objpas GRAPHDIR=$(INC)/graph