54180 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
marco	f91e313eef	--- Merging r40805 into '.': ... U packages/graph/src/inc/graph.inc U packages/graph/src/inc/fills.inc U packages/graph/src/inc/graphh.inc --- Recording mergeinfo for merge of r40805 into '.': U . --- Merging r40836 into '.': G packages/graph/src/inc/graphh.inc --- Recording mergeinfo for merge of r40836 into '.': G . --- Merging r40837 into '.': U packages/graph/src/msdos/graph.pp U packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r40837 into '.': G . --- Merging r40852 into '.': U packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40852 into '.': G . --- Merging r40853 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40853 into '.': G . --- Merging r40861 into '.': G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r40861 into '.': G . --- Merging r40862 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40862 into '.': G . --- Merging r40863 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40863 into '.': G . --- Merging r40864 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp G packages/graph/src/inc/graph.inc --- Recording mergeinfo for merge of r40864 into '.': G . --- Merging r40865 into '.': U packages/graph/src/inc/modes.inc --- Recording mergeinfo for merge of r40865 into '.': G . --- Merging r40866 into '.': G packages/graph/src/inc/graph.inc --- Recording mergeinfo for merge of r40866 into '.': G . --- Merging r40867 into '.': G packages/graph/src/inc/fills.inc --- Recording mergeinfo for merge of r40867 into '.': G . --- Merging r40868 into '.': G packages/graph/src/inc/graph.inc --- Recording mergeinfo for merge of r40868 into '.': G . --- Merging r40873 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40873 into '.': G . --- Merging r40875 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40875 into '.': G . --- Merging r40876 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40876 into '.': G . --- Merging r40877 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40877 into '.': G . --- Merging r40878 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40878 into '.': G . --- Merging r40879 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40879 into '.': G . --- Merging r40880 into '.': G packages/graph/src/ptcgraph/ptcgraph.pp --- Recording mergeinfo for merge of r40880 into '.': G . --- Merging r40887 into '.': U packages/graph/src/go32v2/vesa.inc --- Recording mergeinfo for merge of r40887 into '.': G . --- Merging r40888 into '.': G packages/graph/src/go32v2/vesa.inc G packages/graph/src/go32v2/graph.pp --- Recording mergeinfo for merge of r40888 into '.': G . --- Merging r40889 into '.': G packages/graph/src/go32v2/graph.pp G packages/graph/src/go32v2/vesa.inc --- Recording mergeinfo for merge of r40889 into '.': G . --- Merging r40890 into '.': G packages/graph/src/msdos/graph.pp U packages/graph/src/msdos/vesa.inc --- Recording mergeinfo for merge of r40890 into '.': G . --- Merging r40891 into '.': G packages/graph/src/msdos/vesa.inc G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40891 into '.': G . --- Merging r40892 into '.': G packages/graph/src/msdos/graph.pp G packages/graph/src/msdos/vesa.inc --- Recording mergeinfo for merge of r40892 into '.': G . --- Merging r40893 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40893 into '.': G . --- Merging r40894 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40894 into '.': G . --- Merging r40895 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40895 into '.': G . --- Merging r40896 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40896 into '.': G . --- Merging r40897 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40897 into '.': G . --- Merging r40898 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40898 into '.': G . --- Merging r40900 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40900 into '.': G . --- Merging r40901 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40901 into '.': G . --- Merging r40902 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40902 into '.': G . --- Merging r40903 into '.': G packages/graph/src/inc/graphh.inc G packages/graph/src/inc/graph.inc --- Recording mergeinfo for merge of r40903 into '.': G . --- Merging r40904 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40904 into '.': G . --- Merging r40906 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40906 into '.': G . --- Merging r40907 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40907 into '.': G . --- Merging r40909 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40909 into '.': G . --- Merging r40910 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40910 into '.': G . --- Merging r40911 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40911 into '.': G . --- Merging r40913 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40913 into '.': G . --- Merging r40914 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40914 into '.': G . --- Merging r40915 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40915 into '.': G . --- Merging r40916 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40916 into '.': G . --- Merging r40917 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40917 into '.': G . --- Merging r40918 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40918 into '.': G . --- Merging r40919 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40919 into '.': G . --- Merging r40922 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40922 into '.': G . --- Merging r40923 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40923 into '.': G . --- Merging r40924 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40924 into '.': G . --- Merging r40954 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40954 into '.': G . --- Merging r40955 into '.': G packages/graph/src/msdos/graph.pp --- Recording mergeinfo for merge of r40955 into '.': G . # revisions: 40805,40836,40837,40852,40853,40861,40862,40863,40864,40865,40866,40867,40868,40873,40875,40876,40877,40878,40879,40880,40887,40888,40889,40890,40891,40892,40893,40894,40895,40896,40897,40898,40900,40901,40902,40903,40904,40906,40907,40909,40910,40911,40913,40914,40915,40916,40917,40918,40919,40922,40923,40924,40954,40955 r40805 | nickysn | 2019-01-08 09:50:44 +0100 (Tue, 08 Jan 2019) | 5 lines Changed paths: M /trunk/packages/graph/src/inc/fills.inc M /trunk/packages/graph/src/inc/graph.inc M /trunk/packages/graph/src/inc/graphh.inc + introduced the ColorType (=word) to the graph unit. This is the type, used to represent a color. This is intended to make it easier to add support for 24-bit and 32-bit color to the graph unit on platforms that support it. r40836 | nickysn | 2019-01-10 16:56:53 +0100 (Thu, 10 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/graphh.inc * define ColorType as LongWord if FPC_GRAPH_SUPPORTS_TRUECOLOR is defined r40837 | nickysn | 2019-01-10 17:09:34 +0100 (Thu, 10 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp M /trunk/packages/graph/src/msdos/graph.pp + added the 24-bit color modes, as defined by VBE 1.x, behind ifdef FPC_GRAPH_SUPPORTS_TRUECOLOR (not enabled yet) r40852 | nickysn | 2019-01-13 11:34:06 +0100 (Sun, 13 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added the 24-bit color modes, as defined by VBE 1.x, behind ifdef FPC_GRAPH_SUPPORTS_TRUECOLOR (not enabled yet) r40853 | nickysn | 2019-01-13 12:25:58 +0100 (Sun, 13 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * factored out the common VESA mode initialization for each screen resolution to a separate procedure r40861 | nickysn | 2019-01-14 13:56:15 +0100 (Mon, 14 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp * factored out the common VESA mode initialization for each screen resolution to a separate procedure (same change as r40853, but for go32v2) r40862 | nickysn | 2019-01-14 15:09:21 +0100 (Mon, 14 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp * factored out the common VESA mode initialization for each screen resolution to a separate procedure (same change as r40853, but for ptcgraph) r40863 | nickysn | 2019-01-14 15:59:58 +0100 (Mon, 14 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + initial implementation of 32bpp support (not enabled yet) r40864 | nickysn | 2019-01-14 16:20:59 +0100 (Mon, 14 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/graph.inc M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp * 32bpp (True Color) compilation fixes r40865 | nickysn | 2019-01-14 17:23:42 +0100 (Mon, 14 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/modes.inc * 24-bit color support in modes.inc:res2mode r40866 | nickysn | 2019-01-14 18:12:14 +0100 (Mon, 14 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/graph.inc + True Color fixes in GetScanlineDefault (returns 32 bits per pixel, but only in modes with >16bit color) r40867 | nickysn | 2019-01-14 18:13:07 +0100 (Mon, 14 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/fills.inc + True Color fixes in FloodFill r40868 | nickysn | 2019-01-14 18:33:53 +0100 (Mon, 14 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/inc/graph.inc + True Color fixes in DefaultGetImage, DefaultPutImage and DefaultImageSize r40873 | nickysn | 2019-01-16 14:52:07 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added fast 32bpp hline and vline drawing routines r40875 | nickysn | 2019-01-16 15:34:29 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added fast 32bpp GetScanLine routine r40876 | nickysn | 2019-01-16 15:54:53 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added fast 32bpp GetImage routine r40877 | nickysn | 2019-01-16 16:04:38 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added fast 32bpp PutImage routine r40878 | nickysn | 2019-01-16 17:00:31 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added an accelerated 8bpp pattern line drawing routine r40879 | nickysn | 2019-01-16 17:14:07 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added an accelerated 16bpp pattern line routine r40880 | nickysn | 2019-01-16 17:24:07 +0100 (Wed, 16 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/ptcgraph/ptcgraph.pp + added a 32bpp accelerated pattern line drawing routine r40887 | nickysn | 2019-01-17 15:47:39 +0100 (Thu, 17 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/vesa.inc + added a 16bpp linear framebuffer horizontal line drawing routine r40888 | nickysn | 2019-01-17 17:00:02 +0100 (Thu, 17 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp M /trunk/packages/graph/src/go32v2/vesa.inc + accelerated xor/and/orput hline routines for the 16bpp linear framebuffer modes r40889 | nickysn | 2019-01-17 18:07:54 +0100 (Thu, 17 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/go32v2/graph.pp M /trunk/packages/graph/src/go32v2/vesa.inc - removed all the 'ifdef fpc'/'ifndef fpc' from the go32v2 graph unit to make it easier to maintain and because its TP7 compatibility hasn't been maintained for a very long time r40890 | nickysn | 2019-01-18 13:32:00 +0100 (Fri, 18 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp M /trunk/packages/graph/src/msdos/vesa.inc * only save BP and DS when calling int 10h; mark the other registers as volatile in the asm blocks - removed the 'ifdef FPC' around the register saving code around the int 10h calls r40891 | nickysn | 2019-01-18 13:52:22 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp M /trunk/packages/graph/src/msdos/vesa.inc - removed all the '{$ifndef fpc}far;{$endif fpc}' declarations from the i8086-msdos graph unit r40892 | nickysn | 2019-01-18 14:22:18 +0100 (Fri, 18 Jan 2019) | 2 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp M /trunk/packages/graph/src/msdos/vesa.inc + use the ColorType type in the i8086-msdos graph unit, so that it compiles with FPC_GRAPH_SUPPORTS_TRUECOLOR (not enabled yet) r40893 | nickysn | 2019-01-18 14:32:45 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - get rid of the '{$ifdef fpc}@{$endif}' from the i8086-msdos graph unit r40894 | nickysn | 2019-01-18 14:46:47 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * fixed result of GetPixel320 when FPC_GRAPH_SUPPORTS_TRUECOLOR is defined r40895 | nickysn | 2019-01-18 14:49:05 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - removed commented out code from PutPixel320 and GetPixel320 r40896 | nickysn | 2019-01-18 16:17:43 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * cleaned up, fixed, optimized a little and enabled the assembler version of PutPixel16 r40897 | nickysn | 2019-01-18 16:48:09 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * cleaned up, fixed, optimized a little and enabled the assembler version of GetPixel16 r40898 | nickysn | 2019-01-18 20:57:51 +0100 (Fri, 18 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * refactored DirectPutPixel16, so it is strictly split into pascal and asm version; asm version not enabled yet r40900 | nickysn | 2019-01-19 11:58:18 +0100 (Sat, 19 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use huge memory model compatible initialization of es=SegA000 in the asm version of DirectPutPixel16 r40901 | nickysn | 2019-01-19 12:18:39 +0100 (Sat, 19 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - removed the pascal case code before the asm block in the asm version of DirectPutPixel16 r40902 | nickysn | 2019-01-19 13:54:47 +0100 (Sat, 19 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * cleaned up, optimized a little, added support for all write modes (and/or/xor/not) and enabled the asm version of the DirectPutPixel16 routine r40903 | nickysn | 2019-01-19 16:16:49 +0100 (Sat, 19 Jan 2019) | 6 lines Changed paths: M /trunk/packages/graph/src/inc/graph.inc M /trunk/packages/graph/src/inc/graphh.inc + introduced SetWriteModeEx to the Graph unit. Unlike SetWriteMode, it allows setting the current write mode to any mode, such as NormalPut/CopyPut, XorPut, OrPut, AndPut or NotPut. For comparison, SetWriteMode only allows NormalPut/ CopyPut and XorPut. Fixes Mantis #30773. r40904 | nickysn | 2019-01-19 16:59:42 +0100 (Sat, 19 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * handle the NotPut write mode in asm instead of pascal in the asm version of DirectPutPixel16 r40906 | nickysn | 2019-01-19 17:11:03 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * the asm version of DirectPutPixel16 convert to pure inline asm routine r40907 | nickysn | 2019-01-19 17:20:21 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - removed unused asm code from SetVisual200 r40909 | nickysn | 2019-01-19 17:36:54 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + added pure pascal version of the routine PutPixel320 r40910 | nickysn | 2019-01-19 17:38:44 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * huge memory model fix for the asm version of PutPixel320 r40911 | nickysn | 2019-01-19 17:46:30 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + enabled the asm version of PutPixel320 r40913 | nickysn | 2019-01-19 17:55:34 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + pure pascal implementation of GetPixel320 r40914 | nickysn | 2019-01-19 17:56:13 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * huge memory model fix for the asm version of the GetPixel320 routine r40915 | nickysn | 2019-01-19 17:56:49 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp + enabled the asm version of GetPixel320 r40916 | nickysn | 2019-01-19 17:59:15 +0100 (Sat, 19 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * do the view port adjustment in asm instead of pascal in the asm version of GetPixel320 r40917 | nickysn | 2019-01-19 18:02:54 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * GetPixel320 converted to a pure assembler routine r40918 | nickysn | 2019-01-19 18:24:24 +0100 (Sat, 19 Jan 2019) | 4 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * implemented the viewport adjustment in asm instead of pascal in the asm version of the PutPixel320 routine r40919 | nickysn | 2019-01-19 19:03:51 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * perform clipping in assembly in the PutPixel320 asm routine r40922 | nickysn | 2019-01-19 22:27:16 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * only read the low byte of the pixel color in the asm version of PutPixel320 r40923 | nickysn | 2019-01-19 22:33:26 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * use stosb instead of mov to draw the pixel inside the asm version of PutPixel320 r40924 | nickysn | 2019-01-19 23:07:03 +0100 (Sat, 19 Jan 2019) | 3 lines Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * PutPixel320 converted to pure assembler routine r40954 | nickysn | 2019-01-21 14:39:14 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp - removed the 32-bit asm code from the asm version of DirectPutPixel320 r40955 | nickysn | 2019-01-21 14:40:04 +0100 (Mon, 21 Jan 2019) | 1 line Changed paths: M /trunk/packages/graph/src/msdos/graph.pp * huge memory model fix for the asm version of DirectPutPixel320 git-svn-id: branches/fixes_3_2@41497 -	2019-02-26 20:36:23 +00:00
marco	0b7aab430e	--- Merging r41262 into '.': ... C rtl/win/wininc/defines.inc -> manually fixed order to match trunk U rtl/win/wininc/struct.inc U rtl/win/wininc/func.inc --- Recording mergeinfo for merge of r41262 into '.': U . Summary of conflicts: Text conflicts: 1 # revisions: 41262 r41262 | marco | 2019-02-09 13:07:30 +0100 (Sat, 09 Feb 2019) | 2 lines Changed paths: M /trunk/rtl/win/wininc/defines.inc M /trunk/rtl/win/wininc/func.inc M /trunk/rtl/win/wininc/struct.inc * flashwindowex, mantis #35048, patch by 440bx git-svn-id: branches/fixes_3_2@41315 -	2019-02-14 10:13:56 +00:00
marco	6ebff8062d	--- Merging r41268 into '.': ... U rtl/objpas/sysutils/syshelpo.inc --- Recording mergeinfo for merge of r41268 into '.': U . --- Merging r41274 into '.': U rtl/wince/wininc/defines.inc --- Recording mergeinfo for merge of r41274 into '.': G . # revisions: 41268,41274 deleted corrected entry 411268 Invalid stream operation r41268 | marco | 2019-02-09 18:12:20 +0100 (Sat, 09 Feb 2019) | 3 lines Changed paths: M /trunk/rtl/objpas/sysutils/syshelpo.inc * tohexstring calls inttohex instead of hexstr. Hexstr has fixed number of digits, inttohex a minimum number. Mantis #35015 deleted corrected entry 411268 Invalid stream operation r41274 | marco | 2019-02-10 10:20:54 +0100 (Sun, 10 Feb 2019) | 2 lines Changed paths: M /trunk/rtl/wince/wininc/defines.inc * add reg_qword. Feedback on #35050 git-svn-id: branches/fixes_3_2@41299 -	2019-02-11 13:05:34 +00:00
marco	ad69839b34	--- Merging r41264 into '.': ... U packages/winunits-base/src/activex.pp --- Recording mergeinfo for merge of r41264 into '.': U . --- Merging r41265 into '.': U rtl/win/wininc/defines.inc --- Recording mergeinfo for merge of r41265 into '.': G . --- Merging r41266 into '.': G rtl/win/wininc/defines.inc --- Recording mergeinfo for merge of r41266 into '.': G . --- Merging r41269 into '.': U rtl/win/wininc/base.inc --- Recording mergeinfo for merge of r41269 into '.': G . # revisions: 41264,41265,41266,41269 r41264 | marco | 2019-02-09 14:29:14 +0100 (Sat, 09 Feb 2019) | 2 lines Changed paths: M /trunk/packages/winunits-base/src/activex.pp * regcls constants from MSDN r41265 | marco | 2019-02-09 14:34:52 +0100 (Sat, 09 Feb 2019) | 2 lines Changed paths: M /trunk/rtl/win/wininc/defines.inc * some _E_ and _S_ constants from winerror.h used in activex patch. r41266 | marco | 2019-02-09 14:41:22 +0100 (Sat, 09 Feb 2019) | 1 line Changed paths: M /trunk/rtl/win/wininc/defines.inc * _S_ and _E_ first and last were already there, just in an unexpected winerror. Found after testing ->revert all but the last line. r41269 | marco | 2019-02-09 18:53:05 +0100 (Sat, 09 Feb 2019) | 2 lines Changed paths: M /trunk/rtl/win/wininc/base.inc * makerop to dword mantis #34712 git-svn-id: branches/fixes_3_2@41296 -	2019-02-11 10:15:49 +00:00
marco	e22ca656c5	--- Merging r41253 into '.': ... U rtl/win/wininc/defines.inc --- Recording mergeinfo for merge of r41253 into '.': U . --- Merging r41254 into '.': G rtl/win/wininc/defines.inc --- Recording mergeinfo for merge of r41254 into '.': G . # revisions: 41253,41254 git-svn-id: branches/fixes_3_2@41261 -	2019-02-09 11:53:21 +00:00
marco	7d336b1638	--- Merging r40496 into '.': ... U packages/amunits/src/coreunits/serial.pas --- Recording mergeinfo for merge of r40496 into '.': U . --- Merging r40497 into '.': A packages/arosunits/src/serial.pas U packages/arosunits/src/exec.pas U packages/arosunits/fpmake.pp A packages/os4units/src/serial.pas U packages/os4units/src/exec.pas U packages/os4units/fpmake.pp U packages/morphunits/fpmake.pp A packages/morphunits/src/serial.pas U packages/morphunits/src/exec.pas --- Recording mergeinfo for merge of r40497 into '.': G . --- Merging r40653 into '.': U packages/amunits/src/coreunits/amigados.pas --- Recording mergeinfo for merge of r40653 into '.': G . # revisions: 40496,40497,40653 git-svn-id: branches/fixes_3_2@41260 -	2019-02-09 11:38:56 +00:00
Jonas Maebe	3ac703506c	* rest of the previous accidental partial commit ... git-svn-id: branches/fixes_3_2@41250 -	2019-02-07 19:56:21 +00:00
Jonas Maebe	b40797e7f8	--- Merging r39844 into '.': ... U utils/fpcmkcfg/fpcmkcfg.pp U utils/fpcmkcfg/fpccfg.inc U utils/fpcmkcfg/fpc.cft --- Recording mergeinfo for merge of r39844 into '.': U . --- Merging r39949 into '.': U compiler/ncnv.pas U compiler/avr/cgcpu.pas U compiler/symconst.pas U compiler/defutil.pas U compiler/nadd.pas U compiler/ncgrtti.pas U compiler/llvm/llvmdef.pas U compiler/llvm/hlcgllvm.pas U compiler/dbgstabs.pas U compiler/ppcgen/cgppc.pas U compiler/ppcgen/ngppcadd.pas U compiler/psystem.pas U compiler/jvm/jvmdef.pas U compiler/jvm/njvminl.pas U compiler/jvm/njvmcnv.pas U compiler/jvm/hlcgcpu.pas U compiler/dbgdwarf.pas U compiler/sparcgen/cgsparc.pas U compiler/nmat.pas U compiler/nset.pas U compiler/symdef.pas U compiler/ngtcon.pas U compiler/scanner.pas U compiler/i8086/n8086add.pas U compiler/arm/narmadd.pas U compiler/arm/cgcpu.pas U compiler/ninl.pas U compiler/ptype.pas U compiler/nflw.pas U compiler/defcmp.pas U compiler/x86/cgx86.pas U compiler/x86_64/cpupara.pas U compiler/utils/ppuutils/ppudump.pp U compiler/htypechk.pas U compiler/pdecvar.pas U compiler/ncal.pas U compiler/m68k/cgcpu.pas U rtl/inc/systemh.inc --- Recording mergeinfo for merge of r39949 into '.': G . --- Merging r39950 into '.': U rtl/inc/objcbase.pp U rtl/inc/objcnf.inc U rtl/inc/objc1.inc U packages/cocoaint/src/CocoaAll.pas U packages/cocoaint/src/quartzcore/CIPlugIn.inc U packages/cocoaint/src/quartzcore/CAEmitterLayer.inc U packages/cocoaint/src/quartzcore/CAAnimation.inc U packages/cocoaint/src/quartzcore/CAOpenGLLayer.inc U packages/cocoaint/src/quartzcore/CAMediaTiming.inc U packages/cocoaint/src/quartzcore/CIImage.inc U packages/cocoaint/src/quartzcore/CIFilterGenerator.inc U packages/cocoaint/src/quartzcore/CAEmitterCell.inc U packages/cocoaint/src/quartzcore/CALayer.inc U packages/cocoaint/src/quartzcore/CIFilterShape.inc U packages/cocoaint/src/quartzcore/CATextLayer.inc U packages/cocoaint/src/quartzcore/CATransaction.inc U packages/cocoaint/src/quartzcore/CIPlugInInterface.inc U packages/cocoaint/src/quartzcore/CACIFilterAdditions.inc U packages/cocoaint/src/quartzcore/CAReplicatorLayer.inc U packages/cocoaint/src/foundation/NSURL.inc U packages/cocoaint/src/foundation/NSDictionary.inc U packages/cocoaint/src/foundation/NSObject.inc U packages/cocoaint/src/foundation/NSSpellServer.inc U packages/cocoaint/src/foundation/NSString.inc U packages/cocoaint/src/foundation/NSCalendar.inc U packages/cocoaint/src/foundation/NSURLRequest.inc U packages/cocoaint/src/foundation/NSZone.inc U packages/cocoaint/src/foundation/NSURLHandle.inc U packages/cocoaint/src/foundation/NSPropertyList.inc U packages/cocoaint/src/foundation/NSTimer.inc U packages/cocoaint/src/foundation/NSIndexSet.inc U packages/cocoaint/src/foundation/NSPathUtilities.inc U packages/cocoaint/src/foundation/NSDistributedNotificationCenter.inc U packages/cocoaint/src/foundation/NSSet.inc U packages/cocoaint/src/foundation/NSAppleEventManager.inc U packages/cocoaint/src/foundation/NSRunLoop.inc U packages/cocoaint/src/foundation/NSScriptClassDescription.inc U packages/cocoaint/src/foundation/NSOperation.inc U packages/cocoaint/src/foundation/NSUndoManager.inc U packages/cocoaint/src/foundation/NSMethodSignature.inc U packages/cocoaint/src/foundation/NSArchiver.inc U packages/cocoaint/src/foundation/NSUserDefaults.inc U packages/cocoaint/src/foundation/NSXMLNode.inc U packages/cocoaint/src/foundation/NSScriptCommandDescription.inc U packages/cocoaint/src/foundation/NSScriptObjectSpecifiers.inc U packages/cocoaint/src/foundation/NSInvocation.inc U packages/cocoaint/src/foundation/NSXMLParser.inc U packages/cocoaint/src/foundation/NSArray.inc U packages/cocoaint/src/foundation/NSMetadata.inc U packages/cocoaint/src/foundation/NSMapTable.inc U packages/cocoaint/src/foundation/NSURLDownload.inc U packages/cocoaint/src/foundation/NSHashTable.inc U packages/cocoaint/src/foundation/NSXMLDTD.inc U packages/cocoaint/src/foundation/NSURLCredential.inc U packages/cocoaint/src/foundation/NSValueTransformer.inc U packages/cocoaint/src/foundation/NSPredicate.inc U packages/cocoaint/src/foundation/NSPortCoder.inc U packages/cocoaint/src/foundation/NSXMLDTDNode.inc U packages/cocoaint/src/foundation/NSAppleEventDescriptor.inc U packages/cocoaint/src/foundation/NSScriptCommand.inc U packages/cocoaint/src/foundation/NSCache.inc U packages/cocoaint/src/foundation/NSKeyValueObserving.inc U packages/cocoaint/src/foundation/NSDecimalNumber.inc U packages/cocoaint/src/foundation/NSScriptSuiteRegistry.inc U packages/cocoaint/src/foundation/NSKeyValueCoding.inc U packages/cocoaint/src/foundation/NSBundle.inc U packages/cocoaint/src/foundation/NSPointerFunctions.inc U packages/cocoaint/src/foundation/NSXMLElement.inc U packages/cocoaint/src/foundation/NSValue.inc U packages/cocoaint/src/foundation/NSPort.inc U packages/cocoaint/src/foundation/NSAppleScript.inc U packages/cocoaint/src/foundation/NSSortDescriptor.inc U packages/cocoaint/src/foundation/NSLock.inc U packages/cocoaint/src/foundation/NSScanner.inc U packages/cocoaint/src/foundation/NSStream.inc U packages/cocoaint/src/foundation/NSGeometry.inc U packages/cocoaint/src/foundation/NSScriptWhoseTests.inc U packages/cocoaint/src/foundation/NSXMLDocument.inc U packages/cocoaint/src/foundation/NSConnection.inc U packages/cocoaint/src/foundation/NSDateFormatter.inc U packages/cocoaint/src/foundation/NSTask.inc U packages/cocoaint/src/foundation/NSFormatter.inc U packages/cocoaint/src/foundation/NSThread.inc U packages/cocoaint/src/foundation/NSCharacterSet.inc U packages/cocoaint/src/foundation/NSData.inc U packages/cocoaint/src/foundation/NSHTTPCookie.inc U packages/cocoaint/src/foundation/NSFileManager.inc U packages/cocoaint/src/foundation/NSPortNameServer.inc U packages/cocoaint/src/foundation/NSNumberFormatter.inc U packages/cocoaint/src/foundation/NSDate.inc U packages/cocoaint/src/foundation/NSHost.inc U packages/cocoaint/src/foundation/NSProxy.inc U packages/cocoaint/src/foundation/NSURLConnection.inc U packages/cocoaint/src/foundation/NSURLProtocol.inc U packages/cocoaint/src/foundation/NSURLProtectionSpace.inc U packages/cocoaint/src/foundation/NSKeyedArchiver.inc U packages/cocoaint/src/foundation/NSPortMessage.inc U packages/cocoaint/src/foundation/NSError.inc U packages/cocoaint/src/foundation/NSNetServices.inc U packages/cocoaint/src/foundation/NSTimeZone.inc U packages/cocoaint/src/foundation/NSFileHandle.inc U packages/cocoaint/src/foundation/NSDistributedLock.inc U packages/cocoaint/src/foundation/NSCoder.inc U packages/cocoaint/src/foundation/NSGarbageCollector.inc U packages/cocoaint/src/InlineFunctions.inc U packages/cocoaint/src/coredata/NSPersistentStore.inc U packages/cocoaint/src/coredata/NSEntityDescription.inc U packages/cocoaint/src/coredata/NSPersistentStoreCoordinator.inc U packages/cocoaint/src/coredata/NSFetchRequestExpression.inc U packages/cocoaint/src/coredata/NSManagedObject.inc U packages/cocoaint/src/coredata/NSMigrationManager.inc U packages/cocoaint/src/coredata/NSPropertyDescription.inc U packages/cocoaint/src/coredata/NSManagedObjectContext.inc U packages/cocoaint/src/coredata/NSAtomicStore.inc U packages/cocoaint/src/coredata/NSManagedObjectID.inc U packages/cocoaint/src/coredata/NSFetchRequest.inc U packages/cocoaint/src/coredata/NSManagedObjectModel.inc U packages/cocoaint/src/coredata/NSRelationshipDescription.inc U packages/cocoaint/src/coredata/NSEntityMigrationPolicy.inc U packages/cocoaint/src/webkit/DOMEventTarget.inc U packages/cocoaint/src/webkit/DOMMouseEvent.inc U packages/cocoaint/src/webkit/DOMHTMLStyleElement.inc U packages/cocoaint/src/webkit/DOMWheelEvent.inc U packages/cocoaint/src/webkit/WebUIDelegate.inc U packages/cocoaint/src/webkit/WebView.inc U packages/cocoaint/src/webkit/DOMAttr.inc U packages/cocoaint/src/webkit/WebDocument.inc U packages/cocoaint/src/webkit/DOMNode.inc U packages/cocoaint/src/webkit/DOMStyleSheet.inc U packages/cocoaint/src/webkit/DOMHTMLLinkElement.inc U packages/cocoaint/src/webkit/DOMHTMLDocument.inc U packages/cocoaint/src/webkit/DOMHTMLMenuElement.inc U packages/cocoaint/src/webkit/DOMHTMLAreaElement.inc U packages/cocoaint/src/webkit/DOMHTMLHRElement.inc U packages/cocoaint/src/webkit/DOMEvent.inc U packages/cocoaint/src/webkit/WebFrameView.inc U packages/cocoaint/src/webkit/DOMXPathResult.inc U packages/cocoaint/src/webkit/DOMHTMLInputElement.inc U packages/cocoaint/src/webkit/DOMDocument.inc U packages/cocoaint/src/webkit/DOMHTMLOptGroupElement.inc U packages/cocoaint/src/webkit/DOMHTMLImageElement.inc U packages/cocoaint/src/webkit/DOMMutationEvent.inc U packages/cocoaint/src/webkit/WebEditingDelegate.inc U packages/cocoaint/src/webkit/WebBackForwardList.inc U packages/cocoaint/src/webkit/DOMHTMLTableCellElement.inc U packages/cocoaint/src/webkit/WebScriptObject.inc U packages/cocoaint/src/webkit/DOMHTMLFrameElement.inc U packages/cocoaint/src/webkit/DOMHTMLOListElement.inc U packages/cocoaint/src/webkit/DOMHTMLScriptElement.inc U packages/cocoaint/src/webkit/DOMHTMLObjectElement.inc U packages/cocoaint/src/webkit/DOMCSSStyleDeclaration.inc U packages/cocoaint/src/webkit/DOMElement.inc U packages/cocoaint/src/webkit/DOMRange.inc U packages/cocoaint/src/webkit/DOMNodeIterator.inc U packages/cocoaint/src/webkit/DOMKeyboardEvent.inc U packages/cocoaint/src/webkit/DOMTreeWalker.inc U packages/cocoaint/src/webkit/DOMHTMLOptionElement.inc U packages/cocoaint/src/webkit/DOMHTMLSelectElement.inc U packages/cocoaint/src/webkit/WebPlugin.inc U packages/cocoaint/src/webkit/DOMHTMLUListElement.inc U packages/cocoaint/src/webkit/WebHistory.inc U packages/cocoaint/src/webkit/WebPreferences.inc U packages/cocoaint/src/webkit/DOMHTMLDListElement.inc U packages/cocoaint/src/webkit/DOMHTMLElement.inc U packages/cocoaint/src/webkit/DOMImplementation.inc U packages/cocoaint/src/webkit/DOMHTMLPreElement.inc U packages/cocoaint/src/webkit/WebDataSource.inc U packages/cocoaint/src/webkit/DOMHTMLDirectoryElement.inc U packages/cocoaint/src/webkit/DOMOverflowEvent.inc U packages/cocoaint/src/webkit/DOMProgressEvent.inc U packages/cocoaint/src/webkit/DOMHTMLButtonElement.inc U packages/cocoaint/src/webkit/DOMHTMLTextAreaElement.inc U packages/cocoaint/src/webkit/DOMUIEvent.inc U packages/cocoaint/src/Foundation.pas U packages/cocoaint/src/appkit/NSPrinter.inc U packages/cocoaint/src/appkit/NSColorPicking.inc U packages/cocoaint/src/appkit/NSHelpManager.inc U packages/cocoaint/src/appkit/NSRulerView.inc U packages/cocoaint/src/appkit/NSCollectionView.inc U packages/cocoaint/src/appkit/NSBox.inc U packages/cocoaint/src/appkit/NSPathCell.inc U packages/cocoaint/src/appkit/NSPathControl.inc U packages/cocoaint/src/appkit/NSWorkspace.inc U packages/cocoaint/src/appkit/NSMenuView.inc U packages/cocoaint/src/appkit/NSUserInterfaceItemSearching.inc U packages/cocoaint/src/appkit/NSWindow.inc U packages/cocoaint/src/appkit/NSDictionaryController.inc U packages/cocoaint/src/appkit/NSView.inc U packages/cocoaint/src/appkit/NSButtonCell.inc U packages/cocoaint/src/appkit/NSDocument.inc U packages/cocoaint/src/appkit/NSAnimation.inc U packages/cocoaint/src/appkit/NSSpeechSynthesizer.inc U packages/cocoaint/src/appkit/NSStepperCell.inc U packages/cocoaint/src/appkit/NSQuickDrawView.inc U packages/cocoaint/src/appkit/NSSplitView.inc U packages/cocoaint/src/appkit/NSScrollView.inc U packages/cocoaint/src/appkit/NSImageRep.inc U packages/cocoaint/src/appkit/NSRulerMarker.inc U packages/cocoaint/src/appkit/NSPersistentDocument.inc U packages/cocoaint/src/appkit/NSPanel.inc U packages/cocoaint/src/appkit/NSSpeechRecognizer.inc U packages/cocoaint/src/appkit/NSProgressIndicator.inc U packages/cocoaint/src/appkit/NSColorWell.inc U packages/cocoaint/src/appkit/NSAlert.inc U packages/cocoaint/src/appkit/NSPrintInfo.inc U packages/cocoaint/src/appkit/NSNib.inc U packages/cocoaint/src/appkit/NSMovieView.inc U packages/cocoaint/src/appkit/NSUserInterfaceValidation.inc U packages/cocoaint/src/appkit/NSButton.inc U packages/cocoaint/src/appkit/NSSavePanel.inc U packages/cocoaint/src/appkit/NSColor.inc U packages/cocoaint/src/appkit/NSViewController.inc U packages/cocoaint/src/appkit/NSCell.inc U packages/cocoaint/src/appkit/NSArrayController.inc U packages/cocoaint/src/appkit/NSDocumentController.inc U packages/cocoaint/src/appkit/NSTokenField.inc U packages/cocoaint/src/appkit/NSTextField.inc U packages/cocoaint/src/appkit/NSDockTile.inc U packages/cocoaint/src/appkit/NSAttributedString.inc U packages/cocoaint/src/appkit/NSSecureTextField.inc U packages/cocoaint/src/appkit/NSFontManager.inc U packages/cocoaint/src/appkit/NSMatrix.inc U packages/cocoaint/src/appkit/NSNibLoading.inc U packages/cocoaint/src/appkit/NSStatusBar.inc U packages/cocoaint/src/appkit/NSComboBoxCell.inc U packages/cocoaint/src/appkit/NSObjectController.inc U packages/cocoaint/src/appkit/NSControl.inc U packages/cocoaint/src/appkit/NSClipView.inc U packages/cocoaint/src/appkit/NSSlider.inc U packages/cocoaint/src/appkit/NSScroller.inc U packages/cocoaint/src/appkit/NSAccessibility.inc U packages/cocoaint/src/appkit/NSSound.inc U packages/cocoaint/src/appkit/NSWindowScripting.inc U packages/cocoaint/src/appkit/NSTextAttachment.inc U packages/cocoaint/src/appkit/NSColorPanel.inc U packages/cocoaint/src/appkit/NSTreeController.inc U packages/cocoaint/src/appkit/NSTableColumn.inc U packages/cocoaint/src/appkit/NSUserDefaultsController.inc U packages/cocoaint/src/appkit/NSWindowController.inc U packages/cocoaint/src/appkit/NSSegmentedControl.inc U packages/cocoaint/src/appkit/NSRuleEditor.inc U packages/cocoaint/src/appkit/NSMovie.inc U packages/cocoaint/src/appkit/NSFileWrapper.inc U packages/cocoaint/src/appkit/NSTabViewItem.inc U packages/cocoaint/src/appkit/NSEvent.inc U packages/cocoaint/src/appkit/NSTouch.inc U packages/cocoaint/src/appkit/NSBrowserCell.inc U packages/cocoaint/src/appkit/NSPasteboard.inc U packages/cocoaint/src/appkit/NSTextContainer.inc U packages/cocoaint/src/appkit/NSTextTable.inc U packages/cocoaint/src/appkit/NSStatusItem.inc U packages/cocoaint/src/appkit/NSPasteboardItem.inc U packages/cocoaint/src/appkit/NSFormCell.inc U packages/cocoaint/src/appkit/NSSpellChecker.inc U packages/cocoaint/src/appkit/NSTreeNode.inc U packages/cocoaint/src/appkit/NSLayoutManager.inc U packages/cocoaint/src/appkit/NSTypesetter.inc U packages/cocoaint/src/appkit/NSSearchFieldCell.inc U packages/cocoaint/src/appkit/NSDatePickerCell.inc U packages/cocoaint/src/appkit/NSImage.inc U packages/cocoaint/src/appkit/NSBrowser.inc U packages/cocoaint/src/appkit/NSTokenFieldCell.inc U packages/cocoaint/src/appkit/NSInputServer.inc U packages/cocoaint/src/appkit/NSTextFieldCell.inc U packages/cocoaint/src/appkit/NSInputManager.inc U packages/cocoaint/src/appkit/NSBezierPath.inc U packages/cocoaint/src/appkit/NSPopUpButtonCell.inc U packages/cocoaint/src/appkit/NSRunningApplication.inc U packages/cocoaint/src/appkit/NSGraphicsContext.inc U packages/cocoaint/src/appkit/NSFont.inc U packages/cocoaint/src/appkit/NSTextStorage.inc U packages/cocoaint/src/appkit/NSDatePicker.inc U packages/cocoaint/src/appkit/NSKeyValueBinding.inc U packages/cocoaint/src/appkit/NSCachedImageRep.inc U packages/cocoaint/src/appkit/NSOpenPanel.inc U packages/cocoaint/src/appkit/NSTableView.inc U packages/cocoaint/src/appkit/NSStepper.inc U packages/cocoaint/src/appkit/NSDragging.inc U packages/cocoaint/src/appkit/NSSliderCell.inc U packages/cocoaint/src/appkit/NSController.inc U packages/cocoaint/src/appkit/NSMenuItemCell.inc U packages/cocoaint/src/appkit/NSText.inc U packages/cocoaint/src/appkit/NSDrawer.inc U packages/cocoaint/src/appkit/NSApplicationScripting.inc U packages/cocoaint/src/appkit/NSTableHeaderView.inc U packages/cocoaint/src/appkit/NSPopUpButton.inc U packages/cocoaint/src/appkit/NSToolbar.inc U packages/cocoaint/src/appkit/NSTextInputClient.inc U packages/cocoaint/src/appkit/NSMenu.inc U packages/cocoaint/src/appkit/NSCursor.inc U packages/cocoaint/src/appkit/NSImageView.inc U packages/cocoaint/src/appkit/NSPrintOperation.inc U packages/cocoaint/src/appkit/NSATSTypesetter.inc U packages/cocoaint/src/appkit/NSToolbarItem.inc U packages/cocoaint/src/appkit/NSMenuItem.inc U packages/cocoaint/src/appkit/NSFontPanel.inc U packages/cocoaint/src/appkit/NSBitmapImageRep.inc U packages/cocoaint/src/appkit/NSTableHeaderCell.inc U packages/cocoaint/src/appkit/NSGraphics.inc U packages/cocoaint/src/appkit/NSTabView.inc U packages/cocoaint/src/appkit/NSResponder.inc U packages/cocoaint/src/appkit/NSApplication.inc U packages/cocoaint/src/appkit/NSComboBox.inc U packages/cocoaint/src/appkit/NSTextInputContext.inc U packages/cocoaint/src/appkit/NSOutlineView.inc U packages/cocoaint/src/appkit/NSColorList.inc U packages/cocoaint/src/appkit/NSTextView.inc --- Recording mergeinfo for merge of r39950 into '.': G . --- Merging r40008 into '.': G compiler/ncal.pas A tests/webtbs/tw34442.pp --- Recording mergeinfo for merge of r40008 into '.': G . --- Merging r40009 into '.': G compiler/defcmp.pas G compiler/ncnv.pas U compiler/pexpr.pas A tests/webtbs/tw33875.pp --- Recording mergeinfo for merge of r40009 into '.': G . --- Merging r40010 into '.': A tests/webtbs/tw34055.pp G compiler/ngtcon.pas --- Recording mergeinfo for merge of r40010 into '.': G . --- Merging r40012 into '.': G compiler/defcmp.pas G compiler/htypechk.pas A tests/webtbs/tw32179.pp --- Recording mergeinfo for merge of r40012 into '.': G . --- Merging r40367 into '.': U compiler/optcse.pas --- Recording mergeinfo for merge of r40367 into '.': G . --- Merging r40373 into '.': U compiler/hlcgobj.pas --- Recording mergeinfo for merge of r40373 into '.': G . --- Merging r40374 into '.': U compiler/ncgld.pas --- Recording mergeinfo for merge of r40374 into '.': G . --- Merging r40375 into '.': G compiler/hlcgobj.pas --- Recording mergeinfo for merge of r40375 into '.': G . --- Merging r40384 into '.': U compiler/psub.pas --- Recording mergeinfo for merge of r40384 into '.': G . --- Merging r40386 into '.': U compiler/ngenutil.pas U compiler/jvm/njvmutil.pas --- Recording mergeinfo for merge of r40386 into '.': G . --- Merging r40442 into '.': U compiler/ppu.pas G compiler/symdef.pas --- Recording mergeinfo for merge of r40442 into '.': G . --- Merging r40443 into '.': U compiler/systems/i_bsd.pas U compiler/systems/i_linux.pas U compiler/systems/i_sunos.pas U compiler/systems/i_embed.pas U compiler/systems/i_android.pas U compiler/systems/i_aros.pas --- Recording mergeinfo for merge of r40443 into '.': G . --- Merging r40499 into '.': G compiler/llvm/hlcgllvm.pas --- Recording mergeinfo for merge of r40499 into '.': G . --- Merging r40630 into '.': U compiler/ncgnstld.pas G compiler/ninl.pas --- Recording mergeinfo for merge of r40630 into '.': G . --- Merging r40633 into '.': G compiler/hlcgobj.pas U compiler/hlcg2ll.pas --- Recording mergeinfo for merge of r40633 into '.': G . --- Merging r40634 into '.': U compiler/ncgcnv.pas G compiler/symdef.pas U compiler/llvm/nllvmcnv.pas U compiler/llvm/nllvmld.pas U compiler/i386/symcpu.pas G compiler/ncnv.pas U compiler/symcreat.pas U compiler/jvm/pjvm.pas U compiler/arm/symcpu.pas U compiler/powerpc/symcpu.pas U compiler/m68k/symcpu.pas U compiler/x86_64/symcpu.pas U compiler/blockutl.pas U compiler/i8086/symcpu.pas --- Recording mergeinfo for merge of r40634 into '.': G . --- Merging r40645 into '.': U compiler/nobj.pas --- Recording mergeinfo for merge of r40645 into '.': G . --- Merging r40648 into '.': G compiler/symcreat.pas --- Recording mergeinfo for merge of r40648 into '.': G . --- Merging r40683 into '.': A tests/tbf/tb0267.pp U tests/webtbs/tw27349.pp A tests/tbs/tb0654.pp G compiler/nobj.pas --- Recording mergeinfo for merge of r40683 into '.': G . --- Recording mergeinfo for merge of r40729 into '.': G . --- Merging r40771 into '.': U rtl/darwin/x86/x86hnd.inc --- Recording mergeinfo for merge of r40771 into '.': G . --- Merging r40772 into '.': G compiler/nflw.pas U compiler/pmodules.pas U compiler/pdecsub.pas U compiler/pparautl.pas G compiler/ptype.pas U compiler/pdecobj.pas U compiler/pgenutil.pas U compiler/pdecl.pas U compiler/jvm/symcpu.pas G compiler/pdecvar.pas --- Recording mergeinfo for merge of r40772 into '.': G . --- Merging r40773 into '.': G compiler/pdecsub.pas U compiler/ncgnstmm.pas G compiler/symcreat.pas G compiler/pdecl.pas G compiler/pmodules.pas G compiler/pdecobj.pas G compiler/psub.pas G compiler/symdef.pas G compiler/pparautl.pas A compiler/procdefutil.pas G compiler/pgenutil.pas G compiler/jvm/symcpu.pas G compiler/jvm/jvmdef.pas G compiler/jvm/pjvm.pas G compiler/nflw.pas U compiler/symutil.pas G compiler/pdecvar.pas G compiler/ptype.pas U compiler/i386/n386flw.pas G compiler/ncgnstld.pas U compiler/x86_64/nx64flw.pas U compiler/procinfo.pas --- Recording mergeinfo for merge of r40773 into '.': G . --- Merging r40777 into '.': G compiler/ppu.pas U compiler/optconstprop.pas U compiler/pstatmnt.pas U compiler/optutils.pas U compiler/pass_2.pas U compiler/node.pas U compiler/ncgmem.pas U compiler/nmem.pas G compiler/psystem.pas --- Recording mergeinfo for merge of r40777 into '.': G . --- Merging r40778 into '.': G rtl/darwin/x86/x86hnd.inc --- Recording mergeinfo for merge of r40778 into '.': G . --- Merging r40785 into '.': U compiler/msgidx.inc G compiler/pexpr.pas U compiler/msg/errore.msg U compiler/msgtxt.inc A tests/webtbf/tw34821.pp --- Recording mergeinfo for merge of r40785 into '.': G . --- Merging r40810 into '.': G compiler/hlcg2ll.pas --- Recording mergeinfo for merge of r40810 into '.': G . --- Merging r41161 into '.': G compiler/symdef.pas A tests/webtbs/tw34971.pp --- Recording mergeinfo for merge of r41161 into '.': G . --- Merging r41164 into '.': U tests/test/tinterlocked64mt.pp U tests/test/tinterlockedmt.pp --- Recording mergeinfo for merge of r41164 into '.': G . --- Merging r41165 into '.': U tests/test/units/sysutils/trwsync.pp --- Recording mergeinfo for merge of r41165 into '.': G . --- Merging r41166 into '.': U rtl/objpas/sysutils/sysuthrd.inc --- Recording mergeinfo for merge of r41166 into '.': G . git-svn-id: branches/fixes_3_2@41249 -	2019-02-07 19:54:56 +00:00
pierre	5fa93e2a1e	------------------------------------------------------------------------ ... r41065 | pierre | 2019-01-25 08:00:58 +0000 (Fri, 25 Jan 2019) | 1 line Fix compilation (with -st option) of compiler for macos OS target ------------------------------------------------------------------------ --- Merging r41065 into '.': U compiler/fpcdefs.inc U compiler/cfileutl.pas --- Recording mergeinfo for merge of r41065 into '.': U . ------------------------------------------------------------------------ r41074 | pierre | 2019-01-25 18:35:33 +0000 (Fri, 25 Jan 2019) | 1 line Add missing ESysEMSGSIZE and ESysEOPNOTSUPP for beos ------------------------------------------------------------------------ --- Merging r41074 into '.': U rtl/beos/errno.inc --- Recording mergeinfo for merge of r41074 into '.': G . git-svn-id: branches/fixes_3_2@41227 -	2019-02-05 07:43:20 +00:00
pierre	9e0530caa8	Group merge of changes to fpmake.pp for pacakges and utils ... with fpmkunit change. ------------------------------------------------------------------------ r40365 | pierre | 2018-11-24 15:14:57 +0000 (Sat, 24 Nov 2018) | 4 lines + Add Debug message when resource file is found, but not registered. + Add missing "T.ResourceStrings:=True;" for all source units that generate the new debug message above. ------------------------------------------------------------------------ --- Merging r40365 into '.': U packages/mysql/fpmake.pp U packages/fcl-base/fpmake.pp U packages/fcl-web/fpmake.pp U packages/fcl-db/fpmake.pp U packages/fcl-pdf/fpmake.pp U packages/fcl-image/fpmake.pp U packages/pastojs/fpmake.pp U packages/fcl-passrc/fpmake.pp U packages/rtl-objpas/fpmake.pp U packages/openssl/fpmake.pp U packages/winunits-base/fpmake.pp U packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40365 into '.': U . ------------------------------------------------------------------------ r40391 | pierre | 2018-11-28 23:45:35 +0000 (Wed, 28 Nov 2018) | 1 line Add several missing unit references in fpmake files ------------------------------------------------------------------------ --- Merging r40391 into '.': U utils/pas2ut/fpmake.pp U utils/fpdoc/fpmake.pp U utils/pas2js/fpmake.pp U utils/fppkg/fpmake.pp U utils/fpcmkcfg/fpmake.pp U utils/fpmake.pp U utils/unicode/fpmake.pp --- Recording mergeinfo for merge of r40391 into '.': G . ------------------------------------------------------------------------ r40899 | pierre | 2019-01-19 10:26:51 +0000 (Sat, 19 Jan 2019) | 1 line Activate fpc-web package for android OS, except for jvm compiler ------------------------------------------------------------------------ --- Merging r40899 into '.': G packages/fcl-web/fpmake.pp --- Recording mergeinfo for merge of r40899 into '.': G . ------------------------------------------------------------------------ r41069 | pierre | 2019-01-25 12:58:21 +0000 (Fri, 25 Jan 2019) | 1 line Disable targets that do not support fcl-base for utils packages that need fcl-base ------------------------------------------------------------------------ --- Merging r41069 into '.': G utils/pas2ut/fpmake.pp G utils/fpdoc/fpmake.pp U utils/json2pas/fpmake.pp U utils/fpcreslipo/fpmake.pp G utils/fpcmkcfg/fpmake.pp G utils/fpmake.pp U utils/fpcres/fpmake.pp U utils/fpcm/fpmake.pp G utils/unicode/fpmake.pp U utils/pas2fpm/fpmake.pp U utils/instantfpc/fpmake.pp U utils/importtl/fpmake.pp --- Recording mergeinfo for merge of r41069 into '.': G . ------------------------------------------------------------------------ r41070 | pierre | 2019-01-25 14:39:12 +0000 (Fri, 25 Jan 2019) | 1 line Enable paszlib package and disable utils/fpcm and utils/fpcmkcfg for nativent OS ------------------------------------------------------------------------ --- Merging r41070 into '.': U packages/paszlib/fpmake.pp G utils/fpcmkcfg/fpmake.pp G utils/fpcm/fpmake.pp --- Recording mergeinfo for merge of r41070 into '.': G . ------------------------------------------------------------------------ r41076 | pierre | 2019-01-26 10:17:58 +0000 (Sat, 26 Jan 2019) | 1 line Also use installed ppudump for ppu testing in utils directory ------------------------------------------------------------------------ --- Merging r41076 into '.': U utils/Makefile.fpc U utils/Makefile --- Recording mergeinfo for merge of r41076 into '.': G . ------------------------------------------------------------------------ r41104 | pierre | 2019-01-28 17:43:15 +0000 (Mon, 28 Jan 2019) | 1 line -Xr is also supported for systems_android ------------------------------------------------------------------------ --- Merging r41104 into '.': U compiler/options.pas --- Recording mergeinfo for merge of r41104 into '.': G . ------------------------------------------------------------------------ r41106 | pierre | 2019-01-29 09:01:42 +0000 (Tue, 29 Jan 2019) | 1 line Disable jvm-android and jvm-java targets for fprcp, h2pas and tply packages because they use memory allocation or fpc_get_output ------------------------------------------------------------------------ --- Merging r41106 into '.': U utils/fprcp/fpmake.pp U utils/h2pas/fpmake.pp U utils/tply/fpmake.pp --- Recording mergeinfo for merge of r41106 into '.': G . ------------------------------------------------------------------------ r41119 | pierre | 2019-01-29 13:46:43 +0000 (Tue, 29 Jan 2019) | 1 line Disable palmos in fprcp, h2pas and tply packages ------------------------------------------------------------------------ --- Merging r41119 into '.': G utils/fprcp/fpmake.pp G utils/h2pas/fpmake.pp G utils/tply/fpmake.pp --- Recording mergeinfo for merge of r41119 into '.': G . ------------------------------------------------------------------------ r41120 | pierre | 2019-01-29 14:08:03 +0000 (Tue, 29 Jan 2019) | 1 line Disable fprcp, h2pas and tply pacakges for msdos and win16 because the programs are too big ------------------------------------------------------------------------ --- Merging r41120 into '.': G utils/fprcp/fpmake.pp G utils/h2pas/fpmake.pp G utils/tply/fpmake.pp --- Recording mergeinfo for merge of r41120 into '.': G . ------------------------------------------------------------------------ r41121 | pierre | 2019-01-29 14:17:53 +0000 (Tue, 29 Jan 2019) | 1 line Disable atari target for fpcm and fpcmkcfg because it depends on unsupported fpmkunit package ------------------------------------------------------------------------ --- Merging r41121 into '.': G utils/fpcmkcfg/fpmake.pp G utils/fpcm/fpmake.pp --- Recording mergeinfo for merge of r41121 into '.': G . ------------------------------------------------------------------------ r41122 | pierre | 2019-01-29 14:32:28 +0000 (Tue, 29 Jan 2019) | 1 line Disable some packages for avr-embedded and i8086-embedded targets ------------------------------------------------------------------------ --- Merging r41122 into '.': G utils/fprcp/fpmake.pp G utils/h2pas/fpmake.pp G utils/tply/fpmake.pp --- Recording mergeinfo for merge of r41122 into '.': G . ------------------------------------------------------------------------ r41142 | pierre | 2019-01-30 12:55:04 +0000 (Wed, 30 Jan 2019) | 1 line Disable jvm-android as fcl-json is not supported for this target ------------------------------------------------------------------------ --- Merging r41142 into '.': G utils/pas2js/fpmake.pp --- Recording mergeinfo for merge of r41142 into '.': G . ------------------------------------------------------------------------ r41150 | pierre | 2019-01-31 11:20:34 +0000 (Thu, 31 Jan 2019) | 1 line Disable pas2js for jvm compiler ------------------------------------------------------------------------ --- Merging r41150 into '.': G utils/pas2js/fpmake.pp --- Recording mergeinfo for merge of r41150 into '.': G . git-svn-id: branches/fixes_3_2@41193 -	2019-02-03 16:51:17 +00:00
pierre	163a3918e2	------------------------------------------------------------------------ ... r39826 | pierre | 2018-09-27 07:01:58 +0000 (Thu, 27 Sep 2018) | 1 line Update Makefile.fpc to pacakages location ------------------------------------------------------------------------ --- Merging r39826 into '.': U packages/ide/fakegdb/Makefile.fpc --- Recording mergeinfo for merge of r39826 into '.': U . git-svn-id: branches/fixes_3_2@41187 -	2019-02-03 16:03:59 +00:00
marco	308b61522c	--- Merging r41185 into '.': ... U rtl/objpas/classes/bits.inc --- Recording mergeinfo for merge of r41185 into '.': U . # revisions: 41185 git-svn-id: branches/fixes_3_2@41186 -	2019-02-03 14:07:38 +00:00
pierre	74c7603da2	* Remove commit 39635 for list of eligible merges using --record-only merge option. ... ------------------------------------------------------------------------ r39635 | marco | 2018-08-18 15:47:44 +0000 (Sat, 18 Aug 2018) | 2 lines * trunk to 3.3.1 ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@41163 -	2019-02-02 13:48:00 +00:00
pierre	dee94698c6	------------------------------------------------------------------------ ... r40905 | pierre | 2019-01-19 16:06:04 +0000 (Sat, 19 Jan 2019) | 1 line Also add /usr/lib/CPU-linux-gnu to link directory list for mips and mipsel ------------------------------------------------------------------------ --- Merging r40905 into '.': U compiler/systems/t_linux.pas --- Recording mergeinfo for merge of r40905 into '.': U . git-svn-id: branches/fixes_3_2@41077 -	2019-01-26 21:02:52 +00:00
pierre	cdfefa381e	* Merge 40833 (without the riscvXX part) ... ------------------------------------------------------------------------ r40833 | pierre | 2019-01-10 12:18:22 +0000 (Thu, 10 Jan 2019) | 1 line Add missing support for -PriscvXX and -Psparc64 ------------------------------------------------------------------------ --- Merging r40833 into '.': U compiler/utils/fpc.pp --- Recording mergeinfo for merge of r40833 into '.': U . git-svn-id: branches/fixes_3_2@40963 -	2019-01-21 14:22:03 +00:00
pierre	e85a99b1f8	Merge of commit 40952. ... ------------------------------------------------------------------------ r40952 | michael | 2019-01-21 08:16:13 +0000 (Mon, 21 Jan 2019) | 1 line * Add Unicode/Widestring overload on windows for ResolveRelativeURI ------------------------------------------------------------------------ --- Merging r40952 into '.': U packages/fcl-base/src/uriparser.pp --- Recording mergeinfo for merge of r40952 into '.': U . git-svn-id: branches/fixes_3_2@40953 -	2019-01-21 11:17:43 +00:00
michael	8f7e8163a5	* Merging revisions 40928,40929,40937,40945,40946 from trunk: ... ------------------------------------------------------------------------ r40928 | michael | 2019-01-20 12:15:07 +0100 (Sun, 20 Jan 2019) | 1 line * Remove debug statement ------------------------------------------------------------------------ r40929 | michael | 2019-01-20 12:17:46 +0100 (Sun, 20 Jan 2019) | 1 line * Remove debug statement ------------------------------------------------------------------------ r40937 | michael | 2019-01-20 14:47:25 +0100 (Sun, 20 Jan 2019) | 1 line * Fix filename allocator for operators ------------------------------------------------------------------------ r40945 | michael | 2019-01-20 18:56:30 +0100 (Sun, 20 Jan 2019) | 1 line * Correct options for parsing ------------------------------------------------------------------------ r40946 | michael | 2019-01-20 18:57:27 +0100 (Sun, 20 Jan 2019) | 1 line * Do not save so much session info ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@40948 -	2019-01-20 18:04:31 +00:00
michael	081900de7c	* Merging revisions 40927,40930,40935,40936,40939,40940,40942,40944 from trunk: ... ------------------------------------------------------------------------ r40927 | michael | 2019-01-20 12:12:49 +0100 (Sun, 20 Jan 2019) | 1 line * Widestring -> unicodestring ------------------------------------------------------------------------ r40930 | michael | 2019-01-20 13:32:01 +0100 (Sun, 20 Jan 2019) | 1 line * Fix syntax error ------------------------------------------------------------------------ r40935 | michael | 2019-01-20 14:04:15 +0100 (Sun, 20 Jan 2019) | 1 line * Remove debug statement ------------------------------------------------------------------------ r40936 | michael | 2019-01-20 14:04:28 +0100 (Sun, 20 Jan 2019) | 1 line * Add in operator ------------------------------------------------------------------------ r40939 | michael | 2019-01-20 17:45:31 +0100 (Sun, 20 Jan 2019) | 1 line * Parse type constraints in generics ------------------------------------------------------------------------ r40940 | michael | 2019-01-20 17:52:09 +0100 (Sun, 20 Jan 2019) | 1 line * Fix compilation ------------------------------------------------------------------------ r40942 | michael | 2019-01-20 18:10:16 +0100 (Sun, 20 Jan 2019) | 1 line * Generic templates can be separated by semicolon (used in fgl unit) ------------------------------------------------------------------------ r40944 | michael | 2019-01-20 18:55:15 +0100 (Sun, 20 Jan 2019) | 1 line * Defaults are not to add default identifiers (fpdoc) ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@40947 -	2019-01-20 18:01:23 +00:00
michael	e1faa3b00d	* Merging revisions 40932 from trunk: ... ------------------------------------------------------------------------ r40932 | michael | 2019-01-20 13:52:17 +0100 (Sun, 20 Jan 2019) | 1 line * Insert and Delete are compiler internals now, need fake definitions ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@40933 -	2019-01-20 12:52:36 +00:00
michael	18efea7ef1	* Merging revisions 40930 from trunk: ... ------------------------------------------------------------------------ r40930 | michael | 2019-01-20 13:32:01 +0100 (Sun, 20 Jan 2019) | 1 line * Fix syntax error ------------------------------------------------------------------------ git-svn-id: branches/fixes_3_2@40931 -	2019-01-20 12:32:19 +00:00
pierre	2f60a01fec	Merge of commit 40521. ... ------------------------------------------------------------------------ r40521 | pierre | 2018-12-11 08:47:59 +0000 (Tue, 11 Dec 2018) | 1 line Modify tbs/tb0588.pp to check that a warning is issued about non-initialized return value, moved to tbf directory ------------------------------------------------------------------------ --- Merging r40521 into '.': D tests/tbs/tb0588.pp A tests/tbf/tb0588.pp --- Recording mergeinfo for merge of r40521 into '.': U . git-svn-id: branches/fixes_3_2@40840 -	2019-01-11 09:08:57 +00:00
pierre	875af11d02	Merge of commits 39916, 39925 and 39963 ... ------------------------------------------------------------------------ r39916 | yury | 2018-10-12 14:43:17 +0000 (Fri, 12 Oct 2018) | 1 line * Fixed checks for exceeding limit of locals space. Prevent range and overflow errors during the checks. Introduced the MaxLocalsSize constant which provides the maximum possible size of locals space (stack frame) depending of bitness of a cpu. ------------------------------------------------------------------------ --- Merging r39916 into '.': U compiler/tgobj.pas U compiler/globtype.pas --- Recording mergeinfo for merge of r39916 into '.': U . ------------------------------------------------------------------------ r39925 | pierre | 2018-10-13 12:00:31 +0000 (Sat, 13 Oct 2018) | 1 line Set MaxLocalsSize according to address size not register size ------------------------------------------------------------------------ --- Merging r39925 into '.': G compiler/globtype.pas --- Recording mergeinfo for merge of r39925 into '.': G . ------------------------------------------------------------------------ r39963 | yury | 2018-10-17 19:12:27 +0000 (Wed, 17 Oct 2018) | 1 line * Fixed range check errors. ------------------------------------------------------------------------ --- Merging r39963 into '.': G compiler/tgobj.pas --- Recording mergeinfo for merge of r39963 into '.': G . git-svn-id: branches/fixes_3_2@40834 -	2019-01-10 12:22:58 +00:00
pierre	70b6244a29	Partial merge of commit #39990 ... mergeinfo property left unchanged on purpose, as the commit also has a change in compiler/nadd.pas source that is not handled here. ------------------------------------------------------------------------ r39990 | florian | 2018-10-20 10:17:34 +0000 (Sat, 20 Oct 2018) | 2 lines * avoid range check errors ------------------------------------------------------------------------ --- Merging r39990 into '.': U compiler/powerpc/rappcgas.pas git-svn-id: branches/fixes_3_2@40794 -	2019-01-07 15:35:31 +00:00
marco	01d6e8fba8	--- Merging r40745 into '.': ... U packages/winunits-base/src/activex.pp --- Recording mergeinfo for merge of r40745 into '.': U . # revisions: 40745 git-svn-id: branches/fixes_3_2@40790 -	2019-01-07 10:18:39 +00:00
nickysn	27c618b4c4	* Merged r40720 ... git-svn-id: branches/fixes_3_2@40744 -	2019-01-02 04:27:06 +00:00
marco	f6e52ff1de	--- Merging r40510 into '.': ... U packages/graph/src/win32/graph.pp --- Recording mergeinfo for merge of r40510 into '.': U . --- Merging r40511 into '.': U packages/graph/src/inc/graphh.inc --- Recording mergeinfo for merge of r40511 into '.': G . # revisions: 40510,40511 git-svn-id: branches/fixes_3_2@40741 -	2019-01-01 22:20:20 +00:00
florian	0ad0cefeb3	--- Merging r40202 into '.': ... U compiler/ncal.pas U compiler/optdfa.pas A tests/webtbs/tw34438.pp --- Recording mergeinfo for merge of r40202 into '.': U . git-svn-id: branches/fixes_3_2@40740 -	2019-01-01 21:59:57 +00:00
florian	f7782641ad	--- Merging r40738 into '.': ... U rtl/linux/Makefile.fpc U rtl/linux/Makefile --- Recording mergeinfo for merge of r40738 into '.': U . git-svn-id: branches/fixes_3_2@40739 -	2019-01-01 19:31:48 +00:00
Jonas Maebe	fc9e9e804a	--- Merging r40512 into '.': ... A tests/webtbs/tw33607.pp U compiler/aarch64/hlcgcpu.pas --- Recording mergeinfo for merge of r40512 into '.': U . --- Merging r40566 into '.': U compiler/aarch64/cpupara.pas --- Recording mergeinfo for merge of r40566 into '.': G . --- Merging r40567 into '.': G compiler/aarch64/cpupara.pas --- Recording mergeinfo for merge of r40567 into '.': G . --- Merging r40573 into '.': G compiler/aarch64/cpupara.pas --- Recording mergeinfo for merge of r40573 into '.': G . --- Merging r40629 into '.': U compiler/ncnv.pas U compiler/llvm/nllvmcnv.pas --- Recording mergeinfo for merge of r40629 into '.': G . --- Merging r40637 into '.': U compiler/ncon.pas A tests/webtbs/tw33666.pp --- Recording mergeinfo for merge of r40637 into '.': G . --- Merging r40729 into '.': U compiler/ncal.pas U compiler/jvm/njvminl.pas U compiler/ninl.pas --- Recording mergeinfo for merge of r40729 into '.': G . git-svn-id: branches/fixes_3_2@40735 -	2019-01-01 16:49:46 +00:00
marco	5826dfa53d	--- Merging r40608 into '.': ... A packages/sqlite/src/sqlite3ext.pp U packages/sqlite/fpmake.pp --- Recording mergeinfo for merge of r40608 into '.': U . --- Merging r40609 into '.': A packages/sqlite/examples/myext.pp A packages/sqlite/examples/myext.lpi --- Recording mergeinfo for merge of r40609 into '.': G . # revisions: 40608,40609 git-svn-id: branches/fixes_3_2@40728 -	2019-01-01 14:51:19 +00:00
marco	3bdf46a423	--- Merging r40524 into '.': ... U rtl/objpas/classes/bits.inc U rtl/objpas/classes/classesh.inc A tests/test/units/classes/ttbits.pp --- Recording mergeinfo for merge of r40524 into '.': U . # revisions: 40524 git-svn-id: branches/fixes_3_2@40727 -	2019-01-01 14:43:00 +00:00
marco	35de02532b	--- Merging r40513 into '.': ... U rtl/solaris/ostypes.inc --- Recording mergeinfo for merge of r40513 into '.': U . # revisions: 40513 git-svn-id: branches/fixes_3_2@40726 -	2019-01-01 14:41:56 +00:00
marco	49f4652c23	--- Merging r40615 into '.': ... U packages/chm/src/chmcmd.lpr --- Recording mergeinfo for merge of r40615 into '.': U . # revisions: 40615 git-svn-id: branches/fixes_3_2@40725 -	2019-01-01 14:41:03 +00:00
marco	bb89a4dca0	--- Merging r39842 into '.': ... U packages/fcl-pdf/src/fppdf.pp U packages/fcl-pdf/examples/testfppdf.lpr --- Recording mergeinfo for merge of r39842 into '.': U . --- Merging r40054 into '.': U packages/fcl-pdf/src/fpparsettf.pp --- Recording mergeinfo for merge of r40054 into '.': G . # revisions: 39842,40054 git-svn-id: branches/fixes_3_2@40723 -	2019-01-01 13:14:13 +00:00
marco	e680d94fe1	--- Merging r40191 into '.': ... U packages/fcl-js/src/jsbase.pp U packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40191 into '.': U . --- Merging r40195 into '.': U packages/fcl-web/examples/simpleserver/simpleserver.pas --- Recording mergeinfo for merge of r40195 into '.': G . --- Merging r40203 into '.': U packages/fcl-js/src/jsscanner.pp --- Recording mergeinfo for merge of r40203 into '.': G . --- Merging r40364 into '.': U packages/fcl-web/src/base/fphttpstatus.pas U packages/fcl-web/fpmake.pp --- Recording mergeinfo for merge of r40364 into '.': G . --- Merging r40366 into '.': G packages/fcl-web/examples/simpleserver/simpleserver.pas U packages/fcl-web/examples/simpleserver/simpleserver.lpi --- Recording mergeinfo for merge of r40366 into '.': G . --- Merging r40393 into '.': U packages/fcl-web/src/base/httproute.pp --- Recording mergeinfo for merge of r40393 into '.': G . --- Merging r40395 into '.': U packages/fcl-web/src/base/fphttpclient.pp --- Recording mergeinfo for merge of r40395 into '.': G . --- Merging r40592 into '.': G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40592 into '.': G . --- Merging r40707 into '.': U packages/fcl-js/tests/tcwriter.pp G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40707 into '.': G . # revisions: 40191,40195,40203,40364,40366,40393,40395,40592,40707 git-svn-id: branches/fixes_3_2@40719 -	2018-12-31 16:46:05 +00:00
marco	e16529a374	--- Merging r40076 into '.': ... U packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40076 into '.': U . --- Merging r40081 into '.': U packages/pastojs/tests/tcmodules.pas U packages/pastojs/src/fppas2js.pp U packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r40081 into '.': G . --- Merging r40083 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40083 into '.': G . --- Merging r40084 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40084 into '.': G . --- Merging r40085 into '.': U packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40085 into '.': G . --- Merging r40101 into '.': U packages/pastojs/src/pas2jsfileutils.pp U packages/pastojs/src/pas2jsfileutilsnodejs.inc --- Recording mergeinfo for merge of r40101 into '.': G . --- Merging r40105 into '.': G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40105 into '.': G . --- Merging r40106 into '.': G packages/pastojs/src/pas2jsfileutils.pp --- Recording mergeinfo for merge of r40106 into '.': G . --- Merging r40107 into '.': U packages/pastojs/src/pas2jspparser.pp --- Recording mergeinfo for merge of r40107 into '.': G . --- Merging r40116 into '.': U utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r40116 into '.': G . --- Merging r40126 into '.': G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40126 into '.': G . --- Merging r40127 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40127 into '.': G . --- Merging r40133 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40133 into '.': G . --- Merging r40135 into '.': U packages/fcl-js/src/jssrcmap.pas --- Recording mergeinfo for merge of r40135 into '.': G . --- Merging r40138 into '.': G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40138 into '.': G . --- Merging r40139 into '.': G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40139 into '.': G . --- Merging r40140 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40140 into '.': G . --- Merging r40143 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r40143 into '.': G . --- Merging r40146 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r40146 into '.': G . --- Merging r40148 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r40148 into '.': G . --- Merging r40151 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40151 into '.': G . --- Merging r40152 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40152 into '.': G . --- Merging r40164 into '.': U utils/pas2js/nodepas2js.lpi --- Recording mergeinfo for merge of r40164 into '.': G . --- Merging r40168 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40168 into '.': G . --- Merging r40175 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40175 into '.': G . --- Merging r40177 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas U packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40177 into '.': G . --- Merging r40192 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40192 into '.': G . --- Merging r40193 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40193 into '.': G . --- Merging r40194 into '.': U packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40194 into '.': G . --- Merging r40204 into '.': U packages/fcl-passrc/src/pasuseanalyzer.pas U packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40204 into '.': G . --- Merging r40209 into '.': G packages/pastojs/src/pas2jslogger.pp --- Recording mergeinfo for merge of r40209 into '.': G . --- Merging r40210 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40210 into '.': G . --- Merging r40211 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40211 into '.': G . --- Merging r40241 into '.': U utils/pas2js/pas2js.lpi --- Recording mergeinfo for merge of r40241 into '.': G . --- Merging r40243 into '.': G utils/pas2js/pas2js.lpi --- Recording mergeinfo for merge of r40243 into '.': G . --- Merging r40245 into '.': U utils/pas2js/pas2js.cfg --- Recording mergeinfo for merge of r40245 into '.': G . --- Merging r40258 into '.': G utils/pas2js/pas2js.lpi --- Recording mergeinfo for merge of r40258 into '.': G . --- Merging r40259 into '.': G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40259 into '.': G . --- Merging r40263 into '.': U packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r40263 into '.': G . --- Merging r40279 into '.': U packages/pastojs/tests/tcfiler.pas G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/pas2jspparser.pp G packages/pastojs/src/fppas2js.pp U packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40279 into '.': G . --- Merging r40290 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40290 into '.': G . --- Merging r40302 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r40302 into '.': G . --- Merging r40304 into '.': U packages/fcl-passrc/src/paswrite.pp --- Recording mergeinfo for merge of r40304 into '.': G . --- Merging r40305 into '.': G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40305 into '.': G . --- Merging r40342 into '.': G packages/fcl-passrc/src/pparser.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r40342 into '.': G . --- Merging r40343 into '.': U packages/pastojs/src/pas2jsfiler.pp G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40343 into '.': G . --- Merging r40351 into '.': U packages/fcl-js/src/jswriter.pp G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jsfileutilsunix.inc G packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/fppas2js.pp U packages/pastojs/src/pas2jsfileutilswin.inc --- Recording mergeinfo for merge of r40351 into '.': G . --- Merging r40352 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jsfileutilsnodejs.inc G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40352 into '.': G . --- Merging r40353 into '.': U utils/pas2js/pas2jslib.lpi --- Recording mergeinfo for merge of r40353 into '.': G . --- Merging r40354 into '.': U packages/pastojs/fpmake.pp --- Recording mergeinfo for merge of r40354 into '.': G . --- Merging r40355 into '.': G packages/pastojs/src/pas2jsfileutilswin.inc --- Recording mergeinfo for merge of r40355 into '.': G . --- Merging r40356 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jsfileutils.pp U utils/pas2js/docs/translation.html --- Recording mergeinfo for merge of r40356 into '.': G . --- Merging r40372 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp G utils/pas2js/docs/translation.html --- Recording mergeinfo for merge of r40372 into '.': G . --- Merging r40423 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40423 into '.': G . --- Merging r40424 into '.': G packages/pastojs/src/pas2jscompiler.pp --- Recording mergeinfo for merge of r40424 into '.': G . --- Merging r40426 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r40426 into '.': G . --- Merging r40427 into '.': G packages/pastojs/fpmake.pp G packages/pastojs/src/pas2jscompiler.pp A packages/pastojs/src/pas2jspcucompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40427 into '.': G . --- Merging r40428 into '.': U packages/pastojs/tests/tcunitsearch.pas U packages/pastojs/tests/testpas2js.lpi --- Recording mergeinfo for merge of r40428 into '.': G . --- Merging r40429 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40429 into '.': G . --- Merging r40430 into '.': G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jspcucompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40430 into '.': G . --- Merging r40439 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jspcucompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40439 into '.': G . --- Merging r40440 into '.': G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40440 into '.': G . --- Merging r40441 into '.': G packages/pastojs/src/pas2jspcucompiler.pp --- Recording mergeinfo for merge of r40441 into '.': G . # revisions: 40076,40081,40083,40084,40085,40101,40105,40106,40107,40116,40126,40127,40133,40135,40138,40139,40140,40143,40146,40148,40151,40152,40164,40168,40175,40177,40192,40193,40194,40204,40209,40210,40211,40241,40243,40245,40258,40259,40263,40279,40290,40302,40304,40305,40342,40343,40351,40352,40353,40354,40355,40356,40372,40423,40424,40426,40427,40428,40429,40430,40439,40440,40441 git-svn-id: branches/fixes_3_2@40718 -	2018-12-31 16:37:10 +00:00
pierre	23b9dde397	Merge of commits 40142, 40189 and 40347 ... ------------------------------------------------------------------------ r40142 | jonas | 2018-11-01 13:19:33 +0000 (Thu, 01 Nov 2018) | 2 lines * ttryfinallynode now inherits from tbinarynode instead of tloopnode, as its t1 field was always set to tnothingnode ------------------------------------------------------------------------ --- Merging r40142 into '.': U compiler/i386/n386flw.pas U compiler/nflw.pas U compiler/x86_64/nx64flw.pas U compiler/nutils.pas U compiler/ppu.pas U compiler/ncgflw.pas U compiler/psub.pas --- Recording mergeinfo for merge of r40142 into '.': U . ------------------------------------------------------------------------ r40189 | jonas | 2018-11-02 21:12:18 +0000 (Fri, 02 Nov 2018) | 2 lines * fixed overzealous removal of an assigned(t1) check in r40142 (it was for a ttryexceptnode instead of for a ttryfinally node) ------------------------------------------------------------------------ --- Merging r40189 into '.': G compiler/x86_64/nx64flw.pas --- Recording mergeinfo for merge of r40189 into '.': G . ------------------------------------------------------------------------ r40347 | pierre | 2018-11-18 10:32:13 +0000 (Sun, 18 Nov 2018) | 3 lines * Use getasizeint/putasizeint for tfieldvarsym.fieldoffset * Change CurrentPPUVersion ------------------------------------------------------------------------ --- Merging r40347 into '.': G compiler/ppu.pas U compiler/utils/ppuutils/ppudump.pp U compiler/symsym.pas --- Recording mergeinfo for merge of r40347 into '.': G . git-svn-id: branches/fixes_3_2@40717 -	2018-12-31 16:15:55 +00:00
pierre	92cd9502ef	Merge of revisions 40277 ... 40307 40309 40314 40319 40322 40324 40326 40377 40378 from trunk to fixes_3_2 ------------------------------------------------------------------------ r40277 | pierre | 2018-11-08 20:18:30 +0000 (Thu, 08 Nov 2018) | 1 line Implement mark_write override for tinilinenode ------------------------------------------------------------------------ --- Merging r40277 into '.': U compiler/ninl.pas --- Recording mergeinfo for merge of r40277 into '.': U . ------------------------------------------------------------------------ r40307 | pierre | 2018-11-13 15:10:21 +0000 (Tue, 13 Nov 2018) | 6 lines + Introduce PPC_SUFFIXES, new make variable that lists all ppc suffixes for all different CPUs supported. * Use PPC_SUFFIXES in execlean and CPU_clean targets. * Also delete CPU/bin subbirectory. ------------------------------------------------------------------------ --- Merging r40307 into '.': U compiler/Makefile U compiler/Makefile.fpc --- Recording mergeinfo for merge of r40307 into '.': G . ------------------------------------------------------------------------ r40309 | pierre | 2018-11-13 15:51:32 +0000 (Tue, 13 Nov 2018) | 1 line Try to avoid expectloc not set after first pass error for call node ------------------------------------------------------------------------ --- Merging r40309 into '.': U compiler/ncal.pas --- Recording mergeinfo for merge of r40309 into '.': G . ------------------------------------------------------------------------ r40314 | pierre | 2018-11-14 13:13:19 +0000 (Wed, 14 Nov 2018) | 4 lines * Change first parameter type of function is_continuous_maks to aword type. Add typecasts where needed to allow for successful compilation of arm-linux target with -CriotR options when building the compiler. ------------------------------------------------------------------------ --- Merging r40314 into '.': U compiler/arm/cpubase.pas U compiler/arm/cgcpu.pas --- Recording mergeinfo for merge of r40314 into '.': G . ------------------------------------------------------------------------ r40319 | pierre | 2018-11-15 16:58:40 +0000 (Thu, 15 Nov 2018) | 1 line Disable range check in m68k:tiscv32 and riscv64 cgcpu units ------------------------------------------------------------------------ --- Merging r40319 into '.': C compiler/riscv64 U compiler/m68k/cgcpu.pas C compiler/riscv32 --- Recording mergeinfo for merge of r40319 into '.': G . Summary of conflicts: Tree conflicts: 2 ------------------------------------------------------------------------ r40322 | pierre | 2018-11-15 22:01:25 +0000 (Thu, 15 Nov 2018) | 1 line Also disable range checking in arm/aoptcpu unit ------------------------------------------------------------------------ --- Merging r40322 into '.': U compiler/arm/aoptcpu.pas --- Recording mergeinfo for merge of r40322 into '.': G . ------------------------------------------------------------------------ r40324 | pierre | 2018-11-16 10:27:42 +0000 (Fri, 16 Nov 2018) | 4 lines * Disable range check for m68k/aoptcpu unit * Add missing change of var parameter p to next instruction in TryToOptimizeMove method after instruction removal. ------------------------------------------------------------------------ --- Merging r40324 into '.': U compiler/m68k/aoptcpu.pas --- Recording mergeinfo for merge of r40324 into '.': G . ------------------------------------------------------------------------ r40326 | pierre | 2018-11-16 13:28:26 +0000 (Fri, 16 Nov 2018) | 1 line Change local variables offsetdec and extraoffset type to ASizeInt ------------------------------------------------------------------------ --- Merging r40326 into '.': U compiler/ncgmem.pas --- Recording mergeinfo for merge of r40326 into '.': G . ------------------------------------------------------------------------ r40377 | pierre | 2018-11-27 10:19:36 +0000 (Tue, 27 Nov 2018) | 1 line Fix bug report 34605 and add corresponding test ------------------------------------------------------------------------ --- Merging r40377 into '.': A tests/webtbs/tw34605.pp U compiler/nutils.pas --- Recording mergeinfo for merge of r40377 into '.': G . ------------------------------------------------------------------------ r40378 | pierre | 2018-11-27 10:21:37 +0000 (Tue, 27 Nov 2018) | 1 line Avoid range errors or overflows on for AVR cpu, when computing address offsets ------------------------------------------------------------------------ --- Merging r40378 into '.': U compiler/ncgset.pas U compiler/ngtcon.pas --- Recording mergeinfo for merge of r40378 into '.': G . git-svn-id: branches/fixes_3_2@40716 -	2018-12-31 15:48:08 +00:00
marco	4873692ce5	--- Merging r40063 into '.': ... U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp --- Recording mergeinfo for merge of r40063 into '.': U . --- Merging r40240 into '.': U packages/fcl-db/tests/testsqldb.pas U packages/fcl-db/src/sqldb/sqldb.pp --- Recording mergeinfo for merge of r40240 into '.': G . --- Merging r40396 into '.': U packages/fcl-db/src/sqldb/postgres/pqeventmonitor.pp --- Recording mergeinfo for merge of r40396 into '.': G . --- Merging r40607 into '.': G packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp --- Recording mergeinfo for merge of r40607 into '.': G . --- Merging r40610 into '.': A packages/fcl-db/examples/myext.pp A packages/fcl-db/examples/sqlite3extdemo.pp --- Recording mergeinfo for merge of r40610 into '.': G . # revisions: 40063,40240,40396,40607,40610 git-svn-id: branches/fixes_3_2@40713 -	2018-12-31 11:16:38 +00:00
marco	4d66a5b4ad	--- Merging r39851 into '.': ... G packages/fcl-passrc/tests/tcresolver.pas G packages/pastojs/tests/tcprecompile.pas G packages/pastojs/src/fppas2js.pp G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jsfiler.pp G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r39851 into '.': G . --- Merging r39853 into '.': U packages/fcl-js/src/jsbase.pp --- Recording mergeinfo for merge of r39853 into '.': G . --- Merging r39854 into '.': U packages/fcl-js/src/jswriter.pp U packages/pastojs/tests/tcsrcmap.pas G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r39854 into '.': G . --- Merging r39855 into '.': U packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r39855 into '.': G . --- Merging r39856 into '.': U packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39856 into '.': G . --- Merging r39857 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r39857 into '.': G . --- Merging r39898 into '.': G packages/fcl-js/src/jsbase.pp G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r39898 into '.': G . --- Merging r39899 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39899 into '.': G . --- Merging r39904 into '.': U packages/fcl-json/src/fpjson.pp --- Recording mergeinfo for merge of r39904 into '.': G . --- Merging r39906 into '.': G packages/pastojs/tests/tcmodules.pas G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39906 into '.': G . --- Merging r39908 into '.': U packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r39908 into '.': G . --- Merging r39919 into '.': G packages/fcl-passrc/tests/tcresolver.pas U packages/fcl-passrc/tests/tcuseanalyzer.pas U packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r39919 into '.': G . --- Merging r39921 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r39921 into '.': G . --- Merging r39926 into '.': G packages/pastojs/tests/tcmodules.pas G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39926 into '.': G . --- Merging r39928 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r39928 into '.': G . --- Merging r39929 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r39929 into '.': G . --- Merging r39932 into '.': G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/tests/tcuseanalyzer.pas --- Recording mergeinfo for merge of r39932 into '.': G . --- Merging r39937 into '.': G packages/fcl-passrc/tests/tcuseanalyzer.pas G packages/fcl-passrc/src/pasuseanalyzer.pas --- Recording mergeinfo for merge of r39937 into '.': G . --- Merging r39939 into '.': U packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r39939 into '.': G . --- Merging r39940 into '.': U packages/fcl-passrc/src/pasresolveeval.pas G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pparser.pp U packages/pastojs/tests/tcfiler.pas G packages/pastojs/src/fppas2js.pp G packages/pastojs/src/pas2jsfiler.pp --- Recording mergeinfo for merge of r39940 into '.': G . --- Merging r39942 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r39942 into '.': G . --- Merging r39944 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r39944 into '.': G . --- Merging r39946 into '.': G packages/fcl-passrc/src/pasresolveeval.pas --- Recording mergeinfo for merge of r39946 into '.': G . --- Merging r39966 into '.': G utils/pas2js/dist/rtl.js --- Recording mergeinfo for merge of r39966 into '.': G . --- Merging r39968 into '.': G packages/fcl-passrc/src/pasresolveeval.pas --- Recording mergeinfo for merge of r39968 into '.': G . --- Merging r39974 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39974 into '.': G . --- Merging r39975 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r39975 into '.': G . --- Merging r39976 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r39976 into '.': G . --- Merging r39977 into '.': G packages/pastojs/tests/tcmodules.pas G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r39977 into '.': G . --- Merging r39979 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r39979 into '.': G . --- Merging r39985 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp G packages/pastojs/src/fppas2js.pp --- Recording mergeinfo for merge of r39985 into '.': G . --- Merging r40013 into '.': G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40013 into '.': G . --- Merging r40018 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolveeval.pas G packages/fcl-passrc/src/pasresolver.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40018 into '.': G . --- Merging r40029 into '.': G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40029 into '.': G . --- Merging r40030 into '.': G packages/pastojs/src/fppas2js.pp G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/tests/tcresolver.pas --- Recording mergeinfo for merge of r40030 into '.': G . --- Merging r40032 into '.': G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40032 into '.': G . --- Merging r40034 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40034 into '.': G . --- Merging r40036 into '.': G packages/pastojs/src/fppas2js.pp G packages/fcl-js/src/jsbase.pp --- Recording mergeinfo for merge of r40036 into '.': G . --- Merging r40037 into '.': A utils/pas2js/nodepas2js.pp A utils/pas2js/nodepas2js.lpi --- Recording mergeinfo for merge of r40037 into '.': G . --- Merging r40039 into '.': G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40039 into '.': G . --- Merging r40040 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pscanner.pp G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r40040 into '.': G . --- Merging r40041 into '.': G packages/pastojs/src/pas2jslogger.pp U packages/pastojs/src/pas2jsfileutils.pp U packages/pastojs/src/pas2jsfilecache.pp U packages/pastojs/src/pas2js_defines.inc U packages/pastojs/src/pas2jsfileutilswin.inc G packages/pastojs/src/pas2jscompiler.pp A packages/pastojs/src/pas2jsfileutilsnodejs.inc U packages/pastojs/src/pas2jsfileutilsunix.inc --- Recording mergeinfo for merge of r40041 into '.': G . --- Merging r40042 into '.': U utils/pas2js/pas2js.pp U utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40042 into '.': G . --- Merging r40043 into '.': G packages/pastojs/src/pas2jsfileutils.pp --- Recording mergeinfo for merge of r40043 into '.': G . --- Merging r40044 into '.': U packages/pastojs/src/pas2jspparser.pp G packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/pas2jsfileutils.pp G utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40044 into '.': G . --- Merging r40045 into '.': G utils/pas2js/nodepas2js.pp U packages/fcl-json/src/jsonscanner.pp --- Recording mergeinfo for merge of r40045 into '.': G . --- Merging r40046 into '.': G packages/pastojs/src/pas2jsfileutilswin.inc --- Recording mergeinfo for merge of r40046 into '.': G . --- Merging r40047 into '.': G packages/pastojs/src/pas2jsfileutilswin.inc --- Recording mergeinfo for merge of r40047 into '.': G . --- Merging r40048 into '.': G packages/fcl-js/src/jssrcmap.pas G utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40048 into '.': G . --- Merging r40049 into '.': G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/src/pas2jsfiler.pp G packages/pastojs/src/pas2jsfilecache.pp U packages/pastojs/src/fppjssrcmap.pp G packages/pastojs/src/pas2js_defines.inc G utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40049 into '.': G . --- Merging r40051 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas --- Recording mergeinfo for merge of r40051 into '.': G . --- Merging r40053 into '.': G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/fppjssrcmap.pp --- Recording mergeinfo for merge of r40053 into '.': G . --- Merging r40055 into '.': G packages/fcl-json/src/fpjson.pp U packages/fcl-json/tests/testjsondata.pp --- Recording mergeinfo for merge of r40055 into '.': G . --- Merging r40058 into '.': U packages/fcl-json/tests/testjsonparser.pp U packages/fcl-json/tests/testjson.pp U packages/fcl-json/tests/testjson.lpi G packages/fcl-json/tests/testjsondata.pp G packages/fcl-json/src/fpjson.pp G packages/fcl-json/src/jsonscanner.pp --- Recording mergeinfo for merge of r40058 into '.': G . --- Merging r40061 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40061 into '.': G . --- Merging r40062 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/src/pas2jscompiler.pp G packages/pastojs/src/pas2jspparser.pp G packages/pastojs/src/pas2jsfileutils.pp G packages/pastojs/tests/tcmodules.pas G packages/pastojs/tests/tcfiler.pas G utils/pas2js/nodepas2js.pp U utils/pas2js/docs/translation.html --- Recording mergeinfo for merge of r40062 into '.': G . --- Merging r40064 into '.': G packages/pastojs/src/pas2jscompiler.pp U packages/pastojs/src/pas2jsfileutilsnodejs.inc G packages/pastojs/src/pas2jsfileutils.pp G packages/fcl-json/src/fpjson.pp G utils/pas2js/docs/translation.html --- Recording mergeinfo for merge of r40064 into '.': G . --- Merging r40067 into '.': G packages/pastojs/src/pas2jsfileutilsnodejs.inc G packages/pastojs/src/pas2jslogger.pp G packages/pastojs/src/pas2jsfileutils.pp --- Recording mergeinfo for merge of r40067 into '.': G . --- Merging r40072 into '.': G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/pas2jscompiler.pp G packages/fcl-json/src/fpjson.pp G packages/fcl-js/src/jswriter.pp G packages/fcl-js/src/jssrcmap.pas --- Recording mergeinfo for merge of r40072 into '.': G . --- Merging r40075 into '.': G packages/fcl-json/src/fpjson.pp G packages/pastojs/src/pas2jscompiler.pp G utils/pas2js/nodepas2js.pp --- Recording mergeinfo for merge of r40075 into '.': G . --- Merging r40077 into '.': G packages/fcl-js/src/jssrcmap.pas G packages/fcl-js/src/jswriter.pp --- Recording mergeinfo for merge of r40077 into '.': G . --- Merging r40080 into '.': G packages/fcl-js/src/jswriter.pp U packages/fcl-js/src/jsscanner.pp --- Recording mergeinfo for merge of r40080 into '.': G . --- Merging r40082 into '.': G packages/fcl-passrc/tests/tcresolver.pas G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pasresolveeval.pas --- Recording mergeinfo for merge of r40082 into '.': G . --- Merging r40098 into '.': G utils/pas2js/nodepas2js.pp U utils/pas2js/nodepas2js.lpi --- Recording mergeinfo for merge of r40098 into '.': G . --- Merging r40099 into '.': G packages/fcl-js/src/jssrcmap.pas --- Recording mergeinfo for merge of r40099 into '.': G . --- Merging r40100 into '.': G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40100 into '.': G . --- Merging r40108 into '.': G utils/pas2js/nodepas2js.lpi G packages/pastojs/src/pas2jsfilecache.pp --- Recording mergeinfo for merge of r40108 into '.': G . --- Merging r40125 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40125 into '.': G . --- Merging r40129 into '.': G packages/pastojs/src/fppas2js.pp G packages/pastojs/tests/tcmodules.pas G packages/fcl-passrc/src/pparser.pp --- Recording mergeinfo for merge of r40129 into '.': G . --- Merging r40136 into '.': G packages/fcl-json/src/fpjson.pp --- Recording mergeinfo for merge of r40136 into '.': G . --- Merging r40137 into '.': G packages/fcl-passrc/src/pasresolver.pp G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40137 into '.': G . --- Merging r40144 into '.': G packages/fcl-passrc/src/pasresolveeval.pas G utils/pas2js/nodepas2js.lpi --- Recording mergeinfo for merge of r40144 into '.': G . --- Merging r40150 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40150 into '.': G . --- Merging r40165 into '.': G packages/fcl-passrc/src/pasuseanalyzer.pas G packages/fcl-passrc/src/pastree.pp --- Recording mergeinfo for merge of r40165 into '.': G . --- Merging r40166 into '.': G packages/fcl-passrc/src/pasresolver.pp --- Recording mergeinfo for merge of r40166 into '.': G . --- Merging r40171 into '.': G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40171 into '.': G . --- Merging r40173 into '.': G packages/pastojs/src/pas2jsfilecache.pp G packages/pastojs/src/pas2jscompiler.pp G packages/fcl-passrc/src/pscanner.pp --- Recording mergeinfo for merge of r40173 into '.': G . # revisions: 39851,39853,39854,39855,39856,39857,39898,39899,39904,39906,39908,39919,39921,39926,39928,39929,39932,39937,39939,39940,39942,39944,39946,39966,39968,39974,39975,39976,39977,39979,39985,40013,40018,40029,40030,40032,40034,40036,40037,40039,40040,40041,40042,40043,40044,40045,40046,40047,40048,40049,40051,40053,40055,40058,40061,40062,40064,40067,40072,40075,40077,40080,40082,40098,40099,40100,40108,40125,40129,40136,40137,40144,40150,40165,40166,40171,40173 git-svn-id: branches/fixes_3_2@40709 -	2018-12-30 15:42:04 +00:00
marco	da5c47ee16	--- Merging r40651 into '.': ... U rtl/objpas/classes/classes.inc --- Recording mergeinfo for merge of r40651 into '.': U . # revisions: 40651 git-svn-id: branches/fixes_3_2@40688 -	2018-12-29 11:22:20 +00:00
pierre	7bcb8e911c	------------------------------------------------------------------------ ... r40619 | pierre | 2018-12-23 16:17:49 +0000 (Sun, 23 Dec 2018) | 8 lines * in lexbase and yaccbase units, use DirectorySeparator instead of '\' in functions path, root and addext. * in plex and pyacc programs, for unix, try to find installed yyparse.cod using path of paramstr(0). ------------------------------------------------------------------------ --- Merging r40619 into '.': U utils/tply/pyacc.pas U utils/tply/plex.pas U utils/tply/yaccbase.pas U utils/tply/lexbase.pas U utils/tply/pyacc.y --- Recording mergeinfo for merge of r40619 into '.': U . git-svn-id: branches/fixes_3_2@40627 -	2018-12-24 08:34:03 +00:00
pierre	de6e6c1443	Disable merging of /trunk:r39724,39820,39822-39824,39828-39830 ... Changes svn:mergeinfo property in: . packages/rtl-objpas/src/inc/rtti.pp packages/rtl-objpas/tests/tests.rtti.pas git-svn-id: branches/fixes_3_2@40626 -	2018-12-23 23:35:59 +00:00
pierre	9ca0c1c5dc	Fix compilation error after last commit ... git-svn-id: branches/fixes_3_2@40625 -	2018-12-23 23:25:34 +00:00
pierre	d8b0ded10c	Marge of more trunk fixes into fixes branch. ... ------------------------------------------------------------------------ r39725 | pierre | 2018-09-10 13:28:33 +0000 (Mon, 10 Sep 2018) | 1 line Add branches for 3.2.0, 3.2.1 and 3.3.1 versions ------------------------------------------------------------------------ --- Merging r39725 into '.': U tests/utils/testsuite/utests.pp --- Recording mergeinfo for merge of r39725 into '.': U . ------------------------------------------------------------------------ r39733 | pierre | 2018-09-11 08:16:56 +0000 (Tue, 11 Sep 2018) | 1 line sparc64-linux objects recompiled with GCC 7.3.0 ------------------------------------------------------------------------ --- Merging r39733 into '.': U tests/test/cg/obj/readme.txt U tests/test/cg/obj/linux/sparc64/ctest.o U tests/test/cg/obj/linux/sparc64/cpptcl1.o U tests/test/cg/obj/linux/sparc64/cpptcl2.o U tests/test/cg/obj/linux/sparc64/tcext3.o U tests/test/cg/obj/linux/sparc64/tcext4.o U tests/test/cg/obj/linux/sparc64/tcext5.o U tests/test/cg/obj/linux/sparc64/tcext6.o --- Recording mergeinfo for merge of r39733 into '.': G . ------------------------------------------------------------------------ r39808 | pierre | 2018-09-26 09:29:33 +0000 (Wed, 26 Sep 2018) | 1 line Disable libraries not compiling for jvm-java or jvm-android targets ------------------------------------------------------------------------ --- Merging r39808 into '.': U packages/fppkg/fpmake.pp U packages/fcl-base/fpmake.pp U packages/rtl-extra/fpmake.pp U packages/hermes/fpmake.pp U packages/fcl-extra/fpmake.pp U packages/fcl-db/fpmake.pp U packages/unzip/fpmake.pp U packages/odbc/fpmake.pp U packages/gdbm/fpmake.pp U packages/pthreads/fpmake.pp U packages/fcl-json/fpmake.pp U packages/pcap/fpmake.pp U packages/numlib/fpmake.pp U packages/rtl-generics/fpmake.pp U packages/zlib/fpmake.pp U packages/paszlib/fpmake.pp U packages/webidl/fpmake.pp U packages/regexpr/fpmake.pp U packages/libgd/fpmake.pp U packages/fcl-net/fpmake.pp U packages/fcl-res/fpmake.pp U packages/libpng/fpmake.pp U packages/dblib/fpmake.pp U packages/tcl/fpmake.pp U packages/openssl/fpmake.pp U packages/ibase/fpmake.pp U packages/bzip2/fpmake.pp U packages/fcl-sdo/fpmake.pp U packages/fcl-sound/fpmake.pp U packages/fcl-passrc/fpmake.pp U packages/fcl-stl/fpmake.pp U packages/libmicrohttpd/fpmake.pp U packages/mysql/fpmake.pp U packages/postgres/fpmake.pp U packages/httpd22/fpmake.pp U packages/httpd24/fpmake.pp U packages/rtl-console/fpmake.pp U packages/sqlite/fpmake.pp U packages/fftw/fpmake.pp U packages/fcl-pdf/fpmake.pp U packages/rtl-objpas/fpmake.pp U packages/fcl-image/fpmake.pp U packages/pasjpeg/fpmake.pp U packages/chm/fpmake.pp U packages/fcl-registry/fpmake.pp U packages/libtar/fpmake.pp U packages/symbolic/fpmake.pp U packages/libenet/fpmake.pp U packages/imagemagick/fpmake.pp U packages/fcl-xml/fpmake.pp U packages/oracle/fpmake.pp U packages/fcl-fpcunit/fpmake.pp U packages/fcl-js/fpmake.pp U packages/fcl-async/fpmake.pp U packages/fcl-process/fpmake.pp U packages/pastojs/fpmake.pp U packages/hash/fpmake.pp U packages/rtl-unicode/fpmake.pp U packages/fpmkunit/fpmake.pp --- Recording mergeinfo for merge of r39808 into '.': G . ------------------------------------------------------------------------ r40027 | pierre | 2018-10-24 21:37:54 +0000 (Wed, 24 Oct 2018) | 1 line Fix compilation of RTL for watcom target ------------------------------------------------------------------------ --- Merging r40027 into '.': U compiler/x86/agx86int.pas --- Recording mergeinfo for merge of r40027 into '.': G . ------------------------------------------------------------------------ r40028 | pierre | 2018-10-25 06:39:42 +0000 (Thu, 25 Oct 2018) | 1 line Try to fix compilation error after commit #40027 ------------------------------------------------------------------------ --- Merging r40028 into '.': G compiler/x86/agx86int.pas --- Recording mergeinfo for merge of r40028 into '.': G . ------------------------------------------------------------------------ r40102 | pierre | 2018-10-31 09:07:57 +0000 (Wed, 31 Oct 2018) | 1 line Replace aint (which is a compiler specific type) by ptruint type, which is defined in system unit ------------------------------------------------------------------------ --- Merging r40102 into '.': U tests/test/tarray5.pp --- Recording mergeinfo for merge of r40102 into '.': G . ------------------------------------------------------------------------ r40103 | pierre | 2018-10-31 09:59:45 +0000 (Wed, 31 Oct 2018) | 1 line Use pdword to avoid range check erro in tentryfile.getdword method ------------------------------------------------------------------------ --- Merging r40103 into '.': U compiler/entfile.pas --- Recording mergeinfo for merge of r40103 into '.': G . ------------------------------------------------------------------------ r40104 | pierre | 2018-10-31 10:21:51 +0000 (Wed, 31 Oct 2018) | 1 line Use longint type instead of AWord for Initial parameter in CalcExecutionWeigths (to avoid range error for avr compiler) ------------------------------------------------------------------------ @@ begin Result:=fen_false; n.allocoptinfo; <<<<<<< MINE (select with 'mc') (367) Weight:=PAWord(arg)^; ||||||| ORIGINAL (367) Weight:=max(PAWord(arg)^,1); ======= Weight:=max(plongint(arg)^,1); >>>>>>> THEIRS (select with 'tc') (367) case n.nodetype of casen: begin --- Merging r40104 into '.': C compiler/optutils.pas --- Recording mergeinfo for merge of r40104 into '.': G . Summary of conflicts: Text conflicts: 1 ------------------------------------------------------------------------ r40110 | pierre | 2018-10-31 14:51:23 +0000 (Wed, 31 Oct 2018) | 1 line Avoid range check error in MaskLength evaluation ------------------------------------------------------------------------ --- Merging r40110 into '.': U compiler/x86/aoptx86.pas --- Recording mergeinfo for merge of r40110 into '.': G . ------------------------------------------------------------------------ r40111 | pierre | 2018-10-31 15:47:53 +0000 (Wed, 31 Oct 2018) | 1 line Complement commit 40104, by changing type of executionweight in toptinfo record and adapt pass_2 code ------------------------------------------------------------------------ --- Merging r40111 into '.': U compiler/pass_2.pas U compiler/optbase.pas --- Recording mergeinfo for merge of r40111 into '.': G . ------------------------------------------------------------------------ r40112 | pierre | 2018-10-31 15:48:32 +0000 (Wed, 31 Oct 2018) | 1 line Disable range check completely in arm/cgcpu unit ------------------------------------------------------------------------ --- Merging r40112 into '.': U compiler/arm/cgcpu.pas --- Recording mergeinfo for merge of r40112 into '.': G . ------------------------------------------------------------------------ r40113 | pierre | 2018-10-31 15:49:14 +0000 (Wed, 31 Oct 2018) | 1 line Avoid overflow in code ------------------------------------------------------------------------ --- Merging r40113 into '.': U compiler/symdef.pas --- Recording mergeinfo for merge of r40113 into '.': G . ------------------------------------------------------------------------ r40114 | pierre | 2018-10-31 15:50:26 +0000 (Wed, 31 Oct 2018) | 1 line Add explicit rtlclean/rtl targets in fullcycle rule if DOWPOCYCLE is set ------------------------------------------------------------------------ --- Merging r40114 into '.': U compiler/Makefile.fpc U compiler/Makefile --- Recording mergeinfo for merge of r40114 into '.': G . ------------------------------------------------------------------------ r40120 | pierre | 2018-10-31 23:15:22 +0000 (Wed, 31 Oct 2018) | 1 line Change RemoveCurrentP parameter type to tai, because GetNextInstruction does not always return a taicpu, adapt code in avr/aoptcpu unit ------------------------------------------------------------------------ --- Merging r40120 into '.': U compiler/aoptobj.pas U compiler/avr/aoptcpu.pas --- Recording mergeinfo for merge of r40120 into '.': G . ------------------------------------------------------------------------ r40121 | pierre | 2018-10-31 23:16:51 +0000 (Wed, 31 Oct 2018) | 1 line Add check about tloadnode.symtableentry type before typecast ------------------------------------------------------------------------ --- Merging r40121 into '.': U compiler/ncal.pas --- Recording mergeinfo for merge of r40121 into '.': G . ------------------------------------------------------------------------ r40122 | pierre | 2018-10-31 23:18:09 +0000 (Wed, 31 Oct 2018) | 1 line Fix typecast in FindRegDeAlloc call ------------------------------------------------------------------------ --- Merging r40122 into '.': U compiler/arm/aoptcpu.pas --- Recording mergeinfo for merge of r40122 into '.': G . ------------------------------------------------------------------------ r40123 | pierre | 2018-10-31 23:19:39 +0000 (Wed, 31 Oct 2018) | 1 line Remove unneeded typecasts in TryTOptimizeMove ------------------------------------------------------------------------ --- Merging r40123 into '.': U compiler/m68k/aoptcpu.pas --- Recording mergeinfo for merge of r40123 into '.': G . ------------------------------------------------------------------------ r40124 | pierre | 2018-10-31 23:20:29 +0000 (Wed, 31 Oct 2018) | 1 line Add global range check disable for i8086 cgcpu and x86 nx86add units ------------------------------------------------------------------------ --- Merging r40124 into '.': U compiler/i8086/cgcpu.pas U compiler/x86/nx86add.pas --- Recording mergeinfo for merge of r40124 into '.': G . ------------------------------------------------------------------------ r40131 | pierre | 2018-11-01 07:01:02 +0000 (Thu, 01 Nov 2018) | 1 line Remove another wrong typecast when testing that a tai is an instruction ------------------------------------------------------------------------ --- Merging r40131 into '.': G compiler/m68k/aoptcpu.pas --- Recording mergeinfo for merge of r40131 into '.': G . ------------------------------------------------------------------------ r40236 | pierre | 2018-11-06 07:40:31 +0000 (Tue, 06 Nov 2018) | 1 line Really change extension of hs1 local variable in get_exepath ------------------------------------------------------------------------ --- Merging r40236 into '.': U compiler/globals.pas --- Recording mergeinfo for merge of r40236 into '.': G . ------------------------------------------------------------------------ r40237 | pierre | 2018-11-06 07:41:15 +0000 (Tue, 06 Nov 2018) | 1 line Disable range checking in rax86int unit ------------------------------------------------------------------------ --- Merging r40237 into '.': U compiler/x86/rax86int.pas --- Recording mergeinfo for merge of r40237 into '.': G . ------------------------------------------------------------------------ r40278 | pierre | 2018-11-08 20:19:54 +0000 (Thu, 08 Nov 2018) | 1 line Downgrade EXTDEBUG warning to note about zero size temp, as it is used for empty sets ------------------------------------------------------------------------ --- Merging r40278 into '.': U compiler/tgobj.pas --- Recording mergeinfo for merge of r40278 into '.': G . git-svn-id: branches/fixes_3_2@40624 -	2018-12-23 22:27:05 +00:00
pierre	f0eedd5d71	Merge of revisions 39726 39732 39734 39735 39736 39801 39806 39807 40002 40014 40358 40363 40392 40397 40481 40537 from trunk to fixes_3_2 ... ------------------------------------------------------------------------ r39726 | pierre | 2018-09-10 13:30:42 +0000 (Mon, 10 Sep 2018) | 1 line pass -D__I8086_SMARTLINK_SECTIONS__ to nasm if FPCOPT contains -dTEST_I8086_SMARTLINK_SECTIONS ------------------------------------------------------------------------ --- Merging r39726 into '.': U rtl/msdos/Makefile U rtl/msdos/Makefile.fpc --- Recording mergeinfo for merge of r39726 into '.': U . ------------------------------------------------------------------------ r39732 | pierre | 2018-09-11 08:02:48 +0000 (Tue, 11 Sep 2018) | 1 line Add FPC_SOFT_FPUX80 and FPC_SOFT_FPU128 define handling ------------------------------------------------------------------------ --- Merging r39732 into '.': U rtl/linux/system.pp --- Recording mergeinfo for merge of r39732 into '.': G . ------------------------------------------------------------------------ r39734 | pierre | 2018-09-11 13:08:51 +0000 (Tue, 11 Sep 2018) | 1 line Increase default trace size to 16 ------------------------------------------------------------------------ --- Merging r39734 into '.': U rtl/inc/heaptrc.pp --- Recording mergeinfo for merge of r39734 into '.': G . ------------------------------------------------------------------------ r39735 | pierre | 2018-09-11 13:10:59 +0000 (Tue, 11 Sep 2018) | 1 line Avoid wrap on 32-bit system for StackTop calculation ------------------------------------------------------------------------ --- Merging r39735 into '.': U rtl/inc/system.inc --- Recording mergeinfo for merge of r39735 into '.': G . ------------------------------------------------------------------------ r39736 | pierre | 2018-09-11 13:13:50 +0000 (Tue, 11 Sep 2018) | 5 lines * Add PAGESIZE local constant. + Set LAST_PAGE_GENERATES_SIGNAL macro for linux powerpc/powerpc64. + Use page_size for StackBottom computation. + Use LAST_PAGE_GENERATES_SIGNAL in StackBottom computation. ------------------------------------------------------------------------ --- Merging r39736 into '.': G rtl/linux/system.pp --- Recording mergeinfo for merge of r39736 into '.': G . ------------------------------------------------------------------------ r39801 | pierre | 2018-09-24 22:20:30 +0000 (Mon, 24 Sep 2018) | 1 line define iconv_is_in_libc by default for netbsd OS (can be disabled by adding -dDISABLE_ICONV_LIBC option ------------------------------------------------------------------------ --- Merging r39801 into '.': U rtl/unix/cwstring.pp --- Recording mergeinfo for merge of r39801 into '.': G . ------------------------------------------------------------------------ r39806 | pierre | 2018-09-26 09:25:54 +0000 (Wed, 26 Sep 2018) | 1 line Rename Result parameter to _Result to avoid compilation error for ppcjvm ------------------------------------------------------------------------ --- Merging r39806 into '.': U packages/jni/src/jni.pas --- Recording mergeinfo for merge of r39806 into '.': G . ------------------------------------------------------------------------ r39807 | pierre | 2018-09-26 09:27:33 +0000 (Wed, 26 Sep 2018) | 1 line Explicitly also disable java OS target ------------------------------------------------------------------------ --- Merging r39807 into '.': U packages/sdl/fpmake.pp --- Recording mergeinfo for merge of r39807 into '.': G . ------------------------------------------------------------------------ r40002 | pierre | 2018-10-20 22:30:20 +0000 (Sat, 20 Oct 2018) | 1 line Add explicit typecast to avoid range ccheck error ------------------------------------------------------------------------ --- Merging r40002 into '.': U rtl/linux/termiosproc.inc --- Recording mergeinfo for merge of r40002 into '.': G . ------------------------------------------------------------------------ r40014 | pierre | 2018-10-22 21:14:59 +0000 (Mon, 22 Oct 2018) | 1 line Add missing unicode related units to netware OS ------------------------------------------------------------------------ --- Merging r40014 into '.': U rtl/netware/Makefile U rtl/netware/Makefile.fpc --- Recording mergeinfo for merge of r40014 into '.': G . ------------------------------------------------------------------------ r40358 | pierre | 2018-11-20 22:02:59 +0000 (Tue, 20 Nov 2018) | 1 line Add classes unit ------------------------------------------------------------------------ --- Merging r40358 into '.': U rtl/watcom/Makefile U rtl/watcom/Makefile.fpc --- Recording mergeinfo for merge of r40358 into '.': G . ------------------------------------------------------------------------ r40363 | pierre | 2018-11-23 13:29:01 +0000 (Fri, 23 Nov 2018) | 1 line Also disable fpdoc and pas2jni utils packages for targets not supporting fcl-process package ------------------------------------------------------------------------ --- Merging r40363 into '.': U utils/pas2jni/fpmake.pp U utils/fpdoc/fpmake.pp --- Recording mergeinfo for merge of r40363 into '.': G . ------------------------------------------------------------------------ r40392 | pierre | 2018-11-29 14:23:44 +0000 (Thu, 29 Nov 2018) | 1 line Fix delete of gdbver.inc generated file after gdbint unit compilation when called from packages level ------------------------------------------------------------------------ --- Merging r40392 into '.': U packages/gdbint/fpmake.pp --- Recording mergeinfo for merge of r40392 into '.': G . ------------------------------------------------------------------------ r40397 | pierre | 2018-11-29 16:55:07 +0000 (Thu, 29 Nov 2018) | 1 line Fix cleaning of unicode utils package in fpmake ------------------------------------------------------------------------ --- Merging r40397 into '.': U utils/unicode/fpmake.pp --- Recording mergeinfo for merge of r40397 into '.': G . ------------------------------------------------------------------------ r40481 | pierre | 2018-12-06 17:06:45 +0000 (Thu, 06 Dec 2018) | 1 line Fix compilation of installer for win32 target ------------------------------------------------------------------------ --- Merging r40481 into '.': U installer/Makefile U installer/Makefile.fpc U packages/ide/Makefile.fpc U packages/ide/Makefile --- Recording mergeinfo for merge of r40481 into '.': G . ------------------------------------------------------------------------ r40537 | pierre | 2018-12-13 10:21:58 +0000 (Thu, 13 Dec 2018) | 1 line Always accept empty string as meaning zero is TryRomanToInt, fixes intermittent errors in tromantoint test ------------------------------------------------------------------------ --- Merging r40537 into '.': U packages/rtl-objpas/src/inc/strutils.pp U tests/test/units/strutils/tromantoint.pp --- Recording mergeinfo for merge of r40537 into '.': G . git-svn-id: branches/fixes_3_2@40618 -	2018-12-23 14:44:32 +00:00
pierre	fa77ae20bc	* Merge most of fpmkunit related commits from trunk to fixes branch ... ------------------------------------------------------------------------ r39713 | michael | 2018-09-08 10:15:57 +0000 (Sat, 08 Sep 2018) | 1 line * Fix bug #34241 using provided suggestion by Christo Crause ------------------------------------------------------------------------ ------------------------------------------------------------------------ r39820 | pierre | 2018-09-27 06:37:37 +0000 (Thu, 27 Sep 2018) | 1 line Fix problem reported in bug report 34343 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r39839 | florian | 2018-09-28 20:54:53 +0000 (Fri, 28 Sep 2018) | 1 line * enabled mipsel-embedded also in the fpmkunit, resolves #34345 ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40362 | pierre | 2018-11-23 13:12:06 +0000 (Fri, 23 Nov 2018) | 1 line Fix go32v2 utils compilation by using the same OS limitation for utils-fppkg as in fcl-process package ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40371 | pierre | 2018-11-25 21:24:16 +0000 (Sun, 25 Nov 2018) | 6 lines + Add new string SWarnRemoveNonEmptyDirectory * Change SWarnUnregisteredResource into a debug string + Use ExcludeTrailingDelimiter to be sure to get the parent directory in Clean method. + Add call to CmdRemoveTrees if CmdRemmoveDirs fails in Clean method, but only if dir name if $FPCTARGET ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40380 | pierre | 2018-11-28 14:03:45 +0000 (Wed, 28 Nov 2018) | 1 line Add mising disclean help, rephrase help for Clean also ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40381 | pierre | 2018-11-28 16:47:43 +0000 (Wed, 28 Nov 2018) | 1 line Fix i386-aros in fpmkunit ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40388 | pierre | 2018-11-28 22:11:29 +0000 (Wed, 28 Nov 2018) | 7 lines * Change "Clean of package %S completed" level from vlWarning to vlInfo, to be at same level as "Cleaning pacakge %s" message. * Transform "Searching dir" writeln in SearchFiles into a vlDebug level log call. + Add manifest.xml to the list of files to remove. * Only do something in TBuildEngine.Clean method if AllTargets is true or if CPU-OS is supported for APackage parameter. ------------------------------------------------------------------------ ------------------------------------------------------------------------ r40389 | pierre | 2018-11-28 23:16:31 +0000 (Wed, 28 Nov 2018) | 1 line Add listing of unremoved files during clean with -d (vlDebug) option ------------------------------------------------------------------------ ------------------------------------------------------------------------ r39713 | michael | 2018-09-08 10:15:57 +0000 (Sat, 08 Sep 2018) | 1 line * Fix bug #34241 using provided suggestion by Christo Crause ------------------------------------------------------------------------ --- Merging r39713 into '.': U packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r39713 into '.': U . ------------------------------------------------------------------------ r39820 | pierre | 2018-09-27 06:37:37 +0000 (Thu, 27 Sep 2018) | 1 line Fix problem reported in bug report 34343 ------------------------------------------------------------------------ @@ # Don't edit, this file is generated by FPCMake Version 2.0.0 # default: all <<<<<<< MINE (select with 'mc') (5) MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-android x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin aarch64-android wasm-wasm sparc64-linux ||||||| ORIGINAL (5) MAKEFILETARGETS=x86_64-linux ======= MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android i386-aros m68k-linux m68k-netbsd m68k-amiga m68k-atari m68k-palmos m68k-macos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-netbsd arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin wasm-wasm sparc64-linux riscv32-linux riscv32-embedded riscv64-linux riscv64-embedded >>>>>>> THEIRS (select with 'tc') (5) BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix LIMIT83fs = go32v2 os2 emx watcom msdos win16 atari @@ endif endif override PACKAGE_NAME=fppkg <<<<<<< MINE (select with 'mc') (333) override PACKAGE_VERSION=3.2.0-beta ||||||| ORIGINAL (335) override PACKAGE_VERSION=3.1.1 ======= override PACKAGE_VERSION=3.3.1 >>>>>>> THEIRS (select with 'tc') (335) FPMAKE_BIN_CLEAN=$(wildcard ./fpmake$(SRCEXEEXT)) ifdef OS_TARGET FPC_TARGETOPT+=--os=$(OS_TARGET) @@ REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif <<<<<<< MINE (select with 'mc') (1361,344) ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-iphonesim) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-aros) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-aros) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-win16) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),wasm-wasm) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ||||||| ORIGINAL (1018,0) ======= ifeq ($(FULL_TARGET),x86_64-freebsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-solaris) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-openbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-win64) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-iphonesim) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-aros) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-netbsd) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-palmos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-wince) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-gba) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-nds) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-symbian) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),arm-aros) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),powerpc64-aix) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),avr-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),armeb-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mips-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),mipsel-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-java) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),i8086-win16) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),aarch64-darwin) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),wasm-wasm) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),sparc64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),riscv32-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),riscv32-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),riscv64-linux) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif ifeq ($(FULL_TARGET),riscv64-embedded) REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_PASZLIB=1 REQUIRE_PACKAGES_FCL-PROCESS=1 REQUIRE_PACKAGES_HASH=1 REQUIRE_PACKAGES_LIBTAR=1 REQUIRE_PACKAGES_FPMKUNIT=1 endif >>>>>>> THEIRS (select with 'tc') (1363,360) ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) ------------------------------------------------------------------------ r39713 | michael | 2018-09-08 10:15:57 +0000 (Sat, 08 Sep 2018) | 1 line * Fix bug #34241 using provided suggestion by Christo Crause ------------------------------------------------------------------------ --- Merging r39713 into '.': U packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r39713 into '.': U . ------------------------------------------------------------------------ r39839 | florian | 2018-09-28 20:54:53 +0000 (Fri, 28 Sep 2018) | 1 line * enabled mipsel-embedded also in the fpmkunit, resolves #34345 ------------------------------------------------------------------------ @@ { This table is kept OS,Cpu because it is easier to maintain (PFV) } OSCPUSupported : array[TOS,TCpu] of boolean = ( <<<<<<< MINE (select with 'mc') (188,40) { os none i386 m68k ppc sparc x86_64 arm ppc64 avr armeb mips mipsel jvm i8086 aarch64 sparc64} { none } ( false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { linux } ( false, true, true, true, true, true, true, true, false, true , true , true , false, false, true , true ), { go32v2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win32 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { os2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { freebsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false), { beos } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netbsd } ( false, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false), { amiga } ( false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false), { atari } ( false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false), { solaris } ( false, true, false, false, true, true, false, false, false, false, false, false, false, false, false, false), { qnx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netware } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { openbsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false), { wdosx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { palmos } ( false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false), { macos } ( false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { darwin } ( false, true, false, true, false, true, true, true, false, false, false, false, false, false, true , false), { emx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { watcom } ( false, true, false, false, false ,false, false, false, false, false, false, false, false, false, false, false), { morphos } ( false, false, false, true, false ,false, false, false, false, false, false, false, false, false, false, false), { netwlibc }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win64 } ( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { wince }( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { gba } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { nds } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { embedded }( false, true, true, true, true, true, true, true, true, true , false, false, false, true , false, false), { symbian } ( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { haiku } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { iphonesim}( false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { aix } ( false, false, false, true, false, false, false, true, false, false, false, false, false, false, false, false), { java } ( false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false), { android } ( false, true, false, false, false, true, true, false, false, false, false, true, true , false, true, false), { nativent }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { msdos } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false), { wii } ( false, false, false, true , false, false, false, false, false, false, false, false, false, false, false, false), { aros } ( true, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false), { dragonfly}( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { win16 } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false) ||||||| ORIGINAL (188,40) { os none i386 m68k ppc sparc x86_64 arm ppc64 avr armeb mips mipsel jvm i8086 aarch64 sparc64 riscv32 riscv64} { none } ( false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { linux } ( false, true, true, true, true, true, true, true, false, true , true , true , false, false, true , true , true , true ), { go32v2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win32 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { os2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { freebsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { beos } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netbsd } ( false, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false), { amiga } ( false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { atari } ( false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { solaris } ( false, true, false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false), { qnx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netware } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { openbsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { wdosx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { palmos } ( false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { macos } ( false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { darwin } ( false, true, false, true, false, true, true, true, false, false, false, false, false, false, true , false, false, false), { emx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { watcom } ( false, true, false, false, false ,false, false, false, false, false, false, false, false, false, false, false, false, false), { morphos } ( false, false, false, true, false ,false, false, false, false, false, false, false, false, false, false, false, false, false), { netwlibc }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win64 } ( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { wince }( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { gba } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { nds } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { embedded }( false, true, true, true, true, true, true, true, true, true , false, false, false, true , false, false, true , true ), { symbian } ( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { haiku } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { iphonesim}( false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { aix } ( false, false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { java } ( false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false, false), { android } ( false, true, false, false, false, false, true, false, false, false, false, true, true , false, false, false, false, false), { nativent }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { msdos } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false), { wii } ( false, false, false, true , false, false, false, false, false, false, false, false, false, false, false, false, false, false), { aros } ( true, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { dragonfly}( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { win16 } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false) ======= { os none i386 m68k ppc sparc x86_64 arm ppc64 avr armeb mips mipsel jvm i8086 aarch64 sparc64 riscv32 riscv64} { none } ( false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { linux } ( false, true, true, true, true, true, true, true, false, true , true , true , false, false, true , true , true , true ), { go32v2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win32 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { os2 } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { freebsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { beos } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netbsd } ( false, true, true, true, true, true, true, false, false, false, false, false, false, false, false, false, false, false), { amiga } ( false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { atari } ( false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { solaris } ( false, true, false, false, true, true, false, false, false, false, false, false, false, false, false, false, false, false), { qnx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { netware } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { openbsd } ( false, true, true, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { wdosx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { palmos } ( false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { macos } ( false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { darwin } ( false, true, false, true, false, true, true, true, false, false, false, false, false, false, true , false, false, false), { emx } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { watcom } ( false, true, false, false, false ,false, false, false, false, false, false, false, false, false, false, false, false, false), { morphos } ( false, false, false, true, false ,false, false, false, false, false, false, false, false, false, false, false, false, false), { netwlibc }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { win64 } ( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { wince }( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { gba } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { nds } ( false, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { embedded }( false, true, true, true, true, true, true, true, true, true , false, true, false, true , false, false, true , true ), { symbian } ( false, true, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { haiku } ( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { iphonesim}( false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { aix } ( false, false, false, true, false, false, false, true, false, false, false, false, false, false, false, false, false, false), { java } ( false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false, false), { android } ( false, true, false, false, false, false, true, false, false, false, false, true, true , false, false, false, false, false), { nativent }( false, true, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false), { msdos } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false), { wii } ( false, false, false, true , false, false, false, false, false, false, false, false, false, false, false, false, false, false), { aros } ( true, false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false), { dragonfly}( false, false, false, false, false, true, false, false, false, false, false, false, false, false, false, false, false, false), { win16 } ( false, false, false, false, false, false, false, false, false, false, false, false, false, true , false, false, false, false) >>>>>>> THEIRS (select with 'tc') (188,40) ); // Useful --- Merging r39839 into '.': C packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r39839 into '.': G . Summary of conflicts: Text conflicts: 1 ------------------------------------------------------------------------ r40362 | pierre | 2018-11-23 13:12:06 +0000 (Fri, 23 Nov 2018) | 1 line Fix go32v2 utils compilation by using the same OS limitation for utils-fppkg as in fcl-process package ------------------------------------------------------------------------ --- Merging r40362 into '.': U utils/fppkg/fpmake.pp --- Recording mergeinfo for merge of r40362 into '.': G . ------------------------------------------------------------------------ r40371 | pierre | 2018-11-25 21:24:16 +0000 (Sun, 25 Nov 2018) | 6 lines + Add new string SWarnRemoveNonEmptyDirectory * Change SWarnUnregisteredResource into a debug string + Use ExcludeTrailingDelimiter to be sure to get the parent directory in Clean method. + Add call to CmdRemoveTrees if CmdRemmoveDirs fails in Clean method, but only if dir name if $FPCTARGET ------------------------------------------------------------------------ --- Merging r40371 into '.': C packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40371 into '.': G . Summary of conflicts: Text conflicts: 1 ------------------------------------------------------------------------ r40380 | pierre | 2018-11-28 14:03:45 +0000 (Wed, 28 Nov 2018) | 1 line Add mising disclean help, rephrase help for Clean also ------------------------------------------------------------------------ --- Merging r40380 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40380 into '.': G . ------------------------------------------------------------------------ r40381 | pierre | 2018-11-28 16:47:43 +0000 (Wed, 28 Nov 2018) | 1 line Fix i386-aros in fpmkunit ------------------------------------------------------------------------ --- Merging r40381 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40381 into '.': G . ------------------------------------------------------------------------ r40388 | pierre | 2018-11-28 22:11:29 +0000 (Wed, 28 Nov 2018) | 7 lines * Change "Clean of package %S completed" level from vlWarning to vlInfo, to be at same level as "Cleaning pacakge %s" message. * Transform "Searching dir" writeln in SearchFiles into a vlDebug level log call. + Add manifest.xml to the list of files to remove. * Only do something in TBuildEngine.Clean method if AllTargets is true or if CPU-OS is supported for APackage parameter. ------------------------------------------------------------------------ --- Merging r40388 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40388 into '.': G . ------------------------------------------------------------------------ r40389 | pierre | 2018-11-28 23:16:31 +0000 (Wed, 28 Nov 2018) | 1 line Add listing of unremoved files during clean with -d (vlDebug) option ------------------------------------------------------------------------ --- Merging r40389 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40389 into '.': G . ------------------------------------------------------------------------ r40390 | pierre | 2018-11-28 23:24:33 +0000 (Wed, 28 Nov 2018) | 1 line Document -d --debug option, and change short version of --doc-folder to -df as -d is already used by debug option ------------------------------------------------------------------------ --- Merging r40390 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40390 into '.': G . ------------------------------------------------------------------------ r40520 | marco | 2018-12-10 22:42:52 +0000 (Mon, 10 Dec 2018) | 2 lines * add similar retries to sysdeletefile as for removedirs. because buildunits sometimes fail to erase. Seems to fix #21868 ------------------------------------------------------------------------ --- Merging r40520 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40520 into '.': G . ------------------------------------------------------------------------ r40614 | marco | 2018-12-22 15:55:44 +0000 (Sat, 22 Dec 2018) | 1 line * fixed formatting parameter in SWarnRetryDeleteFile ------------------------------------------------------------------------ --- Merging r40614 into '.': G packages/fpmkunit/src/fpmkunit.pp --- Recording mergeinfo for merge of r40614 into '.': G . git-svn-id: branches/fixes_3_2@40617 -	2018-12-22 23:17:59 +00:00
pierre	1fafc17016	Merge of revisions 39731 39825 39849 39912 39913 39914 39924 39935 39999 40000 40001 40026 40115 40132 40163 from trunk to fixes_3_2 ... ------------------------------------------------------------------------ r39731 | pierre | 2018-09-11 08:00:54 +0000 (Tue, 11 Sep 2018) | 1 line Disable overflow for UDIVX ans SDIVX 64-bit instructions ------------------------------------------------------------------------ --- Merging r39731 into '.': U compiler/sparcgen/ncpumat.pas --- Recording mergeinfo for merge of r39731 into '.': G . ------------------------------------------------------------------------ r39825 | pierre | 2018-09-27 06:59:07 +0000 (Thu, 27 Sep 2018) | 1 line Add rtl dependency and fix fpcdir value ------------------------------------------------------------------------ --- Merging r39825 into '.': U packages/ide/compiler/Makefile.fpc --- Recording mergeinfo for merge of r39825 into '.': G . ------------------------------------------------------------------------ r39849 | pierre | 2018-10-01 21:50:13 +0000 (Mon, 01 Oct 2018) | 1 line Use vfpv2 as default fpu for eabihf if cpu is below armv7 ------------------------------------------------------------------------ --- Merging r39849 into '.': U compiler/options.pas --- Recording mergeinfo for merge of r39849 into '.': G . ------------------------------------------------------------------------ r39912 | pierre | 2018-10-11 20:38:39 +0000 (Thu, 11 Oct 2018) | 1 line Fix ppuload for string type for i8086, use getasizeint for all string defs but short string ------------------------------------------------------------------------ --- Recording mergeinfo for merge of r39912 into '.': G . ------------------------------------------------------------------------ r39913 | pierre | 2018-10-11 21:02:25 +0000 (Thu, 11 Oct 2018) | 1 line fix position of ppuload_platform for trecorddef ------------------------------------------------------------------------ --- Recording mergeinfo for merge of r39913 into '.': G . ------------------------------------------------------------------------ r39914 | pierre | 2018-10-12 06:05:50 +0000 (Fri, 12 Oct 2018) | 1 line Adapt ppudump to fix introduced in revision 39912 ------------------------------------------------------------------------ --- Recording mergeinfo for merge of r39914 into '.': G . ------------------------------------------------------------------------ r39924 | pierre | 2018-10-13 11:35:34 +0000 (Sat, 13 Oct 2018) | 1 line Downgrade some warnings to notes for EXTDEBUG ------------------------------------------------------------------------ --- Merging r39924 into '.': U compiler/pass_2.pas U compiler/tgobj.pas --- Recording mergeinfo for merge of r39924 into '.': G . ------------------------------------------------------------------------ r39935 | pierre | 2018-10-14 22:18:50 +0000 (Sun, 14 Oct 2018) | 1 line Add missing setting of expectloc for multiplications ------------------------------------------------------------------------ --- Merging r39935 into '.': U compiler/nadd.pas --- Recording mergeinfo for merge of r39935 into '.': G . ------------------------------------------------------------------------ r39999 | pierre | 2018-10-20 18:44:05 +0000 (Sat, 20 Oct 2018) | 1 line Avoid run time error if compiled with -CR option ------------------------------------------------------------------------ --- Merging r39999 into '.': U compiler/m68k/cpupara.pas --- Recording mergeinfo for merge of r39999 into '.': G . ------------------------------------------------------------------------ r40000 | pierre | 2018-10-20 18:49:53 +0000 (Sat, 20 Oct 2018) | 1 line Avoid range check error when compiled with -CR ------------------------------------------------------------------------ --- Merging r40000 into '.': U compiler/m68k/cgcpu.pas --- Recording mergeinfo for merge of r40000 into '.': G . ------------------------------------------------------------------------ r40001 | pierre | 2018-10-20 22:19:08 +0000 (Sat, 20 Oct 2018) | 1 line Add explicit typecast to avoid range check error ------------------------------------------------------------------------ --- Recording mergeinfo for merge of r40001 into '.': G . ------------------------------------------------------------------------ r40026 | pierre | 2018-10-24 21:37:22 +0000 (Wed, 24 Oct 2018) | 1 line Explicitly disable range checking ------------------------------------------------------------------------ --- Merging r40026 into '.': U compiler/x86/cgx86.pas --- Recording mergeinfo for merge of r40026 into '.': G . ------------------------------------------------------------------------ r40115 | pierre | 2018-10-31 22:53:11 +0000 (Wed, 31 Oct 2018) | 1 line Avoid range check error in ReadPosInfo ------------------------------------------------------------------------ --- Recording mergeinfo for merge of r40115 into '.': G . ------------------------------------------------------------------------ r40132 | pierre | 2018-11-01 07:09:47 +0000 (Thu, 01 Nov 2018) | 1 line Only call moved if len>0, as otherwise astring local variable is nil, which leads to a range check error for astring[1] ------------------------------------------------------------------------ --- Recording mergeinfo for merge of r40132 into '.': G . ------------------------------------------------------------------------ r40163 | pierre | 2018-11-01 21:58:54 +0000 (Thu, 01 Nov 2018) | 8 lines More -CriotR fixes: * entfile.pas: Change PPU header falgs filed from longint to dword. * ngtcon.pas: Change local variable startoffset type to aword. * omfbase.pas: Avoid calling move with a nil string s indexed as s[1], to avoid a range check error. * owomflib.pas: Disable range check explicitly in hash computation. * utils/ppuutils/ppudump.pp: Adapt to flags type change in entfile.pas ------------------------------------------------------------------------ --- Recording mergeinfo for merge of r40163 into '.': G . git-svn-id: branches/fixes_3_2@40616 -	2018-12-22 22:19:05 +00:00
marco	20799193a7	--- Merging r40025 into '.': ... U rtl/Makefile U rtl/Makefile.fpc --- Recording mergeinfo for merge of r40025 into '.': U . # revisions: 40025 git-svn-id: branches/fixes_3_2@40613 -	2018-12-22 15:05:31 +00:00
marco	36dc22adb5	--- Merging r40561 into '.': ... U packages/fcl-process/src/processbody.inc --- Recording mergeinfo for merge of r40561 into '.': U . # revisions: 40561 git-svn-id: branches/fixes_3_2@40612 -	2018-12-22 15:03:04 +00:00