Commit Graph

214 Commits (eb2b1f64b17aab853ca16c531bf9c6b99c69503e)

Author SHA1 Message Date
Damien Doligez 5b8df637d2 merge branch "safe-string"
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14705 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-29 11:56:17 +00:00
Damien Doligez 7303ac34ca fix some of the whitespace problems in the source
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14582 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-12 10:17:02 +00:00
Gabriel Scherer de4f4cf8b3 PR#6358: obey DESTDIR in install targets
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14536 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-07 07:06:17 +00:00
Alain Frisch 0c4c54c990 Get rid of ocamlcomp.sh. The next step is to share all those common declarations for calling the compilers from various places.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14521 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-04-02 16:20:38 +00:00
Luc Maranget c2a88c27fd #PR6269 Optimized string matching
Noticed that I had to bootstrap to test on ARM, so I commit  a new bootstrap
compiler.



git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14479 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-03-21 17:02:44 +00:00
Mark Shinwell 1f4de8b799 use -bin-annot when building
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14448 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-03-07 14:47:30 +00:00
Xavier Leroy 33f242aaea Reverting the elimination of the ocamlcomp*.sh scripts, namely the following commits:
14278
14277
14276
14176
14175
14173
14172
14171
14169
14168
14167
These changes need to mature on their own branch.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14329 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-11-29 13:04:38 +00:00
Wojciech Meyer 241585bc83 build: replace ocamlcomp*.sh.
This script was built from ocamlcomp.sh.in through sed and is called
instead of "ocamlc" (for instance).
It makes it possible to switch from "ocamlc" to "ocamlc.opt" without
changing anything in the Makefiles, only calling sed.

I couldn't cleanly make it handle both a compiler for the target and for
the build. Instead I'm replacing it and doing as much as possible
directly in the Makefiles.
I hoped it would reduce the number of shell invocations, which would
speed things up quite a lot on Windows but I still had to have at least
one since it's not possible to update a make variable from inside a make
rule: i.e. it's not possible to do X=a, build a.opt and update X to be
a.opt.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14168 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-09-20 00:22:38 +00:00
Damien Doligez 7844495624 Merge branch 4.01 from branching point to 4.01.0+rc1
Command line used:
  svn merge --accept postpone -r 13776:14055 $REPO/version/4.01 .


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14060 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-09-04 15:12:37 +00:00
Pierre Weis 1673c623b5 Wrong quoting chase.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13718 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-05-29 18:05:44 +00:00
Wojciech Meyer dc9834c4a4 misc: replace stat_(alloc|free|resize) occurences with caml_stat_(...).
byterun/compatibility.h defines:
  #define stat_alloc caml_stat_alloc
  #define stat_free caml_stat_free
  #define stat_resize caml_stat_resize

Having the "caml_" prefix seems cleaner to me, it also avoids some
issues for cross-compilation but I don't remember well which ones.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13314 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-02-25 03:01:31 +00:00
Wojciech Meyer 675d52a678 Prefer forward slashes to backward slashes on NT as it's more portable.
Nowdays all the Windows operating systems accept both, more over it's
being passed to our toolchain as a relative path (not UNC), so I see
no harm if we want to be a little bit more portable. The only reason
to not doing so is conventiob and IDEs which might parse Makefile.nt
and not recognise it.

Proposed by Adrien Nader.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13176 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-12-30 03:12:11 +00:00
Wojciech Meyer 6268eacf79 WinError.h -> winerror.h. This improves cross-compilation for Windows.
Patch proposed by Adrien Nader.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13175 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-12-30 03:12:10 +00:00
Damien Doligez def31744f9 remove all $Id keywords
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13013 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-10-15 17:50:56 +00:00
Damien Doligez 997a678d5e clean up TABs and whitespace
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12799 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-30 18:04:46 +00:00
Damien Doligez 0c3a7de507 merge changes from 4.00 branching to 4.00.0 (part 1)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12784 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-07-26 19:21:54 +00:00
Xavier Leroy 81ca9d7223 PR#5636: issue with pthread_atfork in glibc
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12586 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-06-08 11:36:35 +00:00
Alain Frisch dd6d8257c0 Enabled 'unused rec flag' warning.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12503 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-29 12:33:51 +00:00
Alain Frisch a0a14c08fa Enable and fix more warnings.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12498 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-29 11:47:28 +00:00
Alain Frisch 05c973e6ed Compile with warning 33, and remove unused opens.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12497 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-05-29 11:10:03 +00:00
Xavier Leroy 0d2e9941eb PR#5295: OS threads: problem with caml_c_thread_unregister()
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12325 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-04-08 17:12:46 +00:00
Wojciech Meyer 5899af063c PR#5504: Fix. Patch proposed by Stephane Glondu, thanks.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12170 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-19 17:30:02 +00:00
Damien Doligez d4522f062c Change "Ocaml" to "OCaml" everywhere
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12152 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-13 17:48:41 +00:00
Damien Doligez e7f5b858c2 More renaming to OCaml
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12149 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-10 16:15:24 +00:00
Damien Doligez b2e4161d38 set svn:keywords property
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12131 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-02-07 11:05:56 +00:00
Jonathan Protzenko 438da6350a Fix #5383: Cannot build OCaml 3.12.1 Win32/MSVC
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12100 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-30 14:51:54 +00:00
Xavier Leroy d187828b8c PR#5306: comparing values of type Thread.t
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11303 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-12-13 15:21:14 +00:00
Damien Doligez 3b507dd1aa renaming of Objective Caml to OCaml and cleanup of copyright headers
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11156 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-27 14:17:02 +00:00
Xavier Leroy f90ddc8c22 PR#5290: added hash functions for channels, nats, mutexes, conditions.
Also: added "custom_compare_ext_default" to all struct custom_operations:
default initialization to 0 did what we want, but explicit initialization
better documents the C sources.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11143 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-23 10:07:25 +00:00
Damien Doligez 90664f4ea1 uniform .ignore system
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11133 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-20 15:37:36 +00:00
Damien Doligez c91db736b1 merge changes from 3.12.0 to 3.12.1
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11123 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-07-20 09:17:07 +00:00
Xavier Leroy 4b8b6fed96 Tick thread: remove hack specific to LinuxThreads v1, probably useless today, certainly problematic when program is daemonized.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@11080 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-06-09 11:57:23 +00:00
Pierre Weis dc2472c8dd Ignoring compiled files.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10986 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-03-17 23:25:14 +00:00
Damien Doligez 575555eecd merge changes from branching of 3.12 to release/3.12.0
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10643 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-08-02 14:37:22 +00:00
Nicolas Pouillard 0d72001f2a Merge branch 'ocaml-git/buildsys' (early part) into trunk
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10386 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-11 13:34:20 +00:00
Alain Frisch e09a12388f New -help-warnings command-line option.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10369 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-04 18:44:38 +00:00
Xavier Leroy 09ba69134f - Refactoring of otherlibs/systhreads
- PR#4702: added C functions to register threads not created by Caml
- PR#5013: wrong implementation of condition variables under Win32
- PR#4979: wrong error code handling under Win32
- Added standard include <caml/threads.h> 
- Added "stack_size" field in GC statistics.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10315 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-27 07:55:08 +00:00
Damien Doligez 27780d9f8a fixed several build problems
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10298 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-04-22 15:41:16 +00:00
Xavier Clerc 2c54e3a4fa Tests moved to 'lib-systhreads'
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9595 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-28 15:43:45 +00:00
Damien Doligez 04b1656222 clean up spaces and tabs
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9547 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-22 12:48:24 +00:00
Damien Doligez bdc0fadee2 merge changes from release/3.11.1 to release/3.11.2
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9540 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-01-20 16:26:46 +00:00
Damien Doligez ed32f569e3 merge changes from ocaml3110 to ocaml3111rc0
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9270 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-05-20 11:52:42 +00:00
Xavier Leroy c2bdcafb6a Added testfork
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9217 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2009-04-01 16:08:57 +00:00
Damien Doligez 1f95b17570 merge changes from 3.10.2merged to 3.11.0
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9153 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-12-03 18:09:09 +00:00
Xavier Leroy 9cc0b9a01a PR#4577: reinitialize thread machinery after fork
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9037 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-09-27 10:46:55 +00:00
Alain Frisch 20bc66eb25 Enable to (old) -dlcode option by default. -nodynlink disables it.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8916 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-07-15 15:31:32 +00:00
Damien Doligez 9ea5edac9a merge changes 3.10.0 -> 3.10.1
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8768 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-01-11 16:13:18 +00:00
Alain Frisch 02654dc3b6 Do not build threads.cmxs: on some systems, it is needed to link the system thread library statically.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8511 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-12 17:19:48 +00:00
Alain Frisch 3958a92c72 Merge the natdynlink branch into HEAD.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8477 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-06 15:16:56 +00:00
Xavier Leroy 45f7137dd3 PR#4351: try to avoid rescheduling in mutex and condvar operations
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8468 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-10-31 09:12:29 +00:00