Commit Graph

44737 Commits

Author SHA1 Message Date
joost
47963b9189 --- Merging r31331 into '.':
C    rtl/haiku/Makefile
--- Recording mergeinfo for merge of r31331 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1
Summary of conflicts:
  Text conflicts: 1

# revisions: 31331

git-svn-id: branches/fixes_3_0@32228 -
2015-11-04 19:48:13 +00:00
joost
d5e7a3ed4a --- Merging r31330 into '.':
U    rtl/haiku/Makefile.fpc
--- Recording mergeinfo for merge of r31330 into '.':
 U   .

# revisions: 31330

git-svn-id: branches/fixes_3_0@32227 -
2015-11-04 19:43:50 +00:00
joost
57e7d48cbd --- Merging r31332 into '.':
C    packages/rtl-unicode/fpmake.pp
--- Recording mergeinfo for merge of r31332 into '.':
 U   .

# revisions: 31332

git-svn-id: branches/fixes_3_0@32219 -
2015-11-01 20:46:02 +00:00
joost
d2853f5962 --- Merging r31329 into '.':
U    rtl/unix/cwstring.pp
--- Recording mergeinfo for merge of r31329 into '.':
 U   .

# revisions: 31329

git-svn-id: branches/fixes_3_0@32218 -
2015-11-01 20:41:14 +00:00
joost
12f41dfb0c --- Merging r31427 into '.':
U    rtl/haiku/ptypes.inc
U    rtl/unix/cwstring.pp
--- Recording mergeinfo for merge of r31427 into '.':
 U   .

# revisions: 31427

git-svn-id: branches/fixes_3_0@32217 -
2015-11-01 20:36:37 +00:00
yury
e0fdaeca41 Merged revision(s) 32083 from trunk:
* pas2jni: Fixed reading of the ppudump's output in some cases.
........

git-svn-id: branches/fixes_3_0@32085 -
2015-10-17 20:39:08 +00:00
yury
1617b9e95b Merged revision(s) 32072, 32078 from trunk:
* arm-android: Use kuser_cmpxchg for Interlocked* functions when RTL is compiled for the ARMv5t CPU.
........
* arm-android: Compile for ARMv5T by default to be compatible with all versions of Android.
........

git-svn-id: branches/fixes_3_0@32080 -
2015-10-17 16:37:28 +00:00
yury
bb42a1a2a0 Merged revision(s) 32063 from trunk:
fix InterlockedCompareExchange on ARM-Linux: kuser_cmpxchg destroys r3, which needs to be restored, if we have to loop
........

git-svn-id: branches/fixes_3_0@32079 -
2015-10-17 16:35:32 +00:00
joost
9c719ab1e1 --- Merging r31986 into '.':
U    rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r31986 into '.':
 U   .

# revisions: 31986

git-svn-id: branches/fixes_3_0@32051 -
2015-10-13 17:45:07 +00:00
joost
6543ae75c9 --- Merging r32019 into '.':
U    rtl/os2/sysutils.pp
--- Recording mergeinfo for merge of r32019 into '.':
 U   .

# revisions: 32019

git-svn-id: branches/fixes_3_0@32027 -
2015-10-12 17:53:56 +00:00
joost
545619758f * Re-generated Makefile's
git-svn-id: branches/fixes_3_0@32002 -
2015-10-10 20:05:14 +00:00
joost
7cd5b16965 --- Merging r31974 into '.':
U    ide/fpmake.pp
--- Recording mergeinfo for merge of r31974 into '.':
 U   .
--- Merging r31975 into '.':
G    ide/fpmake.pp
--- Recording mergeinfo for merge of r31975 into '.':
 G   .
--- Merging r31999 into '.':
G    ide/fpmake.pp
--- Recording mergeinfo for merge of r31999 into '.':
 G   .

# revisions: 31974,31975,31999

git-svn-id: branches/fixes_3_0@32000 -
2015-10-09 19:46:45 +00:00
joost
e8a1c4f562 --- Merging r31831 into '.':
A    tests/webtbs/tw28718b.pp
A    tests/webtbs/tw28718d.pp
A    tests/webtbs/tw28718a.pp
A    tests/webtbs/tw28718c.pp
U    compiler/symdef.pas
U    compiler/scandir.pas
U    compiler/scanner.pas
U    compiler/options.pas
U    compiler/globtype.pas
--- Recording mergeinfo for merge of r31831 into '.':
 U   .
--- Merging r31880 into '.':
G    compiler/scanner.pas
--- Recording mergeinfo for merge of r31880 into '.':
 G   .

# revisions: 31831,31880

git-svn-id: branches/fixes_3_0@31997 -
2015-10-09 18:47:20 +00:00
joost
51163d68fc --- Merging r29810 into '.':
U    compiler/symdef.pas
--- Recording mergeinfo for merge of r29810 into '.':
 U   .

# revisions: 29810, adapted manually

git-svn-id: branches/fixes_3_0@31996 -
2015-10-09 18:40:40 +00:00
joost
d8b82e0ba5 --- Merging r31910 into '.':
U    compiler/ptype.pas
A    tests/webtbs/tw28674.pp
--- Recording mergeinfo for merge of r31910 into '.':
 U   .
--- Merging r31987 into '.':
U    tests/webtbs/tw28674.pp
G    compiler/ptype.pas
--- Recording mergeinfo for merge of r31987 into '.':
 G   .i

# revisions: 31910,31987

git-svn-id: branches/fixes_3_0@31995 -
2015-10-09 16:38:40 +00:00
joost
cde218d81c --- Merging r31982 into '.':
U    rtl/objpas/classes/streams.inc
--- Recording mergeinfo for merge of r31982 into '.':
 U   .

# revisions: 31982

git-svn-id: branches/fixes_3_0@31985 -
2015-10-08 19:48:44 +00:00
joost
0f73688ecb --- Merging r31458 into '.':
C    tests/test/jvm/testall.bat
C    tests/test/jvm/testall.sh
A    tests/test/jvm/tformalclass.pp
U    compiler/htypechk.pas
--- Recording mergeinfo for merge of r31458 into '.':
 U   .

# revisions: 31458

git-svn-id: branches/fixes_3_0@31984 -
2015-10-08 19:24:18 +00:00
joost
69534dc58c --- Merging r31978 into '.':
U   tests/test/jvm/testall.bat
 U   tests/test/jvm/testall.sh
--- Recording mergeinfo for merge of r31978 into '.':
 U   .

# revisions: 31978

git-svn-id: branches/fixes_3_0@31979 -
2015-10-08 18:52:30 +00:00
joost
06b9bda86d --- Merging r31944 into '.':
U    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r31944 into '.':
 U   .

# revisions: 31944

git-svn-id: branches/fixes_3_0@31973 -
2015-10-06 22:20:46 +00:00
joost
6556feef8d --- Merging r31943 into '.':
U    compiler/utils/samplecfg
--- Recording mergeinfo for merge of r31943 into '.':
 U   .

# revisions: 31943

git-svn-id: branches/fixes_3_0@31972 -
2015-10-06 22:19:28 +00:00
joost
683d44e455 --- Merging r31400 into '.':
C    packages/Makefile
U    packages/Makefile.fpc
--- Recording mergeinfo for merge of r31400 into '.':
 U   .
Summary of conflicts:
  Text conflicts: 1
Summary of conflicts:
  Text conflicts: 1

# revisions: 31400

git-svn-id: branches/fixes_3_0@31971 -
2015-10-06 22:15:45 +00:00
joost
6329336c32 * Re-generated Makefiles
git-svn-id: branches/fixes_3_0@31970 -
2015-10-06 22:09:00 +00:00
joost
2174581f6c --- Merging r31317 into '.':
C packages/googleapi
U    packages/nvapi/Makefile.fpc
U    packages/httpd13/Makefile.fpc
U    packages/proj4/Makefile.fpc
U    packages/odbc/Makefile.fpc
U    packages/openssl/Makefile.fpc
U    packages/rtl-unicode/Makefile.fpc
U    packages/fcl-sdo/Makefile.fpc
U    packages/libcurl/Makefile.fpc
U    packages/gtk1/Makefile.fpc
U    packages/libndsfpc/Makefile.fpc
U    packages/paszlib/Makefile.fpc
U    packages/cdrom/Makefile.fpc
U    packages/chm/Makefile.fpc
U    packages/fppkg/Makefile.fpc
U    packages/x11/Makefile.fpc
U    packages/regexpr/Makefile.fpc
U    packages/zorba/Makefile.fpc
U    packages/rtl-objpas/Makefile.fpc
U    packages/ldap/Makefile.fpc
U    packages/ncurses/Makefile.fpc
U    packages/hash/Makefile.fpc
U    packages/utmp/Makefile.fpc
U    packages/numlib/Makefile.fpc
U    packages/ami-extra/Makefile.fpc
U    packages/fcl-net/Makefile.fpc
U    packages/libogcfpc/Makefile.fpc
U    packages/fcl-res/Makefile.fpc
U    packages/imlib/Makefile.fpc
U    packages/dbus/Makefile.fpc
U    packages/imagemagick/Makefile.fpc
U    packages/graph/Makefile.fpc
U    packages/iosxlocale/Makefile.fpc
U    packages/unzip/Makefile.fpc
U    packages/postgres/Makefile.fpc
U    packages/fcl-fpcunit/Makefile.fpc
U    packages/fcl-process/Makefile.fpc
U    packages/fcl-image/Makefile.fpc
U    packages/os2units/Makefile.fpc
U    packages/libxml/Makefile.fpc
U    packages/fcl-stl/Makefile.fpc
   C packages/libenet
U    packages/libpng/Makefile.fpc
U    packages/gdbm/Makefile.fpc
U    packages/gtk2/Makefile.fpc
U    packages/fcl-web/Makefile.fpc
U    packages/pcap/Makefile.fpc
U    packages/httpd24/Makefile.fpc
U    packages/fuse/Makefile.fpc
U    packages/amunits/Makefile.fpc
U    packages/bzip2/Makefile.fpc
U    packages/bfd/Makefile.fpc
U    packages/libvlc/Makefile.fpc
U    packages/rtl-extra/Makefile.fpc
U    packages/rexx/Makefile.fpc
U    packages/mad/Makefile.fpc
U    packages/libgd/Makefile.fpc
U    packages/httpd22/Makefile.fpc
U    packages/oggvorbis/Makefile.fpc
U    packages/fcl-async/Makefile.fpc
U    packages/opengl/Makefile.fpc
U    packages/pasjpeg/Makefile.fpc
U    packages/morphunits/Makefile.fpc
U    packages/fcl-extra/Makefile.fpc
U    packages/objcrtl/Makefile.fpc
U    packages/syslog/Makefile.fpc
U    packages/httpd20/Makefile.fpc
U    packages/zlib/Makefile.fpc
U    packages/dblib/Makefile.fpc
U    packages/ibase/Makefile.fpc
U    packages/winunits-base/Makefile.fpc
U    packages/mysql/Makefile.fpc
U    packages/matroska/Makefile.fpc
U    packages/Makefile.fpc
U    packages/winunits-jedi/Makefile.fpc
U    packages/fpindexer/Makefile.fpc
U    packages/univint/Makefile.fpc
U    packages/libc/Makefile.fpc
U    packages/symbolic/Makefile.fpc
U    packages/gnome1/Makefile.fpc
U    packages/sqlite/Makefile.fpc
U    packages/jni/Makefile.fpc
U    packages/sdl/Makefile.fpc
U    packages/winceunits/Makefile.fpc
U    packages/libtar/Makefile.fpc
U    packages/opengles/Makefile.fpc
U    packages/fcl-base/Makefile.fpc
U    packages/fcl-xml/Makefile.fpc
U    packages/aspell/Makefile.fpc
U    packages/a52/Makefile.fpc
U    packages/fftw/Makefile.fpc
U    packages/fcl-json/Makefile.fpc
U    packages/ptc/Makefile.fpc
U    packages/rtl-console/Makefile.fpc
U    packages/ggi/Makefile.fpc
U    packages/fv/Makefile.fpc
U    packages/opencl/Makefile.fpc
U    packages/fastcgi/Makefile.fpc
U    packages/gmp/Makefile.fpc
U    packages/uuid/Makefile.fpc
U    packages/pthreads/Makefile.fpc
U    packages/unixutil/Makefile.fpc
U    packages/fcl-passrc/Makefile.fpc
U    packages/iconvenc/Makefile.fpc
U    packages/fcl-registry/Makefile.fpc
U    packages/newt/Makefile.fpc
U    packages/sndfile/Makefile.fpc
U    packages/openal/Makefile.fpc
U    packages/pastojs/Makefile.fpc
U    packages/oracle/Makefile.fpc
U    packages/libgbafpc/Makefile.fpc
U    packages/pxlib/Makefile.fpc
U    packages/dts/Makefile.fpc
U    packages/libsee/Makefile.fpc
U    packages/librsvg/Makefile.fpc
U    packages/palmunits/Makefile.fpc
U    packages/hermes/Makefile.fpc
U    packages/xforms/Makefile.fpc
U    packages/tcl/Makefile.fpc
U    packages/cocoaint/Makefile.fpc
U    packages/modplug/Makefile.fpc
U    packages/fcl-js/Makefile.fpc
U    packages/arosunits/Makefile.fpc
U    packages/users/Makefile.fpc
U    packages/gdbint/Makefile.fpc
U    packages/fpgtk/Makefile.fpc
U    packages/lua/Makefile.fpc
U    packages/fcl-db/Makefile.fpc
U    packages/cairo/Makefile.fpc
U    packages/fcl-sound/Makefile.fpc
U    packages/svgalib/Makefile.fpc
U    utils/fpcmkcfg/Makefile.fpc
U    utils/fpcm/Makefile.fpc
U    utils/tply/Makefile.fpc
U    utils/fppkg/Makefile.fpc
U    utils/h2pas/Makefile.fpc
U    utils/fpcreslipo/Makefile.fpc
U    ide/Makefile.fpc
U    utils/fpcres/Makefile.fpc
U    utils/Makefile.fpc
U    utils/fpmc/Makefile.fpc
U    utils/rmwait/Makefile.fpc
U    utils/importtl/Makefile.fpc
U    utils/pas2js/Makefile.fpc
U    utils/dxegen/Makefile.fpc
U    utils/debugsvr/Makefile.fpc
U    utils/fpcm/Makefile.fpmake.bs.template
U    utils/fpdoc/Makefile.fpc
U    utils/fprcp/Makefile.fpc
U    utils/unicode/Makefile.fpc
U    utils/pas2fpm/Makefile.fpc
U    utils/fpcm/Makefile.fpmake.template
U    utils/mksymbian/Makefile.fpc
U    utils/instantfpc/Makefile.fpc
U    utils/pas2ut/Makefile.fpc
U    utils/pas2jni/Makefile.fpc
--- Recording mergeinfo for merge of r31317 into '.':
 U   .
Summary of conflicts:
  Tree conflicts: 2
Resolved conflicted state of 'packages/googleapi'
Resolved conflicted state of 'packages/libenet'
Summary of conflicts:
  Tree conflicts: 0 remaining (and 2 already resolved)

# revisions: 31317

git-svn-id: branches/fixes_3_0@31969 -
2015-10-06 21:20:59 +00:00
joost
d9d7b875c0 --- Merging r31316 into '.':
U    utils/fpmake.pp
--- Recording mergeinfo for merge of r31316 into '.':
 U   .

# revisions: 31316

git-svn-id: branches/fixes_3_0@31968 -
2015-10-06 21:14:37 +00:00
joost
fdab74d165 --- Merging r31941 into '.':
U    rtl/objpas/classes/stringl.inc
--- Recording mergeinfo for merge of r31941 into '.':
 U   .

# revisions: 31941

git-svn-id: branches/fixes_3_0@31967 -
2015-10-06 20:33:14 +00:00
joost
cb069711eb --- Merging r31953 into '.':
U    packages/paszlib/src/infcodes.pas
--- Recording mergeinfo for merge of r31953 into '.':
 U   .

# revisions: 31953

git-svn-id: branches/fixes_3_0@31966 -
2015-10-06 20:28:56 +00:00
joost
14606bfb7a --- Recording mergeinfo for merge of r31962 into '.':
U   .
--- Recording mergeinfo for merge of r31963 into '.':
 G   .
--- Recording mergeinfo for merge of r31964 into '.':
 G   .

Mergeinfo for revisions 31962, 31963, 31964

git-svn-id: branches/fixes_3_0@31965 -
2015-10-06 16:43:10 +00:00
joost
a608ba6fc6 --- Merging (from foreign repository) r31878 into '.':
U    compiler/widestr.pas
--- Merging (from foreign repository) r31881 into '.':
G    compiler/widestr.pas
U    compiler/cresstr.pas
U    utils/rstconv.pp

# revisions: 31878, 31881

git-svn-id: branches/fixes_3_0@31964 -
2015-10-06 15:38:10 +00:00
joost
49cf7bbadb --- Merging (from foreign repository) r29676 into '.':
U    tests/test/tstrutils2.pp
--- Merging (from foreign repository) r31848 into '.':
G    tests/test/tstrutils2.pp

# revisions: 29676, 31848

git-svn-id: branches/fixes_3_0@31963 -
2015-10-06 15:31:51 +00:00
joost
dc9c883dda --- Merging (from foreign repository) r31847 into '.':
U    compiler/pexpr.pas

# revisions: 31847

git-svn-id: branches/fixes_3_0@31962 -
2015-10-06 15:23:41 +00:00
yury
8f1a63e26a Merged revision(s) 31864, 31883 from trunk:
* Use "clongdouble" instead of "extended" in libc printf tests.
........
  * use cextended instead of clongdouble, so that the tests keeps compiling
    for platforms where we don't support the "long double" type
........

git-svn-id: branches/fixes_3_0@31959 -
2015-10-06 11:36:11 +00:00
yury
bdc3635313 Merged revision(s) 31721 from trunk:
* Build Unicode collations for android.
........
Merged revision(s) 31724 from trunk:
* android: install unicodedata and unicodenumtable units.
........

git-svn-id: branches/fixes_3_0@31958 -
2015-10-06 11:32:32 +00:00
joost
68339c9f8d --- Merging r31826 into '.':
A    packages/fcl-db/src/sqldb/mysql/mysql57conn.pas
--- Recording mergeinfo for merge of r31826 into '.':
 U   .

# revisions: 31826

git-svn-id: branches/fixes_3_0@31949 -
2015-10-05 17:13:29 +00:00
joost
db33bfa407 --- Merging r31906 into '.':
U    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r31906 into '.':
 U   .

# revisions: 31906

git-svn-id: branches/fixes_3_0@31928 -
2015-10-03 17:55:24 +00:00
joost
7d84114faa --- Merging r31433 into '.':
U    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r31433 into '.':
 U   .

# revisions: 31433

git-svn-id: branches/fixes_3_0@31927 -
2015-10-03 17:49:49 +00:00
joost
b6ad19e75a --- Merging r31895 into '.':
U    packages/fpmkunit/src/fpmkunit.pp
--- Recording mergeinfo for merge of r31895 into '.':
 U   .

# revisions: 31895

git-svn-id: branches/fixes_3_0@31926 -
2015-10-03 17:38:30 +00:00
yury
9fe0ec9663 Merged revision(s) 31720 from trunk:
* Use /data/local/tmp/ as a fallback temp dir on Android.
........

git-svn-id: branches/fixes_3_0@31920 -
2015-10-02 22:30:48 +00:00
yury
38c0c1c23f Merged revision(s) 31718 from trunk:
* Set ARMv6 as default CPU for arm-android to eliminate multi-threading issues on multi-core CPUs.
........

git-svn-id: branches/fixes_3_0@31919 -
2015-10-02 21:59:44 +00:00
yury
3764a13433 Merged revision(s) 31463 from trunk:
* pas2jni: Fixed code generation in case of duplicate method names in a class hierarchy.
........

git-svn-id: branches/fixes_3_0@31918 -
2015-10-02 21:57:45 +00:00
yury
08804c4d7c Merged revision(s) 31722, 31865 from trunk:
* android: Fixed ansi-unicode conversion when DefaultSystemCodePage is changed.
........
* Added predefined ICU versions for newer Android version.
* Fixed search of unknown ICU versions.
* Do UTF-8 conversion by RTL if ICU can not be loaded.
........

git-svn-id: branches/fixes_3_0@31917 -
2015-10-02 21:52:12 +00:00
Jonas Maebe
decff7ad16 * merged the fixes_3_0-relevant parts of r31808, r31830, r31879: add support
for clang as an assembler on Darwin and use it by default for i386 and x86_64
  (ARM will be in fixes_3_0_ios)

git-svn-id: branches/fixes_3_0@31907 -
2015-10-01 20:40:08 +00:00
joost
24747a2e4f --- Merging r31451 into '.':
U    compiler/systems/t_linux.pas
--- Recording mergeinfo for merge of r31451 into '.':
 U   .

# revisions: 31451

git-svn-id: branches/fixes_3_0@31898 -
2015-09-30 19:36:16 +00:00
joost
95a2d44a0c --- Merging r31669 into '.':
U    installer/install.dat
--- Recording mergeinfo for merge of r31669 into '.':
 U   .
--- Merging r31671 into '.':
U    installer/install.pas
--- Recording mergeinfo for merge of r31671 into '.':
 G   .

# revisions: 31669,31671

git-svn-id: branches/fixes_3_0@31897 -
2015-09-30 19:16:50 +00:00
joost
b00bd62112 --- Merging r31774 into '.':
U    compiler/systems/i_bsd.pas
--- Recording mergeinfo for merge of r31774 into '.':
 U   .

# revisions: 31774

git-svn-id: branches/fixes_3_0@31896 -
2015-09-30 18:54:40 +00:00
pierre
81a6f3ea2a Merged revision 30573 from http://svn.freepascal.org/svn/fpc/trunk
------------------------------------------------------------------------
r30573 | pierre | 2015-04-13 18:40:27 +0200 (Mon, 13 Apr 2015) | 1 line
Changed paths:
   M /trunk/ide/wini.pas

 Use pascal style doubling of quote char instead of C style escaping for ini file
------------------------------------------------------------------------

git-svn-id: branches/fixes_3_0@31754 -
2015-09-17 22:26:28 +00:00
pierre
88d00ef331 Merged revision 29476 from http://svn.freepascal.org/svn/fpc/trunk
------------------------------------------------------------------------
r29476 | pierre | 2015-01-15 17:53:58 +0100 (Thu, 15 Jan 2015) | 1 line
Changed paths:
   M /trunk/ide/fpini.pas

 Avoid CopyFile over itself fp.cfg after copying fp.ini, thus avoiding misleading ErrorBox
------------------------------------------------------------------------

git-svn-id: branches/fixes_3_0@31753 -
2015-09-17 21:23:11 +00:00
florian
96c21fa0fe Merged r29636
git-svn-id: branches/fixes_3_0@31674 -
2015-09-13 21:37:51 +00:00
marco
ad53375398 --- Merging r31437 into '.':
U    compiler/ptype.pas
A    tests/webtbs/tw28530.pp
--- Recording mergeinfo for merge of r31437 into '.':
 U   .

# revisions: 31437

git-svn-id: branches/fixes_3_0@31598 -
2015-09-11 14:17:48 +00:00
marco
ad937e79fa --- Merging r30239 into '.':
U    compiler/x86_64/cpupara.pas
A    tests/webtbs/tw27658.pp
--- Recording mergeinfo for merge of r30239 into '.':
 U   .

# revisions: 30239

git-svn-id: branches/fixes_3_0@31597 -
2015-09-11 14:16:35 +00:00
marco
de3a3d11e2 --- Merging r31475 into '.':
U    compiler/x86_64/nx64flw.pas
--- Recording mergeinfo for merge of r31475 into '.':
 U   .

# revisions: 31475

git-svn-id: branches/fixes_3_0@31559 -
2015-09-06 17:24:55 +00:00