U rtl/win/wininc/base.inc
U rtl/win/wininc/struct.inc
U rtl/win/sysutils.pp
U rtl/objpas/types.pp
U rtl/win32/windows.pp
--- Recording mergeinfo for merge of r32333 into '.':
U .
--- Merging r32335 into '.':
A rtl/inc/typshrdh.inc
A rtl/inc/typshrd.inc
--- Recording mergeinfo for merge of r32335 into '.':
G .
--- Merging r32344 into '.':
U rtl/wince/windows.pp
U rtl/win64/windows.pp
--- Recording mergeinfo for merge of r32344 into '.':
G .
--- Merging r32361 into '.':
G rtl/objpas/types.pp
--- Recording mergeinfo for merge of r32361 into '.':
G .
--- Merging r32362 into '.':
U rtl/wince/wininc/struct.inc
--- Recording mergeinfo for merge of r32362 into '.':
G .
--- Merging r32456 into '.':
G rtl/win/wininc/base.inc
--- Recording mergeinfo for merge of r32456 into '.':
G .
--- Merging r32692 into '.':
G rtl/win/sysutils.pp
G rtl/win/wininc/struct.inc
--- Recording mergeinfo for merge of r32692 into '.':
G .
--- Merging r32998 into '.':
U rtl/inc/typshrd.inc
U rtl/inc/typshrdh.inc
--- Recording mergeinfo for merge of r32998 into '.':
G .
--- Merging r33018 into '.':
G rtl/wince/wininc/struct.inc
--- Recording mergeinfo for merge of r33018 into '.':
G .
--- Merging r33062 into '.':
G rtl/inc/typshrd.inc
G rtl/inc/typshrdh.inc
--- Recording mergeinfo for merge of r33062 into '.':
G .
--- Merging r33143 into '.':
G rtl/win/wininc/base.inc
U rtl/win/wininc/ascfun.inc
G rtl/win/wininc/struct.inc
U rtl/win/wininc/unifun.inc
--- Recording mergeinfo for merge of r33143 into '.':
G .
--- Merging r33216 into '.':
G rtl/win/wininc/struct.inc
G rtl/win/wininc/unifun.inc
G rtl/win/wininc/base.inc
U rtl/win/wininc/unidef.inc
G rtl/win/wininc/ascfun.inc
--- Recording mergeinfo for merge of r33216 into '.':
G .
--- Merging r33217 into '.':
G rtl/win/wininc/struct.inc
G rtl/win/wininc/unifun.inc
G rtl/win/wininc/ascfun.inc
--- Recording mergeinfo for merge of r33217 into '.':
G .
--- Merging r33227 into '.':
U rtl/win/wininc/defines.inc
G rtl/win/wininc/struct.inc
G rtl/win/wininc/unifun.inc
--- Recording mergeinfo for merge of r33227 into '.':
G .
# revisions: 32333,32335,32344,32361,32362,32456,32692,32998,33018,33062,33143,33216,33217,33227
git-svn-id: branches/fixes_3_0@33790 -
U utils/tply/lextable.pas
U utils/tply/plex.pas
--- Recording mergeinfo for merge of r32264 into '.':
G .
# revisions: 32264
git-svn-id: branches/fixes_3_0@33789 -
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 -
