Commit Graph

3359 Commits

Author SHA1 Message Date
svenbarth
0de9940d01 * fix for Mantis #38023: the code to convert LF to CRLF when converting to UTF-8 is disabled anyway, so disable unnecessary, duplicate if-branches as well
git-svn-id: trunk@47284 -
(cherry picked from commit c2454d5386)
2024-01-19 11:54:54 +01:00
ondrej
c0cb2b6051 * fix memory leak in RegisterLazyInitThreadingProc
git-svn-id: trunk@47311 -
(cherry picked from commit a65158bfe8)
2023-12-26 23:09:28 +01:00
ondrej
16010570bb * lazy thread initialization support
git-svn-id: trunk@47308 -
(cherry picked from commit c64429cdd0)
2023-12-13 13:51:16 +01:00
florian
92fe577846 * fix error on win64 and concerns about pulling math into the windows unit by a local arctan2 copy
(cherry picked from commit 7bd5613954)
2023-06-19 11:08:50 +02:00
marcoonthegit
66bfb69e96 * Tpoint.Angle initial version using arctan2
(cherry picked from commit 5fb88cef00)
2023-06-18 16:12:27 +02:00
florian
9b2ba834a6 * properly calcualte aligncount as proposed by Jeppe, should resolve #33323
git-svn-id: trunk@40449 -
(cherry picked from commit 90557f2e62)
2022-08-18 14:49:04 +00:00
svenbarth
dba65567f1 * use the sizes of the floatx80 and float128 structs for arrays having their size to avoid problems with padding on different platforms
git-svn-id: trunk@47198 -
(cherry picked from commit 16eb670e67)
2022-02-02 17:12:31 +01:00
marcoonthegit
c214b949d4 * implemented stringofchar unicodestring, bug #39483
(cherry picked from commit 4568c77f57)
2022-01-21 18:28:56 +01:00
florian
ce336a08c5 * omit first not, helps the reg. allocator to find a workable colouring, resolves #36611
git-svn-id: trunk@44005 -
(cherry picked from commit ae8d2dc69a)
2021-10-24 12:40:37 +02:00
florian
150fac54cb * changes shift parameter of shift helpers into ALUUInt, as there is an "and" used anyways, this does not change semantics but reduces register pressure on 8 bit targets
git-svn-id: trunk@42200 -
(cherry picked from commit f92b8d1681)
2021-10-24 12:40:37 +02:00
florian
647c5889de * simplified fpc_mul_qword so it compiles again on avr, fixes #36236 but does not solve the root of the problem
git-svn-id: trunk@43342 -
(cherry picked from commit 3b1903b430)
2021-10-24 12:40:37 +02:00
Jeppe Johansen
d14e3e96a7 - Fix bug in software overflow checking for longint's.
- AVR: Fix overflow checking for HW multiplications

git-svn-id: trunk@42531 -
(cherry picked from commit 1b698d319f)
2021-10-24 12:40:36 +02:00
Jeppe Johansen
ebe4d4cf13 Fixed stack checking for embedded target. Based on work by Christo Crause
git-svn-id: trunk@42157 -
(cherry picked from commit 2f501be2a0)
2021-10-24 12:40:36 +02:00
Sven/Sarah Barth
48c54afabb * patch by Sergey Larin to handle Native(U)Int conversions from/to variants, resolves #37339
git-svn-id: trunk@45797 -
(cherry picked from commit a57f3ba396)
2021-10-01 17:43:23 +02:00
Jonas Maebe
9433467ec8 * Darwin support for printing line info for backtraces when using Dwarf,
based on patches by Colin Western, mantis #38483)
   o requires that the program/library is compiled with -Xg (or that
     dsymutil is run on it after compiling), and that the .dSYM bundle
     is in the same directory as the program/library
   o always use the "dl" unit in exeinfo for Darwin, as that's needed for
     dynamic library support, and this does not cause an extra dependency
     since on Darwin we always use libc
   o cleaned up the exeinfo unit for Darwin, and sped it up by using mmap
     instead of small reads
   o fixed unit dependencies for exeinfo, lineinfo and lnfodwarf in Darwin
     RTL Makefile
  * use the process address info from the original exe even when reading
    the debug information from an external file
  - removed outdated ifdef'd darwin code from dl.pp (no longer needed now
    that processaddress gets set correctly in exeinfo for that platform)

git-svn-id: trunk@49140 -
(cherry picked from commit 0eb9dd3879)
2021-09-04 15:09:22 +02:00
florian
1f8c547561 * fix exception generation in ln(...), resolves #38832
(cherry picked from commit 1e1848da92)

# Conflicts:
#	.gitattributes
2021-08-23 23:57:33 +02:00
marco
44383938f9 --- Merging r49080 into '.':
U    rtl/inc/lnfodwrf.pp
--- Recording mergeinfo for merge of r49080 into '.':
 U   .
--- Merging r49086 into '.':
G    rtl/inc/lnfodwrf.pp
--- Recording mergeinfo for merge of r49086 into '.':
 G   .

# revisions: 49080,49086
r49080 | florian | 2021-03-29 14:20:39 +0200 (Mon, 29 Mar 2021) | 1 line
Changed paths:
   M /trunk/rtl/inc/lnfodwrf.pp

  + use a hash table to speed up line info retrieval
r49086 | florian | 2021-03-30 16:06:19 +0200 (Tue, 30 Mar 2021) | 1 line
Changed paths:
   M /trunk/rtl/inc/lnfodwrf.pp

  * check for cache entry before even trying to open the file containing the debug info

git-svn-id: branches/fixes_3_2@49088 -
2021-03-30 20:10:09 +00:00
marco
c612e9c69e --- Merging r43776 into '.':
C    rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43776 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1

# revisions: 43776
r43776 | svenbarth | 2019-12-24 22:30:00 +0100 (Tue, 24 Dec 2019) | 1 line
Changed paths:
   M /trunk/rtl/inc/systemh.inc

* if a CPU platform does not provide a FarPointer type then declare it as an alias to a mere Pointer

git-svn-id: branches/fixes_3_2@47918 -
2020-12-30 23:04:49 +00:00
marco
ba6989a42f --- Merging r43121 into '.':
U    rtl/inc/cgeneric.inc
--- Recording mergeinfo for merge of r43121 into '.':
 U   .
--- Merging r47123 into '.':
U    rtl/aarch64/math.inc
--- Recording mergeinfo for merge of r47123 into '.':
 G   .

# revisions: 43121,47123
r43121 | svenbarth | 2019-10-05 11:42:55 +0200 (Sat, 05 Oct 2019) | 1 line
Changed paths:
   M /trunk/rtl/inc/cgeneric.inc

* use clib constant instead of literal 'c' in case we have a target where the library is not called 'c' (hopefully all targets that use cgeneric.inc have the clib constant declared in their sysos.inc)
r47123 | svenbarth | 2020-10-18 10:52:41 +0200 (Sun, 18 Oct 2020) | 1 line
Changed paths:
   M /trunk/rtl/aarch64/math.inc

* for Aarch64 inline assembly comments need to start with //

git-svn-id: branches/fixes_3_2@47916 -
2020-12-30 22:57:50 +00:00
marco
83f7e7e3dc --- Merging r46853 into '.':
U    rtl/inc/text.inc
--- Recording mergeinfo for merge of r46853 into '.':
 U   .
--- Merging r46864 into '.':
G    rtl/inc/text.inc
--- Recording mergeinfo for merge of r46864 into '.':
 G   .
--- Merging r46946 into '.':
G    rtl/inc/text.inc
A    tests/test/units/system/tseekeof.pp
--- Recording mergeinfo for merge of r46946 into '.':
 G   .
--- Merging r47542 into '.':
U    rtl/go32v2/sysutils.pp
U    rtl/msdos/sysutils.pp
U    rtl/watcom/sysutils.pp
--- Recording mergeinfo for merge of r47542 into '.':
 G   .
--- Merging r47543 into '.':
G    rtl/msdos/sysutils.pp
--- Recording mergeinfo for merge of r47543 into '.':
 G   .
--- Merging r47544 into '.':
G    rtl/go32v2/sysutils.pp
--- Recording mergeinfo for merge of r47544 into '.':
 G   .

# revisions: 46853,46864,46946,47542,47543,47544
r46853 | hajny | 2020-09-12 01:43:32 +0200 (Sat, 12 Sep 2020) | 1 line
Changed paths:
   M /trunk/rtl/inc/text.inc

  * fix for bug #37716 by Andrey 'Croco' Stolyarov
r46864 | hajny | 2020-09-14 07:30:59 +0200 (Mon, 14 Sep 2020) | 1 line
Changed paths:
   M /trunk/rtl/inc/text.inc

  * fix for problem with commit 46853
r46946 | hajny | 2020-09-24 21:33:28 +0200 (Thu, 24 Sep 2020) | 1 line
Changed paths:
   M /trunk/rtl/inc/text.inc
   A /trunk/tests/test/units/system/tseekeof.pp

  * simplified version of SeekEof for improved TP/BP/Delphi compatibility by Andrey 'Croco' Stolyarov as fix for #37716, plus a new test for testing the compatibility
r47542 | hajny | 2020-11-24 01:25:20 +0100 (Tue, 24 Nov 2020) | 1 line
Changed paths:
   M /trunk/rtl/go32v2/sysutils.pp
   M /trunk/rtl/msdos/sysutils.pp
   M /trunk/rtl/watcom/sysutils.pp

  + provided sysbeep for DOS targets
r47543 | hajny | 2020-11-24 01:27:06 +0100 (Tue, 24 Nov 2020) | 1 line
Changed paths:
   M /trunk/rtl/msdos/sysutils.pp

  * reverted a change not belonging to the previous commit
r47544 | hajny | 2020-11-24 01:29:08 +0100 (Tue, 24 Nov 2020) | 1 line
Changed paths:
   M /trunk/rtl/go32v2/sysutils.pp

  * reverted a change not belonging to the previous commit

git-svn-id: branches/fixes_3_2@47907 -
2020-12-30 14:07:54 +00:00
florian
4995677b0f --- Zusammenführung
-- Zusammenführen von r45995 in ».«:
U    rtl/linux/i386/sighnd.inc
U    rtl/linux/x86_64/sighnd.inc
A    tests/webtbs/tw37468.pp
-- Aufzeichnung der Informationen für Zusammenführung von r45995 in ».«:
 U   .
-- Zusammenführen von r46207 in ».«:
U    rtl/linux/i386/sighndh.inc
-- Aufzeichnung der Informationen für Zusammenführung von r46207 in ».«:
 G   .
-- Zusammenführen von r46208 in ».«:
G    rtl/linux/i386/sighnd.inc
-- Aufzeichnung der Informationen für Zusammenführung von r46208 in ».«:
 G   .
-- Zusammenführen von r46210 in ».«:
U    rtl/aix/sighnd.inc
U    rtl/beos/i386/sighnd.inc
U    rtl/go32v2/dpmiexcp.pp
U    rtl/haiku/i386/sighnd.inc
U    rtl/haiku/x86_64/sighnd.inc
U    rtl/i8086/math.inc
U    rtl/inc/genmath.inc
U    rtl/linux/m68k/sighnd.inc
U    rtl/linux/powerpc/sighnd.inc
U    rtl/linux/powerpc64/sighnd.inc
U    rtl/linux/sparc/sighnd.inc
U    rtl/linux/sparc64/sighnd.inc
G    rtl/linux/x86_64/sighnd.inc
U    rtl/netbsd/arm/sighnd.inc
U    rtl/netbsd/m68k/sighnd.inc
U    rtl/netbsd/powerpc/sighnd.inc
U    rtl/netbsd/x86_64/sighnd.inc
U    rtl/openbsd/i386/sighnd.inc
U    rtl/openbsd/x86_64/sighnd.inc
U    rtl/os2/system.pas
U    rtl/solaris/i386/sighnd.inc
U    rtl/solaris/sparc/sighnd.inc
U    rtl/solaris/x86_64/sighnd.inc
U    rtl/win32/system.pp
U    rtl/win64/system.pp
U    tests/webtbs/tw37468.pp
U    rtl/wince/system.pp
-- Aufzeichnung der Informationen für Zusammenführung von r46210 in ».«:
 G   .
-- Zusammenführen von r46992 in ».«:
G    rtl/linux/x86_64/sighnd.inc
A    tests/webtbs/tw37468b.pp
-- Aufzeichnung der Informationen für Zusammenführung von r46992 in ».«:
 G   .
-- Zusammenführen von r47114 in ».«:
G    rtl/linux/x86_64/sighnd.inc
G    rtl/linux/i386/sighnd.inc
A    tests/webtbs/tw37926.pp
-- Aufzeichnung der Informationen für Zusammenführung von r47114 in ».«:
 G   .
-- Zusammenführen von r47117 in ».«:
G    rtl/linux/i386/sighnd.inc
G    rtl/linux/x86_64/sighnd.inc
G    rtl/linux/m68k/sighnd.inc
-- Aufzeichnung der Informationen für Zusammenführung von r47117 in ».«:
 G   .

git-svn-id: branches/fixes_3_2@47906 -
2020-12-30 14:07:17 +00:00
svenbarth
74a1b6406e --- Merging r45159 into '.':
U    rtl/nativent/systhrd.inc
U    rtl/os2/systhrd.inc
U    rtl/win/systhrd.inc
--- Recording mergeinfo for merge of r45159 into '.':
 U   .
--- Merging r45160 into '.':
U    rtl/amicommon/athreads.pp
U    rtl/beos/bethreads.pp
U    rtl/inc/thread.inc
U    rtl/inc/threadh.inc
G    rtl/nativent/systhrd.inc
U    rtl/netware/systhrd.inc
U    rtl/netwlibc/systhrd.inc
U    rtl/objpas/classes/classes.inc
U    rtl/objpas/classes/classesh.inc
G    rtl/os2/systhrd.inc
U    rtl/unix/cthreads.pp
G    rtl/win/systhrd.inc
--- Recording mergeinfo for merge of r45160 into '.':
 G   .
--- Merging r45206 into '.':
U    rtl/win/sysos.inc
G    rtl/win/systhrd.inc
U    rtl/win/syswin.inc
--- Recording mergeinfo for merge of r45206 into '.':
 G   .
--- Merging r45207 into '.':
U    rtl/linux/pthread.inc
--- Recording mergeinfo for merge of r45207 into '.':
 G   .
--- Merging r45233 into '.':
G    rtl/linux/pthread.inc
G    rtl/unix/cthreads.pp
--- Recording mergeinfo for merge of r45233 into '.':
 G   .
--- Merging r45237 into '.':
G    rtl/unix/cthreads.pp
G    rtl/win/systhrd.inc
--- Recording mergeinfo for merge of r45237 into '.':
 G   .

git-svn-id: branches/fixes_3_2@47806 -
2020-12-17 22:44:26 +00:00
svenbarth
432fcd52bc Merged revision(s) 45409, 46897-46898, 47007, 47011, 47065, 47084 from trunk:
* fix for Mantis #37042: apply patch and test (adjusted for Big Endian) by Bi0T1N to add support for TBitConverter
........
* avoid range check error when using SwapEndian with 16-bit constants
+ added test
........
* readd SmallInt typecasts to SmallInt overload of SwapEndian
........
* when removing a method from the synchronization queue using TThread.RemoveQueuedEvent then both the Code and the Data need to match (Delphi does the same)
+ added test
........
* simplify TThread.RemoveQueuedEvent - decide what to delete and not what to leave (better corresponds with the docs)
........
+ add ability to specify a SQLite VFS when opening a SQLite database
........
* fix test: TThread.WaitFor calls CheckSynchronize as well, so the thread needs to signal when it's done with removing entries from the queue
........

git-svn-id: branches/fixes_3_2@47782 -
2020-12-15 22:31:59 +00:00
svenbarth
8a249b2d74 Merged revision(s) 44256-44257, 44746, 45329 from trunk:
* fix for Mantis #36706: only link a library against the dynamic loader if we're not linking against the C library anyway

Note: I did not yet find a case where we *do* need to link a library against the loader; this will have to be investigated further, but for 3.2.0 this is safest
........
* fix for Mantis #36738: when copying a record using its copy operator we assume that we've copied the whole record; this way managed records inside non-managed records are handled correctly
+ added (adjusted) test
........
* when checking for an existing operator overload for the assignment operator, check for the correct variant (explicit or not) matching the overload
+ added tests
........
* GetLoadErrorStr (currently) returns a ShortString, so avoid a useless conversion to AnsiString
........

git-svn-id: branches/fixes_3_2@47771 -
2020-12-13 21:52:13 +00:00
marco
82d2f07ee7 # revisions: 47147
git-svn-id: branches/fixes_3_2@47730 -
2020-12-08 20:42:54 +00:00
marco
ec0fb329f4 --- Merging r47196 into '.':
U    rtl/inc/softfpu.pp
--- Recording mergeinfo for merge of r47196 into '.':
 U   .

# revisions: 47196
r47196 | svenbarth | 2020-10-25 14:20:38 +0100 (Sun, 25 Oct 2020) | 1 line
Changed paths:
   M /trunk/rtl/inc/softfpu.pp

* fix for Mantis #37986: apply patch by Bart Broersma to fix a typo in a comment

git-svn-id: branches/fixes_3_2@47646 -
2020-11-30 17:56:13 +00:00
pierre
1439bd67b1 ------------------------------------------------------------------------
r46682 | pierre | 2020-08-25 06:34:29 +0000 (Tue, 25 Aug 2020) | 1 line

 * Disable range and overflow checking inside softfpu implementation
------------------------------------------------------------------------
--- Merging r46682 into '.':
U    rtl/inc/softfpu.pp
--- Recording mergeinfo for merge of r46682 into '.':
 U   .

git-svn-id: branches/fixes_3_2@47620 -
2020-11-28 15:57:56 +00:00
svenbarth
f4003a0981 Merged revision(s) 45479, 45489 from trunk:
+ add additional overloads for FindResource and FindResourceEx so that mixtures of AnsiString and MAKEINTRESOURCE types as well as names can be used
+ added test for ReadComponentRes (which called the wrong FindResource before)
........
* disable the new FindResource(Ex) overloads for Win16 for now (the one with PChar is disabled as well); this will need to be revisited once Win16 receives proper resource support
........

git-svn-id: branches/fixes_3_2@47603 -
2020-11-26 20:51:29 +00:00
svenbarth
7988446f1a Merged revision(s) 39802, 39816-39817 from trunk:
* fix for Mantis #34332: allow 2 parameter form of Copy also for ShortString variables
+ added test
........
* have the fpc_*_copy compiler intrinsics reference the intrinsic symbol they belong to
........
* fix for Mantis #34333: improve error output for incorrect calls to Copy()
........

git-svn-id: branches/fixes_3_2@47586 -
2020-11-25 21:24:41 +00:00
marco
2b9ddf3bee # revisions: 45519,46865,46918
git-svn-id: branches/fixes_3_2@47095 -
2020-10-11 15:53:29 +00:00
marco
9d6e63f2e3 # revisions: 45736
git-svn-id: branches/fixes_3_2@47093 -
2020-10-11 15:33:31 +00:00
marco
d0db73c20d # revisions: 46957
git-svn-id: branches/fixes_3_2@47090 -
2020-10-11 14:08:33 +00:00
marco
55b4b54c2a # revisions: 45573,45790,45793
git-svn-id: branches/fixes_3_2@46830 -
2020-09-10 13:57:39 +00:00
pierre
ae1c9ac76e Fix compilation on targets without floating point types
git-svn-id: branches/fixes_3_2@45866 -
2020-07-28 09:28:59 +00:00
pierre
a096c78e23 Try to fix rtl compilation error for some systems after last merge
git-svn-id: branches/fixes_3_2@45850 -
2020-07-25 11:28:01 +00:00
marco
775567e8f7 # revisions: 44598,45635,45757,45764,45772
git-svn-id: branches/fixes_3_2@45849 -
2020-07-24 21:09:00 +00:00
marco
7717e2c92e # revisions: 45676,45683
git-svn-id: branches/fixes_3_2@45703 -
2020-06-27 16:38:32 +00:00
marco
615b5199c4 # revisions: 45226,45647,45648,45649,45657
git-svn-id: branches/fixes_3_2@45687 -
2020-06-24 17:23:56 +00:00
marco
8250336193 # revisions: 44496,44529,44632,44635,44643,44644,44664
git-svn-id: branches/fixes_3_2@44863 -
2020-04-19 18:06:48 +00:00
pierre
a4758f3560 Merge commit #43305 into fixes branch.
------------------------------------------------------------------------
r43305 | pierre | 2019-10-23 06:38:10 +0000 (Wed, 23 Oct 2019) | 1 line

 Completely disable Round functions if FPUNONE is defined, to fix avr builds without flaot support
------------------------------------------------------------------------
--- Merging r43305 into '.':
U    rtl/inc/iso7185.pp
--- Recording mergeinfo for merge of r43305 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44701 -
2020-04-12 13:13:41 +00:00
marco
626c2b52c0 # revisions: 40850,41429,43188,43281,43282,43283,43801
git-svn-id: branches/fixes_3_2@44301 -
2020-03-14 16:08:36 +00:00
pierre
09a2fabb43 Merge of commit 43029
------------------------------------------------------------------------
r43029 | pierre | 2019-09-18 07:45:47 +0000 (Wed, 18 Sep 2019) | 1 line

 Fix bug report #36081: fix cycling starting with i386-linux 3.0.4 release compiler
------------------------------------------------------------------------
--- Merging r43029 into '.':
U    rtl/inc/system.inc
--- Recording mergeinfo for merge of r43029 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44109 -
2020-02-03 23:16:03 +00:00
pierre
b6cce11107 Merge of commit 43027 (to fix go32v2 with -Criot tests)
------------------------------------------------------------------------
r43027 | florian | 2019-09-17 18:42:40 +0000 (Tue, 17 Sep 2019) | 1 line

* fixed define
------------------------------------------------------------------------
--- Merging r43027 into '.':
U    rtl/inc/system.inc
--- Recording mergeinfo for merge of r43027 into '.':
 U   .

git-svn-id: branches/fixes_3_2@44069 -
2020-01-30 15:24:02 +00:00
pierre
d79fe2a393 Try to solve compilation failure for several system by
merge of revisions 43773, 43774 and 43775 from trunk to fixes_3_2
------------------------------------------------------------------------
r43773 | svenbarth | 2019-12-24 21:29:51 +0000 (Tue, 24 Dec 2019) | 1 line

* as long as the Comp type is declared, declare PComp as well
------------------------------------------------------------------------
--- Merging r43773 into '.':
U    rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43773 into '.':
 U   .
------------------------------------------------------------------------
r43774 | svenbarth | 2019-12-24 21:29:53 +0000 (Tue, 24 Dec 2019) | 1 line

* if a CPU platform doesn't explicitely provide the Comp type we declare it as an alias to Int64
------------------------------------------------------------------------
--- Merging r43774 into '.':
G    rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43774 into '.':
 G   .
------------------------------------------------------------------------
r43775 | svenbarth | 2019-12-24 21:29:57 +0000 (Tue, 24 Dec 2019) | 1 line

* Delphi allows overloading based on Comp, so declare it as a type rename instead of a mere alias
------------------------------------------------------------------------
--- Merging r43775 into '.':
G    rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r43775 into '.':
 G   .

git-svn-id: branches/fixes_3_2@43958 -
2020-01-16 15:37:19 +00:00
marco
375d21b29f --- Recording mergeinfo for merge of r41459 into '.':
U   .
--- Merging r43364 into '.':
U    rtl/inc/exeinfo.pp
--- Recording mergeinfo for merge of r43364 into '.':
 G   .
--- Merging r43375 into '.':
U    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r43375 into '.':
 G   .
--- Merging r43376 into '.':
U    utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r43376 into '.':
 G   .
--- Merging r43381 into '.':
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r43381 into '.':
 G   .
--- Merging r43383 into '.':
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r43383 into '.':
 G   .
--- Merging r43386 into '.':
G    utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r43386 into '.':
 G   .

# revisions: 41459,43364,43375,43376,43381,43383,43386

git-svn-id: branches/fixes_3_2@43446 -
2019-11-10 20:56:25 +00:00
florian
7cdb39b3f9 -- Aufzeichnung der Informationen für Zusammenführung von r43005 in ».«:
G   .
-- Aufzeichnung der Informationen für Zusammenführung von r43006 in ».«:
 G   .
-- Aufzeichnung der Informationen für Zusammenführung von r43007 in ».«:
 G   .
-- Aufzeichnung der Informationen für Zusammenführung von r43008 in ».«:
 G   .
-- Zusammenführen von r43000 in ».«:
U    compiler/pp.pas
-- Aufzeichnung der Informationen für Zusammenführung von r43000 in ».«:
 G   .
-- Zusammenführen von r43011 in ».«:
U    rtl/inc/system.inc
-- Aufzeichnung der Informationen für Zusammenführung von r43011 in ».«:
 G   .
-- Zusammenführen von r43012 in ».«:
U    rtl/i386/i386.inc
-- Aufzeichnung der Informationen für Zusammenführung von r43012 in ».«:
 G   .
-- Zusammenführen von r43013 in ».«:
U    rtl/linux/i386/si_c21.inc
-- Aufzeichnung der Informationen für Zusammenführung von r43013 in ».«:
 G   .
-- Zusammenführen von r43014 in ».«:
U    compiler/systems/i_linux.pas
-- Aufzeichnung der Informationen für Zusammenführung von r43014 in ».«:
 G   .
-- Zusammenführen von r43176 in ».«:
U    compiler/i386/cpupi.pas
U    compiler/i386/n386cal.pas
U    compiler/ncgcal.pas
U    compiler/ncgutil.pas
G    compiler/systems/i_linux.pas
U    compiler/systems.inc
C    compiler/systems.pas
G    tests/webtbs/tw7808.pp
-- Aufzeichnung der Informationen für Zusammenführung von r43176 in ».«:
 G   .
Konfliktübersicht:
  Textkonflikte: 1
Konfliktübersicht:
  Textkonflikte: 1

git-svn-id: branches/fixes_3_2@43434 -
2019-11-09 22:07:33 +00:00
marco
89e051bac9 # revisions: 41828,41830,41831,41832,41833,41834,41835,41836,41837,41838,41839,41841,41842,42025,42031,42032,42033,42034,42035,42036,42065,42066,42067,42068,42069,42070,42071,42072,42073,42089,42150,42151,42181,42182,42183,42184,42185,42219,42220,42221,42222
git-svn-id: branches/fixes_3_2@43400 -
2019-11-05 16:17:53 +00:00
marco
c067bf7751 # revisions: 42774,42796,42797
git-svn-id: branches/fixes_3_2@43395 -
2019-11-05 15:33:47 +00:00
marco
b8e3d6efa1 # revisions: 41570,41571,41938,42457,42327,42556,42557
git-svn-id: branches/fixes_3_2@43393 -
2019-11-05 15:16:28 +00:00
Jonas Maebe
c540b3b2df --- Merging r42483 into '.':
U    packages/cocoaint/src/CocoaAll.pas
U    packages/cocoaint/src/InlineFunctions.inc
U    packages/cocoaint/src/appkit/NSATSTypesetter.inc
U    packages/cocoaint/src/appkit/NSAccessibility.inc
U    packages/cocoaint/src/appkit/NSAlert.inc
U    packages/cocoaint/src/appkit/NSAnimation.inc
U    packages/cocoaint/src/appkit/NSApplication.inc
U    packages/cocoaint/src/appkit/NSApplicationScripting.inc
U    packages/cocoaint/src/appkit/NSArrayController.inc
U    packages/cocoaint/src/appkit/NSAttributedString.inc
U    packages/cocoaint/src/appkit/NSBezierPath.inc
U    packages/cocoaint/src/appkit/NSBitmapImageRep.inc
U    packages/cocoaint/src/appkit/NSBox.inc
U    packages/cocoaint/src/appkit/NSBrowser.inc
U    packages/cocoaint/src/appkit/NSBrowserCell.inc
U    packages/cocoaint/src/appkit/NSButton.inc
U    packages/cocoaint/src/appkit/NSButtonCell.inc
U    packages/cocoaint/src/appkit/NSCachedImageRep.inc
U    packages/cocoaint/src/appkit/NSCell.inc
U    packages/cocoaint/src/appkit/NSClipView.inc
U    packages/cocoaint/src/appkit/NSCollectionView.inc
U    packages/cocoaint/src/appkit/NSColor.inc
U    packages/cocoaint/src/appkit/NSColorList.inc
U    packages/cocoaint/src/appkit/NSColorPanel.inc
U    packages/cocoaint/src/appkit/NSColorPicking.inc
U    packages/cocoaint/src/appkit/NSColorWell.inc
U    packages/cocoaint/src/appkit/NSComboBox.inc
U    packages/cocoaint/src/appkit/NSComboBoxCell.inc
U    packages/cocoaint/src/appkit/NSControl.inc
U    packages/cocoaint/src/appkit/NSController.inc
U    packages/cocoaint/src/appkit/NSCursor.inc
U    packages/cocoaint/src/appkit/NSDatePicker.inc
U    packages/cocoaint/src/appkit/NSDatePickerCell.inc
U    packages/cocoaint/src/appkit/NSDictionaryController.inc
U    packages/cocoaint/src/appkit/NSDockTile.inc
U    packages/cocoaint/src/appkit/NSDocument.inc
U    packages/cocoaint/src/appkit/NSDocumentController.inc
U    packages/cocoaint/src/appkit/NSDragging.inc
U    packages/cocoaint/src/appkit/NSDrawer.inc
U    packages/cocoaint/src/appkit/NSEvent.inc
U    packages/cocoaint/src/appkit/NSFileWrapper.inc
U    packages/cocoaint/src/appkit/NSFont.inc
U    packages/cocoaint/src/appkit/NSFontManager.inc
U    packages/cocoaint/src/appkit/NSFontPanel.inc
U    packages/cocoaint/src/appkit/NSFormCell.inc
U    packages/cocoaint/src/appkit/NSGraphics.inc
U    packages/cocoaint/src/appkit/NSGraphicsContext.inc
U    packages/cocoaint/src/appkit/NSHelpManager.inc
U    packages/cocoaint/src/appkit/NSImage.inc
U    packages/cocoaint/src/appkit/NSImageRep.inc
U    packages/cocoaint/src/appkit/NSImageView.inc
U    packages/cocoaint/src/appkit/NSInputManager.inc
U    packages/cocoaint/src/appkit/NSInputServer.inc
U    packages/cocoaint/src/appkit/NSKeyValueBinding.inc
U    packages/cocoaint/src/appkit/NSLayoutManager.inc
U    packages/cocoaint/src/appkit/NSMatrix.inc
U    packages/cocoaint/src/appkit/NSMenu.inc
U    packages/cocoaint/src/appkit/NSMenuItem.inc
U    packages/cocoaint/src/appkit/NSMenuItemCell.inc
U    packages/cocoaint/src/appkit/NSMenuView.inc
U    packages/cocoaint/src/appkit/NSMovie.inc
U    packages/cocoaint/src/appkit/NSMovieView.inc
U    packages/cocoaint/src/appkit/NSNib.inc
U    packages/cocoaint/src/appkit/NSNibLoading.inc
U    packages/cocoaint/src/appkit/NSObjectController.inc
U    packages/cocoaint/src/appkit/NSOpenPanel.inc
U    packages/cocoaint/src/appkit/NSOutlineView.inc
U    packages/cocoaint/src/appkit/NSPanel.inc
U    packages/cocoaint/src/appkit/NSPasteboard.inc
U    packages/cocoaint/src/appkit/NSPasteboardItem.inc
U    packages/cocoaint/src/appkit/NSPathCell.inc
U    packages/cocoaint/src/appkit/NSPathControl.inc
U    packages/cocoaint/src/appkit/NSPersistentDocument.inc
U    packages/cocoaint/src/appkit/NSPopUpButton.inc
U    packages/cocoaint/src/appkit/NSPopUpButtonCell.inc
U    packages/cocoaint/src/appkit/NSPrintInfo.inc
U    packages/cocoaint/src/appkit/NSPrintOperation.inc
U    packages/cocoaint/src/appkit/NSPrinter.inc
U    packages/cocoaint/src/appkit/NSProgressIndicator.inc
U    packages/cocoaint/src/appkit/NSQuickDrawView.inc
U    packages/cocoaint/src/appkit/NSResponder.inc
U    packages/cocoaint/src/appkit/NSRuleEditor.inc
U    packages/cocoaint/src/appkit/NSRulerMarker.inc
U    packages/cocoaint/src/appkit/NSRulerView.inc
U    packages/cocoaint/src/appkit/NSRunningApplication.inc
U    packages/cocoaint/src/appkit/NSSavePanel.inc
U    packages/cocoaint/src/appkit/NSScrollView.inc
U    packages/cocoaint/src/appkit/NSScroller.inc
U    packages/cocoaint/src/appkit/NSSearchFieldCell.inc
U    packages/cocoaint/src/appkit/NSSecureTextField.inc
U    packages/cocoaint/src/appkit/NSSegmentedControl.inc
U    packages/cocoaint/src/appkit/NSSlider.inc
U    packages/cocoaint/src/appkit/NSSliderCell.inc
U    packages/cocoaint/src/appkit/NSSound.inc
U    packages/cocoaint/src/appkit/NSSpeechRecognizer.inc
U    packages/cocoaint/src/appkit/NSSpeechSynthesizer.inc
U    packages/cocoaint/src/appkit/NSSpellChecker.inc
U    packages/cocoaint/src/appkit/NSSplitView.inc
U    packages/cocoaint/src/appkit/NSStatusBar.inc
U    packages/cocoaint/src/appkit/NSStatusItem.inc
U    packages/cocoaint/src/appkit/NSStepper.inc
U    packages/cocoaint/src/appkit/NSStepperCell.inc
U    packages/cocoaint/src/appkit/NSTabView.inc
U    packages/cocoaint/src/appkit/NSTabViewItem.inc
U    packages/cocoaint/src/appkit/NSTableColumn.inc
U    packages/cocoaint/src/appkit/NSTableHeaderCell.inc
U    packages/cocoaint/src/appkit/NSTableHeaderView.inc
U    packages/cocoaint/src/appkit/NSTableView.inc
U    packages/cocoaint/src/appkit/NSText.inc
U    packages/cocoaint/src/appkit/NSTextAttachment.inc
U    packages/cocoaint/src/appkit/NSTextContainer.inc
U    packages/cocoaint/src/appkit/NSTextField.inc
U    packages/cocoaint/src/appkit/NSTextFieldCell.inc
U    packages/cocoaint/src/appkit/NSTextInputClient.inc
U    packages/cocoaint/src/appkit/NSTextInputContext.inc
U    packages/cocoaint/src/appkit/NSTextStorage.inc
U    packages/cocoaint/src/appkit/NSTextTable.inc
U    packages/cocoaint/src/appkit/NSTextView.inc
U    packages/cocoaint/src/appkit/NSTokenField.inc
U    packages/cocoaint/src/appkit/NSTokenFieldCell.inc
U    packages/cocoaint/src/appkit/NSToolbar.inc
U    packages/cocoaint/src/appkit/NSToolbarItem.inc
U    packages/cocoaint/src/appkit/NSTouch.inc
U    packages/cocoaint/src/appkit/NSTreeController.inc
U    packages/cocoaint/src/appkit/NSTreeNode.inc
U    packages/cocoaint/src/appkit/NSTypesetter.inc
U    packages/cocoaint/src/appkit/NSUserDefaultsController.inc
U    packages/cocoaint/src/appkit/NSUserInterfaceItemSearching.inc
U    packages/cocoaint/src/appkit/NSUserInterfaceValidation.inc
U    packages/cocoaint/src/appkit/NSView.inc
U    packages/cocoaint/src/appkit/NSViewController.inc
U    packages/cocoaint/src/appkit/NSWindow.inc
U    packages/cocoaint/src/appkit/NSWindowController.inc
U    packages/cocoaint/src/appkit/NSWindowScripting.inc
U    packages/cocoaint/src/appkit/NSWorkspace.inc
U    packages/cocoaint/src/coredata/NSAtomicStore.inc
U    packages/cocoaint/src/coredata/NSEntityDescription.inc
U    packages/cocoaint/src/coredata/NSEntityMigrationPolicy.inc
U    packages/cocoaint/src/coredata/NSFetchRequest.inc
U    packages/cocoaint/src/coredata/NSFetchRequestExpression.inc
U    packages/cocoaint/src/coredata/NSManagedObject.inc
U    packages/cocoaint/src/coredata/NSManagedObjectContext.inc
U    packages/cocoaint/src/coredata/NSManagedObjectID.inc
U    packages/cocoaint/src/coredata/NSManagedObjectModel.inc
U    packages/cocoaint/src/coredata/NSMigrationManager.inc
U    packages/cocoaint/src/coredata/NSPersistentStore.inc
U    packages/cocoaint/src/coredata/NSPersistentStoreCoordinator.inc
U    packages/cocoaint/src/coredata/NSPropertyDescription.inc
U    packages/cocoaint/src/coredata/NSRelationshipDescription.inc
U    packages/cocoaint/src/foundation/NSAppleEventDescriptor.inc
U    packages/cocoaint/src/foundation/NSAppleEventManager.inc
U    packages/cocoaint/src/foundation/NSAppleScript.inc
U    packages/cocoaint/src/foundation/NSArchiver.inc
U    packages/cocoaint/src/foundation/NSArray.inc
U    packages/cocoaint/src/foundation/NSBundle.inc
U    packages/cocoaint/src/foundation/NSCache.inc
U    packages/cocoaint/src/foundation/NSCalendar.inc
U    packages/cocoaint/src/foundation/NSCharacterSet.inc
U    packages/cocoaint/src/foundation/NSCoder.inc
U    packages/cocoaint/src/foundation/NSConnection.inc
U    packages/cocoaint/src/foundation/NSData.inc
U    packages/cocoaint/src/foundation/NSDate.inc
U    packages/cocoaint/src/foundation/NSDateFormatter.inc
U    packages/cocoaint/src/foundation/NSDecimalNumber.inc
U    packages/cocoaint/src/foundation/NSDictionary.inc
U    packages/cocoaint/src/foundation/NSDistributedLock.inc
U    packages/cocoaint/src/foundation/NSDistributedNotificationCenter.inc
U    packages/cocoaint/src/foundation/NSError.inc
U    packages/cocoaint/src/foundation/NSFileHandle.inc
U    packages/cocoaint/src/foundation/NSFileManager.inc
U    packages/cocoaint/src/foundation/NSFormatter.inc
U    packages/cocoaint/src/foundation/NSGarbageCollector.inc
U    packages/cocoaint/src/foundation/NSGeometry.inc
U    packages/cocoaint/src/foundation/NSHTTPCookie.inc
U    packages/cocoaint/src/foundation/NSHashTable.inc
U    packages/cocoaint/src/foundation/NSHost.inc
U    packages/cocoaint/src/foundation/NSIndexSet.inc
U    packages/cocoaint/src/foundation/NSInvocation.inc
U    packages/cocoaint/src/foundation/NSKeyValueCoding.inc
U    packages/cocoaint/src/foundation/NSKeyValueObserving.inc
U    packages/cocoaint/src/foundation/NSKeyedArchiver.inc
U    packages/cocoaint/src/foundation/NSLock.inc
U    packages/cocoaint/src/foundation/NSMapTable.inc
U    packages/cocoaint/src/foundation/NSMetadata.inc
U    packages/cocoaint/src/foundation/NSMethodSignature.inc
U    packages/cocoaint/src/foundation/NSNetServices.inc
U    packages/cocoaint/src/foundation/NSNumberFormatter.inc
U    packages/cocoaint/src/foundation/NSObject.inc
U    packages/cocoaint/src/foundation/NSOperation.inc
U    packages/cocoaint/src/foundation/NSPathUtilities.inc
U    packages/cocoaint/src/foundation/NSPointerFunctions.inc
U    packages/cocoaint/src/foundation/NSPort.inc
U    packages/cocoaint/src/foundation/NSPortCoder.inc
U    packages/cocoaint/src/foundation/NSPortMessage.inc
U    packages/cocoaint/src/foundation/NSPortNameServer.inc
U    packages/cocoaint/src/foundation/NSPredicate.inc
U    packages/cocoaint/src/foundation/NSPropertyList.inc
U    packages/cocoaint/src/foundation/NSProxy.inc
U    packages/cocoaint/src/foundation/NSRunLoop.inc
U    packages/cocoaint/src/foundation/NSScanner.inc
U    packages/cocoaint/src/foundation/NSScriptClassDescription.inc
U    packages/cocoaint/src/foundation/NSScriptCommand.inc
U    packages/cocoaint/src/foundation/NSScriptCommandDescription.inc
U    packages/cocoaint/src/foundation/NSScriptObjectSpecifiers.inc
U    packages/cocoaint/src/foundation/NSScriptSuiteRegistry.inc
U    packages/cocoaint/src/foundation/NSScriptWhoseTests.inc
U    packages/cocoaint/src/foundation/NSSet.inc
U    packages/cocoaint/src/foundation/NSSortDescriptor.inc
U    packages/cocoaint/src/foundation/NSSpellServer.inc
U    packages/cocoaint/src/foundation/NSStream.inc
U    packages/cocoaint/src/foundation/NSString.inc
U    packages/cocoaint/src/foundation/NSTask.inc
U    packages/cocoaint/src/foundation/NSThread.inc
U    packages/cocoaint/src/foundation/NSTimeZone.inc
U    packages/cocoaint/src/foundation/NSTimer.inc
U    packages/cocoaint/src/foundation/NSURL.inc
U    packages/cocoaint/src/foundation/NSURLConnection.inc
U    packages/cocoaint/src/foundation/NSURLCredential.inc
U    packages/cocoaint/src/foundation/NSURLDownload.inc
U    packages/cocoaint/src/foundation/NSURLHandle.inc
U    packages/cocoaint/src/foundation/NSURLProtectionSpace.inc
U    packages/cocoaint/src/foundation/NSURLProtocol.inc
U    packages/cocoaint/src/foundation/NSURLRequest.inc
U    packages/cocoaint/src/foundation/NSUndoManager.inc
U    packages/cocoaint/src/foundation/NSUserDefaults.inc
U    packages/cocoaint/src/foundation/NSValue.inc
U    packages/cocoaint/src/foundation/NSValueTransformer.inc
U    packages/cocoaint/src/foundation/NSXMLDTD.inc
U    packages/cocoaint/src/foundation/NSXMLDTDNode.inc
U    packages/cocoaint/src/foundation/NSXMLDocument.inc
U    packages/cocoaint/src/foundation/NSXMLElement.inc
U    packages/cocoaint/src/foundation/NSXMLNode.inc
U    packages/cocoaint/src/foundation/NSXMLParser.inc
U    packages/cocoaint/src/foundation/NSZone.inc
U    packages/cocoaint/src/quartzcore/CAAnimation.inc
U    packages/cocoaint/src/quartzcore/CACIFilterAdditions.inc
U    packages/cocoaint/src/quartzcore/CAEmitterCell.inc
U    packages/cocoaint/src/quartzcore/CAEmitterLayer.inc
U    packages/cocoaint/src/quartzcore/CALayer.inc
U    packages/cocoaint/src/quartzcore/CAMediaTiming.inc
U    packages/cocoaint/src/quartzcore/CAOpenGLLayer.inc
U    packages/cocoaint/src/quartzcore/CAReplicatorLayer.inc
U    packages/cocoaint/src/quartzcore/CATextLayer.inc
U    packages/cocoaint/src/quartzcore/CATransaction.inc
U    packages/cocoaint/src/quartzcore/CATransform3D.inc
U    packages/cocoaint/src/quartzcore/CIFilterGenerator.inc
U    packages/cocoaint/src/quartzcore/CIFilterShape.inc
U    packages/cocoaint/src/quartzcore/CIImage.inc
U    packages/cocoaint/src/quartzcore/CIPlugIn.inc
U    packages/cocoaint/src/quartzcore/CIPlugInInterface.inc
U    packages/cocoaint/src/webkit/DOMAttr.inc
U    packages/cocoaint/src/webkit/DOMCSSStyleDeclaration.inc
U    packages/cocoaint/src/webkit/DOMDocument.inc
U    packages/cocoaint/src/webkit/DOMElement.inc
U    packages/cocoaint/src/webkit/DOMEvent.inc
U    packages/cocoaint/src/webkit/DOMEventTarget.inc
U    packages/cocoaint/src/webkit/DOMHTMLAreaElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLButtonElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLDListElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLDirectoryElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLDocument.inc
U    packages/cocoaint/src/webkit/DOMHTMLElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLFrameElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLHRElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLImageElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLInputElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLLinkElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLMenuElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLOListElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLObjectElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLOptGroupElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLOptionElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLPreElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLScriptElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLSelectElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLStyleElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLTableCellElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLTextAreaElement.inc
U    packages/cocoaint/src/webkit/DOMHTMLUListElement.inc
U    packages/cocoaint/src/webkit/DOMImplementation.inc
U    packages/cocoaint/src/webkit/DOMKeyboardEvent.inc
U    packages/cocoaint/src/webkit/DOMMouseEvent.inc
U    packages/cocoaint/src/webkit/DOMMutationEvent.inc
U    packages/cocoaint/src/webkit/DOMNode.inc
U    packages/cocoaint/src/webkit/DOMNodeIterator.inc
U    packages/cocoaint/src/webkit/DOMOverflowEvent.inc
U    packages/cocoaint/src/webkit/DOMProgressEvent.inc
U    packages/cocoaint/src/webkit/DOMRange.inc
U    packages/cocoaint/src/webkit/DOMStyleSheet.inc
U    packages/cocoaint/src/webkit/DOMTreeWalker.inc
U    packages/cocoaint/src/webkit/DOMUIEvent.inc
U    packages/cocoaint/src/webkit/DOMWheelEvent.inc
U    packages/cocoaint/src/webkit/DOMXPathResult.inc
U    packages/cocoaint/src/webkit/WebBackForwardList.inc
U    packages/cocoaint/src/webkit/WebDataSource.inc
U    packages/cocoaint/src/webkit/WebDocument.inc
U    packages/cocoaint/src/webkit/WebEditingDelegate.inc
U    packages/cocoaint/src/webkit/WebFrameView.inc
U    packages/cocoaint/src/webkit/WebHistory.inc
U    packages/cocoaint/src/webkit/WebPlugin.inc
U    packages/cocoaint/src/webkit/WebPreferences.inc
U    packages/cocoaint/src/webkit/WebScriptObject.inc
U    packages/cocoaint/src/webkit/WebUIDelegate.inc
U    packages/cocoaint/src/webkit/WebView.inc
U    rtl/inc/objc1.inc
U    rtl/inc/objcbase.pp
U    rtl/inc/objcnf.inc
--- Recording mergeinfo for merge of r42483 into '.':
 U   .

git-svn-id: branches/fixes_3_2@42484 -
2019-07-23 09:18:13 +00:00