U packages/hash/src/md5.pp
--- Recording mergeinfo for merge of r32795 into '.':
U .
--- Merging r32804 into '.':
U packages/openssl/src/openssl.pas
--- Recording mergeinfo for merge of r32804 into '.':
G .
--- Merging r32805 into '.':
U packages/openssl/examples/test1.pas
--- Recording mergeinfo for merge of r32805 into '.':
G .
--- Merging r32806 into '.':
U packages/fcl-fpcunit/src/demo/consolerunner/testrunner.pp
U packages/fcl-fpcunit/src/fpcunit.pp
--- Recording mergeinfo for merge of r32806 into '.':
G .
--- Merging r32809 into '.':
U utils/fpdoc/fpdoc.pp
--- Recording mergeinfo for merge of r32809 into '.':
G .
--- Merging r32814 into '.':
U packages/rtl-unicode/src/collations/collation_zh_be.inc
U packages/rtl-unicode/src/collations/collation_es_le.inc
U packages/rtl-unicode/src/collations/collation_ko_le.inc
U packages/rtl-unicode/src/collations/collation_zh.pas
U packages/rtl-unicode/src/collations/collation_ru_be.inc
U packages/rtl-unicode/src/collations/collation_sv_be.inc
U packages/rtl-unicode/src/collations/collation_ja_be.inc
U packages/rtl-unicode/src/collations/collation_ru.pas
U packages/rtl-unicode/src/collations/collation_zh_le.inc
U packages/rtl-unicode/src/collations/collation_de.pas
U packages/rtl-unicode/src/collations/collation_sv.pas
U packages/rtl-unicode/src/collations/collation_ja.pas
U packages/rtl-unicode/src/collations/collation_ru_le.inc
U packages/rtl-unicode/src/collations/collation_sv_le.inc
U packages/rtl-unicode/src/collations/collation_ja_le.inc
U packages/rtl-unicode/src/collations/collation_es_be.inc
U packages/rtl-unicode/src/collations/collation_ko_be.inc
U packages/rtl-unicode/src/collations/collation_es.pas
U packages/rtl-unicode/src/collations/collation_ko.pas
U packages/rtl-unicode/src/collations/collation_fr_ca.pas
U packages/rtl-unicode/src/inc/ucadata.inc
U packages/rtl-unicode/src/inc/ucadata_le.inc
U packages/rtl-unicode/src/inc/ucadata_be.inc
--- Recording mergeinfo for merge of r32814 into '.':
G .
--- Merging r32820 into '.':
U packages/winunits-jedi/src/jwaactivex.pas
U rtl/objpas/types.pp
U rtl/objpas/classes/classesh.inc
U rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r32820 into '.':
G .
--- Merging r32826 into '.':
U packages/fcl-process/src/process.pp
--- Recording mergeinfo for merge of r32826 into '.':
G .
--- Merging r32860 into '.':
U packages/paszlib/examples/miniunz.pas
--- Recording mergeinfo for merge of r32860 into '.':
G .
--- Merging r32861 into '.':
U packages/paszlib/src/zipper.pp
--- Recording mergeinfo for merge of r32861 into '.':
G .
--- Merging r32862 into '.':
A packages/paszlib/examples/fpzipper.lpi
A packages/paszlib/examples/fpunzipper.lpi
A packages/paszlib/examples/fpzipper.lpr
A packages/paszlib/examples/fpunzipper.lpr
--- Recording mergeinfo for merge of r32862 into '.':
G .
--- Merging r32868 into '.':
U packages/fcl-fpcunit/src/consoletestrunner.pas
--- Recording mergeinfo for merge of r32868 into '.':
G .
--- Merging r32891 into '.':
A packages/fcl-process/examples
A packages/fcl-process/examples/demoproject.ico
A packages/fcl-process/examples/demoproject.pp
A packages/fcl-process/examples/demoproject.lpi
A packages/fcl-process/examples/echoparams.pp
A packages/fcl-process/examples/demoproject.res
--- Recording mergeinfo for merge of r32891 into '.':
G .
--- Merging r32892 into '.':
A packages/fcl-process/examples/demoruncommand.lpi
A packages/fcl-process/examples/demoruncommand.pp
--- Recording mergeinfo for merge of r32892 into '.':
G .
--- Merging r32893 into '.':
G packages/fcl-process/src/process.pp
--- Recording mergeinfo for merge of r32893 into '.':
G .
--- Merging r32895 into '.':
G utils/fpdoc/fpdoc.pp
--- Recording mergeinfo for merge of r32895 into '.':
G .
# revisions: 32795,32804,32805,32806,32809,32814,32820,32826,32860,32861,32862,32868,32891,32892,32893,32895
git-svn-id: branches/fixes_3_0@33748 -
U rtl/objpas/classes/stringl.inc
--- Recording mergeinfo for merge of r32629 into '.':
U .
--- Merging r32630 into '.':
G rtl/objpas/classes/stringl.inc
--- Recording mergeinfo for merge of r32630 into '.':
G .
--- Merging r32668 into '.':
U packages/chm/src/chmreader.pas
--- Recording mergeinfo for merge of r32668 into '.':
G .
# revisions: 32629,32630,32668
git-svn-id: branches/fixes_3_0@33674 -
U packages/fcl-db/src/sqldb/sqldb.pp
U packages/fcl-db/src/sqldb/interbase/ibconnection.pp
--- Recording mergeinfo for merge of r33496 into '.':
U .
--- Merging r33534 into '.':
G packages/fcl-db/src/sqldb/sqldb.pp
--- Recording mergeinfo for merge of r33534 into '.':
G .
# revisions: 33496,33534
git-svn-id: branches/fixes_3_0@33663 -
U tests/webtbs/tw29620.pp
--- Recording mergeinfo for merge of r33201 into '.':
U .
--- Merging r33204 into '.':
G tests/webtbs/tw29620.pp
--- Recording mergeinfo for merge of r33204 into '.':
G .
git-svn-id: branches/fixes_3_0@33586 -
U compiler/cgobj.pas
--- Recording mergeinfo for merge of r29821 into '.':
U .
--- Merging r30947 into '.':
C compiler/nmem.pas
U compiler/jvm/njvmmem.pas
C compiler/objcutil.pas
--- Recording mergeinfo for merge of r30947 into '.':
G .
--- Merging r31202 into '.':
U compiler/utils/gppc386.pp
--- Recording mergeinfo for merge of r31202 into '.':
G .
--- Merging r31245 into '.':
U compiler/symtype.pas
U compiler/symdef.pas
--- Recording mergeinfo for merge of r31245 into '.':
G .
--- Merging r31289 into '.':
U rtl/inc/aliases.inc
--- Recording mergeinfo for merge of r31289 into '.':
G .
--- Merging r31447 into '.':
U compiler/aasmtai.pas
--- Recording mergeinfo for merge of r31447 into '.':
G .
--- Merging r31457 into '.':
C compiler/msgtxt.inc
U compiler/msg/errore.msg
C compiler/msgidx.inc
--- Recording mergeinfo for merge of r31457 into '.':
G .
--- Merging r31909 into '.':
U utils/rstconv.pp
--- Recording mergeinfo for merge of r31909 into '.':
G .
--- Merging r32087 into '.':
U tests/webtbs/tw22376.pp
--- Recording mergeinfo for merge of r32087 into '.':
G .
--- Merging r32412 into '.':
G compiler/symtype.pas
G compiler/symdef.pas
--- Recording mergeinfo for merge of r32412 into '.':
G .
--- Merging r32516 into '.':
U compiler/ncgmem.pas
A tests/webtbs/tw29064.pp
--- Recording mergeinfo for merge of r32516 into '.':
G .
--- Merging r32548 into '.':
U tests/Makefile
A tests/createlst.mak
U tests/utils/gparmake.pp
U tests/Makefile.fpc
--- Recording mergeinfo for merge of r32548 into '.':
G .
--- Merging r32593 into '.':
U compiler/pparautl.pas
--- Recording mergeinfo for merge of r32593 into '.':
G .
--- Merging r32617 into '.':
U compiler/symsym.pas
C compiler/ppu.pas
U compiler/utils/ppuutils/ppudump.pp
A tests/webtbs/uw28964.pp
A tests/webtbs/tw28964.pp
--- Recording mergeinfo for merge of r32617 into '.':
G .
--- Merging r32619 into '.':
U compiler/nmat.pas
A tests/webtbs/tw28702.pp
--- Recording mergeinfo for merge of r32619 into '.':
G .
--- Merging r32627 into '.':
U rtl/inc/ustrings.inc
--- Recording mergeinfo for merge of r32627 into '.':
G .
--- Merging r32632 into '.':
G compiler/symsym.pas
--- Recording mergeinfo for merge of r32632 into '.':
G .
--- Merging r32633 into '.':
G compiler/cgobj.pas
--- Recording mergeinfo for merge of r32633 into '.':
G .
--- Merging r32634 into '.':
U compiler/powerpc/cpupara.pas
--- Recording mergeinfo for merge of r32634 into '.':
G .
--- Merging r32636 into '.':
A tests/webtbs/tw29153.pp
U compiler/ngtcon.pas
--- Recording mergeinfo for merge of r32636 into '.':
G .
--- Merging r32745 into '.':
G compiler/pparautl.pas
U compiler/ncal.pas
--- Recording mergeinfo for merge of r32745 into '.':
G .
--- Merging r32781 into '.':
G compiler/symdef.pas
--- Recording mergeinfo for merge of r32781 into '.':
G .
--- Merging r33004 into '.':
U packages/rtl-extra/src/unix/ipc.pp
--- Recording mergeinfo for merge of r33004 into '.':
G .
--- Merging r33112 into '.':
G compiler/nmem.pas
--- Recording mergeinfo for merge of r33112 into '.':
G .
--- Merging r33157 into '.':
U rtl/java/justrings.inc
--- Recording mergeinfo for merge of r33157 into '.':
G .
--- Merging r33161 into '.':
G rtl/java/justrings.inc
--- Recording mergeinfo for merge of r33161 into '.':
G .
--- Merging r33167 into '.':
U packages/numlib/tests/invgente.pas
U packages/numlib/tests/sleglste.pas
U packages/numlib/tests/eiggg1te.pas
U packages/numlib/tests/roof1rte.pas
U packages/numlib/tests/roopolte.pas
U packages/numlib/tests/eigbs3te.pas
U packages/numlib/tests/slegente.pas
U packages/numlib/tests/eiggs3te.pas
U packages/numlib/tests/spege1te.pas
U packages/numlib/tests/invgpdte.pas
U packages/numlib/tests/spemaxte.pas
U packages/numlib/tests/eigts3te.pas
U packages/numlib/tests/detgsyte.pas
U packages/numlib/tests/slegbalt.pas
U packages/numlib/tests/detgpbte.pas
U packages/numlib/tests/slegsylt.pas
U packages/numlib/tests/slegpdte.pas
U packages/numlib/tests/slegpblt.pas
U packages/numlib/tests/odeiv2te.pas
U packages/numlib/tests/intge3te.pas
U packages/numlib/tests/sledtrte.pas
U packages/numlib/tests/eigsv1te.pas
U packages/numlib/tests/slegtrte.pas
U packages/numlib/tests/eigge1te.pas
U packages/numlib/tests/eiggg4te.pas
U packages/numlib/tests/eigbs2te.pas
U packages/numlib/tests/eiggs2te.pas
U packages/numlib/tests/timer.pas
U packages/numlib/tests/eigts2te.pas
U packages/numlib/tests/spepolte.pas
U packages/numlib/tests/roofnrt1.pas
U packages/numlib/tests/test.pas
U packages/numlib/tests/odeiv1te.pas
U packages/numlib/tests/intge2te.pas
U packages/numlib/tests/speentte.pas
U packages/numlib/tests/sleglslt.pas
U packages/numlib/tests/eiggg3te.pas
U packages/numlib/tests/eigbs1te.pas
U packages/numlib/tests/turte.pas
U packages/numlib/tests/invgsyte.pas
U packages/numlib/tests/eiggs1te.pas
U packages/numlib/tests/slegenlt.pas
U packages/numlib/tests/eigts1te.pas
U packages/numlib/tests/slegbate.pas
U packages/numlib/tests/roofnrte.pas
U packages/numlib/tests/slegsyte.pas
U packages/numlib/tests/detgpdte.pas
U packages/numlib/tests/slegpbte.pas
U packages/numlib/tests/spepowte.pas
U packages/numlib/tests/slegpdlt.pas
U packages/numlib/tests/intge1te.pas
U packages/numlib/tests/detgtrte.pas
U packages/numlib/tests/eigsv3te.pas
U packages/numlib/tests/eigge3te.pas
U packages/numlib/tests/eiggg2te.pas
U packages/numlib/tests/iomwrmte.pas
U packages/numlib/tests/eigbs4te.pas
U packages/numlib/tests/eiggs4te.pas
U packages/numlib/tests/spesgnte.pas
U packages/numlib/tests/eigts4te.pas
--- Recording mergeinfo for merge of r33167 into '.':
G .
--- Merging r33191 into '.':
U compiler/cutils.pas
A tests/webtbs/tw29620.pp
--- Recording mergeinfo for merge of r33191 into '.':
G .
--- Merging r33193 into '.':
U compiler/symtable.pas
--- Recording mergeinfo for merge of r33193 into '.':
G .
--- Merging r33202 into '.':
U compiler/options.pas
--- Recording mergeinfo for merge of r33202 into '.':
G .
--- Merging r33203 into '.':
U rtl/inc/flt_core.inc
--- Recording mergeinfo for merge of r33203 into '.':
G .
--- Merging r33268 into '.':
U compiler/pinline.pas
A tests/test/tw29833.pp
--- Recording mergeinfo for merge of r33268 into '.':
G .
--- Merging r33270 into '.':
U tests/test/units/sysutils/tfexpand2.pp
U tests/test/units/system/tdir2.pp
--- Recording mergeinfo for merge of r33270 into '.':
G .
--- Merging r33271 into '.':
U rtl/objpas/sysutils/sysuni.inc
A tests/test/units/sysutils/twstralloc.pp
--- Recording mergeinfo for merge of r33271 into '.':
G .
--- Merging r33382 into '.':
A tests/webtbs/tw29923.pp
G compiler/cgobj.pas
--- Recording mergeinfo for merge of r33382 into '.':
G .
--- Merging r33413 into '.':
C compiler/ncnv.pas
A tests/webtbs/tw29930.pp
--- Recording mergeinfo for merge of r33413 into '.':
G .
--- Merging r33480 into '.':
U compiler/pdecsub.pas
A tests/webtbs/tw29992.pp
--- Recording mergeinfo for merge of r33480 into '.':
G .
--- Merging r33536 into '.':
U compiler/systems.pas
--- Recording mergeinfo for merge of r33536 into '.':
G .
--- Merging r33539 into '.':
U compiler/powerpc/nppcadd.pas
A tests/webtbs/tw30035a.pp
A tests/webtbs/tw30035.pp
--- Recording mergeinfo for merge of r33539 into '.':
G .
--- Merging r33567 into '.':
U rtl/jvm/jvm.inc
--- Recording mergeinfo for merge of r33567 into '.':
G .
git-svn-id: branches/fixes_3_0@33584 -
U packages/fcl-image/src/fpreadtiff.pas
--- Recording mergeinfo for merge of r31942 into '.':
U .
--- Merging r32813 into '.':
U packages/fcl-image/src/fpwritepng.pp
--- Recording mergeinfo for merge of r32813 into '.':
G .
--- Merging r33464 into '.':
U packages/fcl-image/src/fpimage.inc
--- Recording mergeinfo for merge of r33464 into '.':
G .
--- Merging r33465 into '.':
U packages/fcl-image/src/fpreadjpeg.pas
--- Recording mergeinfo for merge of r33465 into '.':
G .
--- Merging r33466 into '.':
U packages/fcl-image/src/fphandler.inc
--- Recording mergeinfo for merge of r33466 into '.':
G .
--- Merging r33467 into '.':
G packages/fcl-image/src/fpimage.inc
--- Recording mergeinfo for merge of r33467 into '.':
G .
--- Merging r33471 into '.':
G packages/fcl-image/src/fphandler.inc
G packages/fcl-image/src/fpreadjpeg.pas
G packages/fcl-image/src/fpimage.inc
--- Recording mergeinfo for merge of r33471 into '.':
G .
--- Merging r33472 into '.':
U packages/fcl-image/src/fpreadpng.pp
--- Recording mergeinfo for merge of r33472 into '.':
G .
--- Merging r33473 into '.':
G packages/fcl-image/src/fpimage.inc
U packages/fcl-image/src/fpimage.pp
U packages/fcl-image/src/fphandler.inc
--- Recording mergeinfo for merge of r33473 into '.':
G .
--- Merging r33474 into '.':
G packages/fcl-image/src/fpimage.pp
G packages/fcl-image/src/fpreadjpeg.pas
G packages/fcl-image/src/fphandler.inc
--- Recording mergeinfo for merge of r33474 into '.':
G .
# revisions: 31942,32813,33464,33465,33466,33467,33471,33472,33473,33474
git-svn-id: branches/fixes_3_0@33580 -
A packages/ptc/src/cocoa
A packages/ptc/src/cocoa/cocoaconsoled.inc
A packages/ptc/src/cocoa/cocoaconsolei.inc
U packages/ptc/src/ptc.pp
U packages/ptc/src/core/consolei.inc
U packages/ptc/src/core/keyeventd.inc
U packages/ptc/src/core/keyeventi.inc
U packages/ptc/src/x11/x11displayi.inc
U packages/ptc/src/x11/x11windowdisplayi.inc
U packages/ptc/docs/CHANGES.txt
U packages/ptc/docs/README.txt
--- Recording mergeinfo for merge of r33511 into '.':
U .
# revisions: 33511
git-svn-id: branches/fixes_3_0@33513 -
* Return a real base address for ELF executables by GetModuleByAddr() instead of hard-coded 0.
* Obtain a real processaddress for ELF images by OpenExeFile() instead of hard-coded 0.
* It fixes line info information for Position Independent Executables (PIE).
........
git-svn-id: branches/fixes_3_0@33442 -
* 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 -
