* arm: Support for the kuser_memory_barrier kernel function for memory barriers.
........
* arm-android: Use kuser_memory_barrier by default.
........
git-svn-id: branches/fixes_3_0@33441 -
* arm-android: PIC compatible library startup code.
........
* ARM assembler routines are PIC compatible now.
........
* arm-android: Enable PIC by default.
........
* arm-android: Do not use register r4, since it must be preserved. Use r3 instead.
........
* i386-android: Library startup code is PIC compatible.
........
* Added a comment.
........
* android: Simply jump to the libc exit().
........
* Enable PIC by default for i386-android.
........
* arm-android: Simplified _haltproc for dll.
........
* android: Generate PIC executables. It is required for Android 5.0+.
........
* arm-android: Use PIC in the program start-up code.
........
* android: Fixed crash when using writeln during shared library finalization on Android 4.4+.
........
* i386-android: Use PIC in the program start-up code.
........
git-svn-id: branches/fixes_3_0@33440 -
* Keep the GOT offset in a virtual register for i386 non-darwin platforms.
It fixes PIC code generation with GOT for i386 with enabled optimizations. Bugs #28667, #28668.
Prior the fix I have not been able to compile even RTL with -O2 due to not enough free registers, since EBX is reserved for GOT.
It can be further optimized to teach register allocator to not spill the GOT register if possible.
........
* Fixed i386 case jump table when PIC with GOT and an external assembler is used.
........
* Fixed calling of external procs for i386 non-darwin targets when PIC is enabled.
........
git-svn-id: branches/fixes_3_0@33439 -
* Big fix for ARM GOT support to make it work:
- Fixed access to symbols with offset.
- Always use register R9 for GOT pointer to prevent bugs when free register limit is reached in a function.
- GOT is not needed for function calls by name.
........
* Fixed instruction re-scheduler for ARM in case of PIC.
........
* ARM: Do not use R9 as a fixed GOT register.
........
* ARM: Fixed GOT init when optimization is off.
........
* ARM: I hope this is a final proper fix for GOT initialization. + Test.
........
* Removed a leftover of my code. It is not needed anymore.
........
git-svn-id: branches/fixes_3_0@33438 -
U packages/winunits-base/src/oleserver.pp
--- Recording mergeinfo for merge of r32822 into '.':
U .
# revisions: 32822
git-svn-id: branches/fixes_3_0@33434 -
U packages/winunits-base/src/typelib.pas
--- Recording mergeinfo for merge of r32821 into '.':
U .
--- Merging r32823 into '.':
G packages/winunits-base/src/typelib.pas
--- Recording mergeinfo for merge of r32823 into '.':
G .
--- Merging r32827 into '.':
G packages/winunits-base/src/typelib.pas
--- Recording mergeinfo for merge of r32827 into '.':
G .
--- Merging r32832 into '.':
G packages/winunits-base/src/typelib.pas
--- Recording mergeinfo for merge of r32832 into '.':
G .
# revisions: 32821,32823,32827,32832
git-svn-id: branches/fixes_3_0@33433 -
U packages/fcl-image/src/freetype.pp
--- Recording mergeinfo for merge of r33361 into '.':
U .
# revisions: 33361
git-svn-id: branches/fixes_3_0@33430 -
C utils/fpcm/fpcmmain.pp
--- Recording mergeinfo for merge of r30250 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 30250
git-svn-id: branches/fixes_3_0@33425 -
U compiler/ncnv.pas
A tests/webtbs/tw28748.pp
--- Recording mergeinfo for merge of r32054 into '.':
U .
--- Merging r33334 into '.':
U compiler/nadd.pas
A tests/webtbs/tw28749.pp
--- Recording mergeinfo for merge of r33334 into '.':
G .
# revisions: 32054,33334
git-svn-id: branches/fixes_3_0@33417 -
U .
--- Merging r32990 into '.':
A tests/webtbs/tw29372.pp
U compiler/ncgcal.pas
--- Recording mergeinfo for merge of r32990 into '.':
U .
--- Merging r33054 into '.':
U compiler/symdef.pas
--- Recording mergeinfo for merge of r33054 into '.':
G .
--- Merging r33110 into '.':
A tests/webtbs/tw29609.pp
U compiler/pexpr.pas
--- Recording mergeinfo for merge of r33110 into '.':
G .
--- Merging r33211 into '.':
U compiler/htypechk.pas
A tests/webtbs/tw29792.pp
--- Recording mergeinfo for merge of r33211 into '.':
G .
--- Merging r33214 into '.':
A tests/webtbs/tw29745.pp
G compiler/symdef.pas
--- Recording mergeinfo for merge of r33214 into '.':
G .
# revisions: 31987,32990,33054,33110,33211,33214
git-svn-id: branches/fixes_3_0@33416 -
U packages/winunits-base/src/activex.pp
--- Recording mergeinfo for merge of r33011 into '.':
U .
--- Merging r33013 into '.':
U packages/winunits-jedi/src/jwanative.pas
--- Recording mergeinfo for merge of r33013 into '.':
G .
# revisions: 33011,33013
git-svn-id: branches/fixes_3_0@33415 -
U compiler/x86_64/x8664ats.inc
U compiler/i386/i386atts.inc
U compiler/x86/x86ins.dat
U compiler/i8086/i8086atts.inc
--- Recording mergeinfo for merge of r32541 into '.':
U .
--- Merging r33076 into '.':
U compiler/x86/itcpugas.pas
U compiler/x86/cpubase.pas
A tests/webtbs/tw29471.pp
--- Recording mergeinfo for merge of r33076 into '.':
G .
--- Merging r33208 into '.':
U compiler/x86_64/x8664pro.inc
G compiler/x86/x86ins.dat
U compiler/i386/i386prop.inc
U compiler/i8086/i8086prop.inc
--- Recording mergeinfo for merge of r33208 into '.':
G .
# revisions: 32541,33076,33208
git-svn-id: branches/fixes_3_0@33412 -
U rtl/i386/math.inc
--- Recording mergeinfo for merge of r33131 into '.':
U .
--- Merging r33205 into '.':
U rtl/x86_64/math.inc
--- Recording mergeinfo for merge of r33205 into '.':
G .
# revisions: 33131,33205
git-svn-id: branches/fixes_3_0@33411 -
U rtl/win64/seh64.inc
--- Recording mergeinfo for merge of r29678 into '.':
U .
--- Merging r29692 into '.':
U rtl/inc/system.inc
U rtl/win64/system.pp
G rtl/win64/seh64.inc
--- Recording mergeinfo for merge of r29692 into '.':
G .
--- Merging r29713 into '.':
U rtl/inc/systemh.inc
G rtl/inc/system.inc
U rtl/inc/heaptrc.pp
--- Recording mergeinfo for merge of r29713 into '.':
G .
--- Merging r29733 into '.':
G rtl/inc/system.inc
--- Recording mergeinfo for merge of r29733 into '.':
G .
--- Merging r29739 into '.':
G rtl/inc/system.inc
--- Recording mergeinfo for merge of r29739 into '.':
G .
# revisions: 29678,29692,29713,29733,29739
------------------------------------------------------------------------
r29678 | sergei | 2015-02-13 06:02:20 +0100 (vr, 13 feb 2015) | 2 lines
Changed paths:
M /trunk/rtl/win64/seh64.inc
* Win64 SEH: don't call RunError in exception handler, because it always prints backtrace from caller's context. Instead, print the correct backtrace explicitly.
------------------------------------------------------------------------
------------------------------------------------------------------------
r29692 | sergei | 2015-02-14 12:41:33 +0100 (za, 14 feb 2015) | 1 line
Changed paths:
M /trunk/rtl/inc/system.inc
M /trunk/rtl/win64/seh64.inc
M /trunk/rtl/win64/system.pp
* Win64: Use separate implementation of CaptureBacktrace that calls RtlCaptureStackBackTrace. This way it does not require non-optimized code to work correctly.
------------------------------------------------------------------------
------------------------------------------------------------------------
r29713 | sergei | 2015-02-15 21:00:24 +0100 (zo, 15 feb 2015) | 2 lines
Changed paths:
M /trunk/rtl/inc/heaptrc.pp
M /trunk/rtl/inc/system.inc
M /trunk/rtl/inc/systemh.inc
+ Overloaded procedure dump_stack that calls CaptureBacktrace, thus encapsulating internals of stack traversing.
* Use this new procedure in heaptrc unit.
------------------------------------------------------------------------
------------------------------------------------------------------------
r29733 | sergei | 2015-02-16 23:05:54 +0100 (ma, 16 feb 2015) | 7 lines
Changed paths:
M /trunk/rtl/inc/system.inc
* Finalize units after printing the runtime error message. Rationale:
* Unit finalization executes arbitrarily large amount of code. Doing it when error occurred can cause
other errors, overwriting the original error information.
* Code that prints error message depends on everything and a kitchen sink (most notably, Unicode manager
and lineinfo unit). Running it after finalizing units can be successful only by coincidence.
* Last but not least, this sequence (ExitProc -> print RTE -> finalize units) is same as one used in Delphi.
------------------------------------------------------------------------
------------------------------------------------------------------------
r29739 | pierre | 2015-02-17 08:35:31 +0100 (di, 17 feb 2015) | 1 line
Changed paths:
M /trunk/rtl/inc/system.inc
Revert aligntoptr to RTTIAlign rename
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_0@33410 -
U packages/fcl-xml/src/sax_html.pp
--- Recording mergeinfo for merge of r31773 into '.':
U .
--- Merging r33040 into '.':
U packages/fcl-xml/src/xmltextreader.pp
--- Recording mergeinfo for merge of r33040 into '.':
G .
--- Merging r33042 into '.':
U packages/fcl-xml/src/dtdmodel.pp
--- Recording mergeinfo for merge of r33042 into '.':
G .
# revisions: 31773,33040,33042
------------------------------------------------------------------------
r31773 | sergei | 2015-09-22 07:37:39 +0200 (di, 22 sep 2015) | 3 lines
Changed paths:
M /trunk/packages/fcl-xml/src/sax_html.pp
- THTMLToDOMConverter.FElementStack is created and destroyed, but unused otherwise. Removed.
* THTMLToDOMConverter.ReaderEndElement: Since each item in FNodeBuffer is removed only when processing EndElement event for its *parent* element (not the element it corresponds to, if any), it must be flagged for ignore once its own EndElement is handled. Otherwise, several same-named elements nested within each other were ending up in a wrong DOM tree. This bug was reported in Russian forum.
------------------------------------------------------------------------
------------------------------------------------------------------------
r33040 | sergei | 2016-02-02 03:27:28 +0100 (di, 02 feb 2016) | 2 lines
Changed paths:
M /trunk/packages/fcl-xml/src/xmltextreader.pp
* fcl-xml: Fixed parsing DTD, whitespace after name is mandatory only if followed by ExternalID. Mantis #29569.
------------------------------------------------------------------------
------------------------------------------------------------------------
r33042 | sergei | 2016-02-02 18:17:08 +0100 (di, 02 feb 2016) | 1 line
Changed paths:
M /trunk/packages/fcl-xml/src/dtdmodel.pp
* fcl-xml: fixed off-by-one error, preventing 'xmlns:foo' in DTD ATTLIST from being recognized as namespace declaration.
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_0@33409 -
U compiler/generic/symcpu.pas
U compiler/arm/symcpu.pas
U compiler/symtable.pas
U compiler/ia64/symcpu.pas
U compiler/m68k/symcpu.pas
U compiler/powerpc64/symcpu.pas
U compiler/symconst.pas
U compiler/mips/symcpu.pas
U compiler/x86_64/symcpu.pas
U compiler/i8086/symcpu.pas
U compiler/powerpc/symcpu.pas
U compiler/avr/symcpu.pas
U compiler/symsym.pas
U compiler/i386/symcpu.pas
U compiler/alpha/symcpu.pas
U compiler/jvm/symcpu.pas
U compiler/sparc/symcpu.pas
U compiler/pmodules.pas
U compiler/aarch64/symcpu.pas
U rtl/inc/text.inc
--- Recording mergeinfo for merge of r30757 into '.':
U .
# revisions: 30757
------------------------------------------------------------------------
r30757 | florian | 2015-05-01 22:58:31 +0200 (vr, 01 mei 2015) | 3 lines
Changed paths:
M /trunk/compiler/aarch64/symcpu.pas
M /trunk/compiler/alpha/symcpu.pas
M /trunk/compiler/arm/symcpu.pas
M /trunk/compiler/avr/symcpu.pas
M /trunk/compiler/generic/symcpu.pas
M /trunk/compiler/i386/symcpu.pas
M /trunk/compiler/i8086/symcpu.pas
M /trunk/compiler/ia64/symcpu.pas
M /trunk/compiler/jvm/symcpu.pas
M /trunk/compiler/m68k/symcpu.pas
M /trunk/compiler/mips/symcpu.pas
M /trunk/compiler/pmodules.pas
M /trunk/compiler/powerpc/symcpu.pas
M /trunk/compiler/powerpc64/symcpu.pas
M /trunk/compiler/sparc/symcpu.pas
M /trunk/compiler/symconst.pas
M /trunk/compiler/symsym.pas
M /trunk/compiler/symtable.pas
M /trunk/compiler/x86_64/symcpu.pas
M /trunk/rtl/inc/text.inc
o fixes handling of iso i/o parameters/program parameters:
* explicit reset is needed
* variable must be declared again
------------------------------------------------------------------------
git-svn-id: branches/fixes_3_0@33408 -
U compiler/arm/rgcpu.pas
U compiler/arm/cpuinfo.pas
--- Recording mergeinfo for merge of r30276 into '.':
U .
# revisions: 30276
git-svn-id: branches/fixes_3_0@33407 -
U packages/rtl-console/src/unix/mouse.pp
U packages/rtl-console/src/unix/keyboard.pp
--- Recording mergeinfo for merge of r29773 into '.':
U .
--- Merging r29774 into '.':
G packages/rtl-console/src/unix/keyboard.pp
--- Recording mergeinfo for merge of r29774 into '.':
G .
--- Merging r29775 into '.':
G packages/rtl-console/src/unix/keyboard.pp
--- Recording mergeinfo for merge of r29775 into '.':
G .
--- Merging r29778 into '.':
G packages/rtl-console/src/unix/mouse.pp
--- Recording mergeinfo for merge of r29778 into '.':
G .
# revisions: 29773,29774,29775,29778
git-svn-id: branches/fixes_3_0@33404 -
U rtl/objpas/fgl.pp
--- Recording mergeinfo for merge of r31381 into '.':
U .
--- Merging r32942 into '.':
G rtl/objpas/fgl.pp
--- Recording mergeinfo for merge of r32942 into '.':
G .
--- Merging r32947 into '.':
G rtl/objpas/fgl.pp
--- Recording mergeinfo for merge of r32947 into '.':
G .
--- Merging r32959 into '.':
G rtl/objpas/fgl.pp
--- Recording mergeinfo for merge of r32959 into '.':
G .
--- Merging r32987 into '.':
G rtl/objpas/fgl.pp
--- Recording mergeinfo for merge of r32987 into '.':
G .
--- Merging r33098 into '.':
U packages/fcl-stl/src/garrayutils.pp
--- Recording mergeinfo for merge of r33098 into '.':
G .
--- Merging r33311 into '.':
U packages/fcl-stl/fpmake.pp
A packages/fcl-stl/tests/glinkedlisttest.pp
A packages/fcl-stl/src/glinkedlist.pp
--- Recording mergeinfo for merge of r33311 into '.':
G .
--- Merging r33341 into '.':
U packages/fcl-stl/src/ghashmap.pp
--- Recording mergeinfo for merge of r33341 into '.':
G .
# revisions: 31381,32942,32947,32959,32987,33098,33311,33341
git-svn-id: branches/fixes_3_0@33403 -
U .
--- Recording mergeinfo for merge of r29429 into '.':
U .
--- Recording mergeinfo for merge of r31463 into '.':
U .
--- Merging r32084 into '.':
U utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32084 into '.':
U .
--- Merging r32539 into '.':
U utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32539 into '.':
G .
--- Merging r32560 into '.':
G utils/pas2jni/ppuparser.pas
G utils/pas2jni/writer.pas
U utils/pas2jni/def.pas
--- Recording mergeinfo for merge of r32560 into '.':
G .
--- Merging r32561 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32561 into '.':
G .
--- Merging r32563 into '.':
G utils/pas2jni/writer.pas
G utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32563 into '.':
G .
--- Merging r32578 into '.':
G utils/pas2jni/writer.pas
G utils/pas2jni/def.pas
G utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32578 into '.':
G .
--- Merging r32607 into '.':
G utils/pas2jni/writer.pas
G utils/pas2jni/def.pas
G utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32607 into '.':
G .
--- Merging r32609 into '.':
G utils/pas2jni/writer.pas
G utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32609 into '.':
G .
--- Merging r32611 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32611 into '.':
G .
--- Merging r32612 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32612 into '.':
G .
--- Merging r32615 into '.':
G utils/pas2jni/writer.pas
G utils/pas2jni/def.pas
G utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32615 into '.':
G .
--- Merging r32616 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32616 into '.':
G .
--- Merging r32620 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32620 into '.':
G .
--- Merging r32669 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32669 into '.':
G .
--- Merging r32733 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r32733 into '.':
G .
--- Merging r32744 into '.':
G utils/pas2jni/ppuparser.pas
U utils/pas2jni/pas2jni.pas
--- Recording mergeinfo for merge of r32744 into '.':
G .
--- Merging r32747 into '.':
G utils/pas2jni/ppuparser.pas
--- Recording mergeinfo for merge of r32747 into '.':
G .
--- Merging r33005 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r33005 into '.':
G .
--- Merging r33072 into '.':
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r33072 into '.':
G .
--- Merging r33083 into '.':
G utils/pas2jni/def.pas
G utils/pas2jni/writer.pas
--- Recording mergeinfo for merge of r33083 into '.':
G .
# revisions: 29419,29429,31463,32084,32539,32560,32561,32563,32578,32607,32609,32611,32612,32615,32616,32620,32669,32733,32744,32747,33005,33072,33083
git-svn-id: branches/fixes_3_0@33400 -
U packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r33397 into '.':
U .
# revisions: 33397
git-svn-id: branches/fixes_3_0@33399 -
A packages/fcl-base/src/advancedipc.pp
U packages/fcl-base/fpmake.pp
--- Recording mergeinfo for merge of r31885 into '.':
U .
--- Merging r31890 into '.':
U packages/fcl-base/src/advancedipc.pp
--- Recording mergeinfo for merge of r31890 into '.':
G .
--- Merging r31925 into '.':
G packages/fcl-base/src/advancedipc.pp
--- Recording mergeinfo for merge of r31925 into '.':
G .
--- Merging r31939 into '.':
A packages/fcl-base/examples/testipc_client.pp
A packages/fcl-base/examples/testipc_server.pp
--- Recording mergeinfo for merge of r31939 into '.':
G .
--- Merging r31940 into '.':
G packages/fcl-base/src/advancedipc.pp
--- Recording mergeinfo for merge of r31940 into '.':
G .
--- Merging r31955 into '.':
G packages/fcl-base/src/advancedipc.pp
--- Recording mergeinfo for merge of r31955 into '.':
G .
--- Merging r32287 into '.':
A packages/fcl-base/examples/sitest.pp
G packages/fcl-base/fpmake.pp
A packages/fcl-base/src/singleinstance.pp
U packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32287 into '.':
G .
--- Merging r32288 into '.':
G packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32288 into '.':
G .
--- Merging r32289 into '.':
G packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32289 into '.':
G .
--- Merging r32291 into '.':
G packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32291 into '.':
G .
--- Merging r32321 into '.':
U packages/fcl-base/src/contnrs.pp
--- Recording mergeinfo for merge of r32321 into '.':
G .
--- Merging r32767 into '.':
G packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r32767 into '.':
G .
--- Merging r32770 into '.':
G packages/fcl-base/src/custapp.pp
G packages/fcl-base/src/advancedipc.pp
U packages/fcl-base/src/singleinstance.pp
U packages/fcl-base/examples/sitest.pp
--- Recording mergeinfo for merge of r32770 into '.':
G .
--- Merging r32772 into '.':
G packages/fcl-base/fpmake.pp
--- Recording mergeinfo for merge of r32772 into '.':
G .
--- Merging r32773 into '.':
G packages/fcl-base/fpmake.pp
--- Recording mergeinfo for merge of r32773 into '.':
G .
--- Merging r33052 into '.':
G packages/fcl-base/src/custapp.pp
--- Recording mergeinfo for merge of r33052 into '.':
G .
# revisions: 31885,31890,31925,31939,31940,31955,32287,32288,32289,32291,32321,32767,32770,32772,32773,33052
git-svn-id: branches/fixes_3_0@33398 -
U packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31291 into '.':
U .
--- Merging r31292 into '.':
U packages/fcl-json/src/jsonscanner.pp
U packages/fcl-json/src/jsonparser.pp
U packages/fcl-json/tests/testjson.lpi
U packages/fcl-json/tests/testjsonconf.lpi
U packages/fcl-json/tests/testjsonparser.pp
--- Recording mergeinfo for merge of r31292 into '.':
G .
--- Merging r31293 into '.':
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31293 into '.':
G .
--- Merging r31435 into '.':
U packages/fcl-json/tests/jsonconftest.pp
U packages/fcl-json/tests/testjsonconf.pp
U packages/fcl-json/src/fpjson.pp
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31435 into '.':
G .
--- Merging r31436 into '.':
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r31436 into '.':
G .
--- Merging r32001 into '.':
G packages/fcl-json/src/jsonscanner.pp
--- Recording mergeinfo for merge of r32001 into '.':
G .
--- Merging r32349 into '.':
U packages/fcl-web/src/base/fphttpserver.pp
--- Recording mergeinfo for merge of r32349 into '.':
G .
--- Merging r32350 into '.':
U packages/fcl-web/src/base/custcgi.pp
--- Recording mergeinfo for merge of r32350 into '.':
G .
--- Merging r32724 into '.':
U packages/fcl-web/src/base/custfcgi.pp
--- Recording mergeinfo for merge of r32724 into '.':
G .
--- Merging r32731 into '.':
G packages/fcl-web/src/base/custfcgi.pp
--- Recording mergeinfo for merge of r32731 into '.':
G .
--- Merging r32762 into '.':
U packages/fcl-json/src/fpjsonrtti.pp
--- Recording mergeinfo for merge of r32762 into '.':
G .
--- Merging r32774 into '.':
G packages/fcl-json/src/fpjson.pp
G packages/fcl-json/src/jsonconf.pp
G packages/fcl-json/src/fpjsonrtti.pp
G packages/fcl-json/src/jsonscanner.pp
G packages/fcl-json/src/jsonparser.pp
G packages/fcl-json/tests/testjsonparser.pp
G packages/fcl-json/tests/testjson.lpi
G packages/fcl-json/tests/jsonconftest.pp
--- Recording mergeinfo for merge of r32774 into '.':
G .
--- Merging r32875 into '.':
G packages/fcl-json/src/jsonscanner.pp
G packages/fcl-json/src/jsonparser.pp
G packages/fcl-json/tests/testjsonparser.pp
--- Recording mergeinfo for merge of r32875 into '.':
G .
--- Merging r32876 into '.':
U packages/fcl-json/tests/testjsonrtti.pp
G packages/fcl-json/tests/testjson.lpi
A packages/fcl-json/tests/testcomps.pp
U packages/fcl-json/tests/testjson.pp
G packages/fcl-json/src/fpjsonrtti.pp
--- Recording mergeinfo for merge of r32876 into '.':
G .
--- Merging r32943 into '.':
A packages/fcl-web/src/base/custapache24.pp
U packages/fcl-web/src/base/fpapache.pp
A packages/fcl-web/src/base/custapache.pp
U packages/fcl-web/src/base/fpapache24.pp
U packages/fcl-web/fpmake.pp
--- Recording mergeinfo for merge of r32943 into '.':
G .
--- Merging r32944 into '.':
G packages/fcl-web/fpmake.pp
--- Recording mergeinfo for merge of r32944 into '.':
G .
--- Merging r33032 into '.':
U packages/fcl-web/src/base/httpdefs.pp
--- Recording mergeinfo for merge of r33032 into '.':
G .
--- Merging r33124 into '.':
G packages/fcl-json/src/jsonconf.pp
--- Recording mergeinfo for merge of r33124 into '.':
G .
--- Merging r33168 into '.':
U packages/fcl-web/src/base/fphttpclient.pp
--- Recording mergeinfo for merge of r33168 into '.':
G .
--- Merging r33293 into '.':
U packages/fcl-web/src/base/restbase.pp
--- Recording mergeinfo for merge of r33293 into '.':
G .
--- Merging r33310 into '.':
U packages/fcl-json/tests/testjsondata.pp
G packages/fcl-json/src/fpjson.pp
--- Recording mergeinfo for merge of r33310 into '.':
G .
--- Merging r33364 into '.':
G packages/fcl-web/src/base/fphttpserver.pp
--- Recording mergeinfo for merge of r33364 into '.':
G .
# revisions: 31291,31292,31293,31435,31436,32001,32349,32350,32724,32731,32762,32774,32875,32876,32943,32944,33032,33124,33168,33293,33310,33364
git-svn-id: branches/fixes_3_0@33396 -
U packages/fcl-net/src/cnetdb.pp
U packages/fcl-net/fpmake.pp
--- Recording mergeinfo for merge of r32726 into '.':
U .
--- Merging r33094 into '.':
U packages/fcl-net/src/ssockets.pp
--- Recording mergeinfo for merge of r33094 into '.':
G .
--- Merging r33166 into '.':
G packages/fcl-net/src/ssockets.pp
--- Recording mergeinfo for merge of r33166 into '.':
G .
--- Merging r33332 into '.':
G packages/fcl-net/src/cnetdb.pp
--- Recording mergeinfo for merge of r33332 into '.':
G .
# revisions: 32726,33094,33166,33332
git-svn-id: branches/fixes_3_0@33395 -
U rtl/haiku/sysos.inc
U rtl/bsd/sysos.inc
U rtl/solaris/sysos.inc
U rtl/linux/sysos.inc
--- Recording mergeinfo for merge of r33262 into '.':
U .
--- Merging r33263 into '.':
U rtl/aix/sysos.inc
--- Recording mergeinfo for merge of r33263 into '.':
G .
--- Merging r33291 into '.':
U packages/fcl-image/src/fpwritebmp.pp
U packages/fcl-image/src/fpreadbmp.pp
--- Recording mergeinfo for merge of r33291 into '.':
G .
--- Merging r33295 into '.':
U packages/librsvg/fpmake.pp
--- Recording mergeinfo for merge of r33295 into '.':
G .
# revisions: 33262,33263,33291,33295
git-svn-id: branches/fixes_3_0@33391 -
U packages/winunits-base/src/richedit.pp
--- Recording mergeinfo for merge of r33315 into '.':
U .
--- Merging r33338 into '.':
G packages/winunits-base/src/richedit.pp
--- Recording mergeinfo for merge of r33338 into '.':
G .
# revisions: 33315,33338
git-svn-id: branches/fixes_3_0@33390 -
U rtl/inc/systemh.inc
--- Recording mergeinfo for merge of r32257 into '.':
U .
--- Merging r32258 into '.':
U packages/rtl-extra/src/unix/sockets.pp
U packages/rtl-extra/src/win/sockets.pp
U packages/rtl-extra/src/os2commn/sockets.pp
--- Recording mergeinfo for merge of r32258 into '.':
G .
# revisions: 32257,32258
git-svn-id: branches/fixes_3_0@33389 -
U packages/rtl-extra/src/inc/socketsh.inc
--- Recording mergeinfo for merge of r31452 into '.':
U .
# revisions: 31452
git-svn-id: branches/fixes_3_0@33388 -
U packages/winunits-base/src/activex.pp
--- Recording mergeinfo for merge of r31283 into '.':
U .
# revisions: 31283
git-svn-id: branches/fixes_3_0@33386 -
U packages/fcl-db/src/sqldb/interbase/fbadmin.pp
--- Recording mergeinfo for merge of r32812 into '.':
U .
--- Merging r32938 into '.':
U packages/fcl-db/src/sqldb/interbase/ibconnection.pp
--- Recording mergeinfo for merge of r32938 into '.':
G .
--- Merging r32941 into '.':
G packages/fcl-db/src/sqldb/interbase/ibconnection.pp
--- Recording mergeinfo for merge of r32941 into '.':
G .
--- Merging r33127 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33127 into '.':
G .
--- Merging r33150 into '.':
U packages/fcl-db/src/base/bufdataset.pas
U packages/fcl-db/tests/testspecifictbufdataset.pas
--- Recording mergeinfo for merge of r33150 into '.':
G .
--- Merging r33169 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
A packages/fcl-db/src/base/sqltypes.pp
U packages/fcl-db/src/datadict/fpddsqldb.pp
U packages/fcl-db/src/datadict/fpdatadict.pp
U packages/fcl-db/fpmake.pp
--- Recording mergeinfo for merge of r33169 into '.':
G .
--- Merging r33172 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r33172 into '.':
G .
--- Merging r33174 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33174 into '.':
G .
# revisions: 32812,32938,32941,33127,33150,33169,33172,33174
git-svn-id: branches/fixes_3_0@33374 -
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r32931 into '.':
U .
--- Merging r32964 into '.':
U packages/fcl-db/src/datadict/fpdatadict.pp
--- Recording mergeinfo for merge of r32964 into '.':
G .
--- Merging r33049 into '.':
U packages/fcl-db/src/base/dsparams.inc
--- Recording mergeinfo for merge of r33049 into '.':
G .
--- Merging r33078 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33078 into '.':
G .
--- Merging r33079 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33079 into '.':
G .
--- Merging r33080 into '.':
U packages/fcl-db/tests/sqldbtoolsunit.pas
--- Recording mergeinfo for merge of r33080 into '.':
G .
--- Merging r33085 into '.':
U packages/fcl-db/src/base/dataset.inc
U packages/fcl-db/src/dbase/dbf.pas
--- Recording mergeinfo for merge of r33085 into '.':
G .
--- Merging r33086 into '.':
U packages/fcl-db/src/dbase/dbf_common.inc
--- Recording mergeinfo for merge of r33086 into '.':
G .
--- Merging r33087 into '.':
U packages/fcl-db/src/datadict/fpddsqldb.pp
--- Recording mergeinfo for merge of r33087 into '.':
G .
# revisions: 32931,32964,33049,33078,33079,33080,33085,33086,33087
git-svn-id: branches/fixes_3_0@33372 -
U packages/fcl-db/fpmake.pp
U packages/fcl-db/src/datadict/fpddregstd.pp
A packages/fcl-db/src/datadict/fpddmssql.pp
U packages/fcl-db/src/datadict/buildd.lpi
--- Recording mergeinfo for merge of r32831 into '.':
U .
--- Merging r32843 into '.':
G packages/fcl-db/fpmake.pp
--- Recording mergeinfo for merge of r32843 into '.':
G .
--- Merging r32851 into '.':
U packages/fcl-db/src/datadict/fpddsqldb.pp
U packages/fcl-db/src/datadict/fpddmssql.pp
--- Recording mergeinfo for merge of r32851 into '.':
G .
--- Merging r32853 into '.':
U packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r32853 into '.':
G .
--- Merging r32854 into '.':
U packages/fcl-db/tests/testdbbasics.pas
--- Recording mergeinfo for merge of r32854 into '.':
G .
# revisions: 32831,32843,32851,32853,32854,3293
git-svn-id: branches/fixes_3_0@33370 -
U packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r32093 into '.':
U .
--- Merging r32131 into '.':
U packages/fcl-db/tests/testdbbasics.pas
U packages/fcl-db/src/base/bufdataset.pas
U packages/fcl-db/src/sdf/sdfdata.pp
U packages/fcl-db/src/memds/memds.pp
--- Recording mergeinfo for merge of r32131 into '.':
G .
--- Merging r32359 into '.':
U packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r32359 into '.':
G .
--- Merging r32558 into '.':
U packages/fcl-db/src/base/bufdataset_parser.pp
--- Recording mergeinfo for merge of r32558 into '.':
G .
--- Merging r32566 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r32566 into '.':
G .
--- Merging r32729 into '.':
U packages/fcl-db/src/sqldb/postgres/pqconnection.pp
--- Recording mergeinfo for merge of r32729 into '.':
G .
--- Merging r32753 into '.':
U packages/fcl-db/src/sqlite/sqliteds.pas
U packages/fcl-db/src/sqlite/sqlite3ds.pas
--- Recording mergeinfo for merge of r32753 into '.':
G .
--- Merging r32754 into '.':
G packages/fcl-db/src/sqlite/sqlite3ds.pas
--- Recording mergeinfo for merge of r32754 into '.':
G .
--- Merging r32755 into '.':
G packages/fcl-db/src/sqlite/sqliteds.pas
--- Recording mergeinfo for merge of r32755 into '.':
G .
--- Merging r32796 into '.':
U packages/fcl-db/src/base/dataset.inc
--- Recording mergeinfo for merge of r32796 into '.':
G .
--- Merging r32800 into '.':
U packages/fcl-db/src/base/sqlscript.pp
--- Recording mergeinfo for merge of r32800 into '.':
G .
--- Merging r32801 into '.':
U packages/fcl-db/tests/dbtestframework.pas
U packages/fcl-db/tests/testsqlscript.pas
--- Recording mergeinfo for merge of r32801 into '.':
G .
--- Merging r32807 into '.':
G packages/fcl-db/src/base/bufdataset.pas
--- Recording mergeinfo for merge of r32807 into '.':
G .
--- Merging r32808 into '.':
U packages/fcl-db/src/sqldb/mysql/mysqlconn.inc
--- Recording mergeinfo for merge of r32808 into '.':
G .
--- Merging r32810 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r32810 into '.':
G .
# revisions: 32093,32131,32359,32558,32566,32729,32753,32754,32755,32796,32800,32801,32807,32808,32810
git-svn-id: branches/fixes_3_0@33368 -
U packages/fcl-db/src/sqlite/customsqliteds.pas
U packages/fcl-db/src/sqlite/sqlite3ds.pas
--- Recording mergeinfo for merge of r31837 into '.':
U .
--- Merging r31838 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31838 into '.':
G .
--- Merging r31839 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31839 into '.':
G .
--- Merging r31840 into '.':
U packages/fcl-db/src/sqlite/sqliteds.pas
--- Recording mergeinfo for merge of r31840 into '.':
G .
--- Merging r31841 into '.':
U packages/fcl-db/src/sqlite/fillds.pas
U packages/fcl-db/src/sqlite/concurrencyds.pas
U packages/fcl-db/src/sqlite/testds.pas
U packages/fcl-db/src/sqlite/browseds.pas
U packages/fcl-db/src/sqlite/createds.pas
--- Recording mergeinfo for merge of r31841 into '.':
G .
--- Merging r31844 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31844 into '.':
G .
--- Merging r31845 into '.':
G packages/fcl-db/src/sqlite/fillds.pas
--- Recording mergeinfo for merge of r31845 into '.':
G .
--- Merging r31853 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
G packages/fcl-db/src/sqlite/sqlite3ds.pas
--- Recording mergeinfo for merge of r31853 into '.':
G .
--- Merging r31876 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31876 into '.':
G .
--- Merging r31877 into '.':
G packages/fcl-db/src/sqlite/customsqliteds.pas
--- Recording mergeinfo for merge of r31877 into '.':
G .
--- Merging r32034 into '.':
U packages/fcl-db/src/sqldb/sqlite/sqlite3conn.pp
--- Recording mergeinfo for merge of r32034 into '.':
G .
# revisions: 31837,31838,31839,31840,31841,31844,31845,31853,31876,31877,32034
git-svn-id: branches/fixes_3_0@33367 -
A packages/mysql/examples/testdb5.pp
C packages/mysql/examples/Makefile
U packages/mysql/examples/Makefile.fpc
--- Recording mergeinfo for merge of r31310 into '.':
U .
Summary of conflicts:
Text conflicts: 1
# revisions: 31310
git-svn-id: branches/fixes_3_0@33366 -
U packages/gmp/src/gmp.pas
--- Recording mergeinfo for merge of r32449 into '.':
U .
--- Merging r32452 into '.':
U packages/winunits-base/src/shlobj.pp
--- Recording mergeinfo for merge of r32452 into '.':
G .
--- Merging r32490 into '.':
U packages/paszlib/src/gzio.pas
--- Recording mergeinfo for merge of r32490 into '.':
G .
# revisions: 32449,32452,32490
git-svn-id: branches/fixes_3_0@33365 -
U packages/fcl-process/src/unix/process.inc
--- Recording mergeinfo for merge of r32254 into '.':
U .
# revisions: 32254
git-svn-id: branches/fixes_3_0@33358 -
U packages/fcl-db/src/datadict/fpdatadict.pp
--- Recording mergeinfo for merge of r32850 into '.':
U .
--- Merging r32963 into '.':
G packages/fcl-db/src/datadict/fpdatadict.pp
--- Recording mergeinfo for merge of r32963 into '.':
G .
# revisions: 32850,32963
git-svn-id: branches/fixes_3_0@33357 -
