Commit Graph

9281 Commits (98227477ec4fc30ae76b1dfd5abb254684dd1a9b)

Author SHA1 Message Date
Wojciech Meyer 1e064ceb55 configure: when cross-compiling, set $TOOLPREF and use it.
(Patch by Adrien Nader!)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13854 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-30 12:42:23 +00:00
Wojciech Meyer feac346c2f configure: add --target and use "target" instead of "host" for variables
(Patch by Adrien Nader!)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13853 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-30 11:41:40 +00:00
Wojciech Meyer 9111707486 configure: for cross, a matching ocamlrun must be on the system.
(Patch by Adrien Nader!)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13852 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-30 11:41:39 +00:00
Wojciech Meyer 7dc8ea2b8f misc: fix indent staircase introduced by revision 13843.
(patch by Adrien Nader!)

While at it also re-add two spaces that were eaten.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13851 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-30 11:03:01 +00:00
Gabriel Scherer 4cedfd24c1 [PR#6059, patch by Anil Madhavapeddy] add -output-obj rules and targets to ocamlbuild for byte and native code
Three corresponding targets are added:
%.byte.o   : bytecode object file
%.byte.c   : bytecode source C file
%.native.o : native code object file


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13849 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-30 08:34:42 +00:00
Damien Doligez 338c5ce867 disable test 8 and 9 in tests/lib-threads under Windows because sometimes they deadlock on exit
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13848 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-28 15:25:14 +00:00
Jacques Garrigue b3f2e718b9 test results
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13846 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-28 10:45:25 +00:00
Jacques Garrigue 07b8b7dd74 Fix PR#6056
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13845 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-28 10:43:25 +00:00
Wojciech Meyer d6d2c4b3ea configure: fix detection of non-working C compiler.
(patch by Adrien Nader!)

The test tried to do something like:
  case "$foo,$bar" in
    *,*) echo 1 ;;
    *) echo "compiler not working" ;;
   esac
However the second case cannot match because of the first one.

Instead, check the return code of the command.

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13844 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-27 21:09:25 +00:00
Wojciech Meyer 1b39eae0ae configure: remove unused variables from case...in test.
(Patch by Adrien Nader!)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13843 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-27 19:46:02 +00:00
Wojciech Meyer 41be48ee15 configure: fail if invoked with -param=value (instead of "-param value")
(Patch by Adrien Nader!)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13842 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-27 19:28:27 +00:00
Wojciech Meyer f85aaad77d configure: use inf/wrn/err functions to write messages for the user.
(Patch by Adrien Nader!)

This makes messages to the user more consistent.

Behaviours:
  inf(): writes its arguments to stderr
  wrn(): writes "[WARNING]" to stderr and then its arguments to stderr
  err(): writes "[ERROR!]" to stderr, then its arguments to stderr, and
         calls "exit 2"

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13841 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-27 19:10:08 +00:00
Wojciech Meyer 88059f62f5 windows: don't define lseeki64 and lseek since they already exist.
Patch by Adrien Nader!

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13840 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-27 19:03:10 +00:00
Benedikt Meurer bf6aa158de Fix typo.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13838 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-26 21:28:05 +00:00
Benedikt Meurer 178c423de9 [arm] Prefer instructions that enable 16-bit T1 encodings.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13837 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-26 19:03:38 +00:00
Alain Frisch 0e6bf1162b #4719: changelog.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13836 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-26 11:52:47 +00:00
Xavier Leroy bfc08c41ac PR#6049: support for OpenBSD/macppc
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13835 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-24 08:17:30 +00:00
Hongbo Zhang 034351e37b simplify the change on open! a bit
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13833 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-22 16:53:34 +00:00
Hongbo Zhang f0231fcc21 upgrade camlp4 to support open! and let open!
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13832 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-22 16:12:01 +00:00
Jacques Garrigue f4d0232689 fix PR#5914
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13829 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-22 07:31:37 +00:00
Gabriel Scherer c1da5f35cd fix macppc build (patch by Anil Madhavapeddy)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13827 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-21 14:59:12 +00:00
Fabrice Le Fessant f4d6eafbd3 Fix PR#6044: enabling frame pointers breaks build on MacOS X
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13826 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-20 16:26:19 +00:00
Gabriel Scherer 4ee1956aa2 testsuite/tests/backtrace: fix a stupid (but silenced) error in Makefile
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13822 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-19 15:18:46 +00:00
Gabriel Scherer d06304ee2a bootstrap after the new primitives
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13814 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-19 14:14:05 +00:00
Gabriel Scherer b06701e207 implement a caml_stash_current_backtrace primitive to save the call stack at any point
This commit only implements runtime support in asmrun/ and byterun/.
The more subjective Printexc interface will come separately.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13813 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-19 14:12:02 +00:00
Gabriel Scherer b06015bacb testsuite/tests/backtrace: new test to exercize Printexc.get_raw_backtrace
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13812 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-19 14:10:27 +00:00
Gabriel Scherer 75ee032332 testsuite/tests/backtrace: no need to re-run backtrace2 which catches all exceptions
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13811 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-19 14:08:26 +00:00
Gabriel Scherer 1b1c4a4d15 tweak tests/backtrace to also test ocamlopt
Note that native and byte-test share the same reference file, so in
particular they check that ocamlc and ocamlopt report uncaught
exception in the exact same way. Passing this test required a change
in asmrun/backtrace.c/print_location.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13810 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-19 14:05:10 +00:00
Gabriel Scherer be7dca95f5 make ocamlopt pretty-print uncaught exceptions just as ocamlc and Printexc
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13809 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-19 14:03:51 +00:00
Damien Doligez e9a37a19ea prepare for next version
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13804 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-18 15:01:51 +00:00
Jacques Garrigue 70a5d6af9f fix a variance bug in GADTs
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13802 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-18 13:04:32 +00:00
Alain Frisch 7da2abeceb #4719: fix (when a bytecode calls ocamlrun, the name of the bytecode is in argv[0]). It would be more robust to have headernt.c extract the full path to the bytecode and pass it explicitly to ocamlrun.exe (as its first argument).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13801 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-18 11:13:01 +00:00
Alain Frisch f6890fbacb Remove debug.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13800 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-18 10:39:29 +00:00
Alain Frisch 58e99bd087 #4719: use GetModuleFileName to get an absolute path to the current executable under Windows.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13799 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-18 10:25:01 +00:00
Alain Frisch f59df29db4 Update magic numbers and bootstrap. (Cherry-picked from c13780 on 4.01.)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13798 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-18 08:30:47 +00:00
Alain Frisch ba38d00535 #5980: a different warning for shadowing labels/constructors and for other kinds of identifiers. (Cherry-picked from commit 13796 on 4.01.)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13797 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-18 08:01:02 +00:00
Gabriel Scherer e7a503dc2a PR#4502: ocamlbuild now reliably excludes the build-dir from hygiene check
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13794 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-17 13:12:40 +00:00
Alain Frisch 9d3592791c Fix #5811 as suggested. (Merge 13792 from 4.01.)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13793 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-17 08:53:03 +00:00
Jacques Garrigue d53e2b57b2 Make GADT inference robust to useless equations
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13790 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-17 03:02:14 +00:00
Jacques Garrigue 4fb61c91e6 Fix PR#5815
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13789 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-17 02:03:36 +00:00
Gabriel Scherer 122caaf20b ocamlbuild: when tag "native" is set, use ocamlopt instead of ocamlc for .mli->.cmi
This was requested (with a patch proposal) by "jessicah" in
PR#4613. Given that the effect of such changes are hard to test,
I commit this in trunk only, not version-4.01, to give more time to
detect eventual problems.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13787 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-16 19:07:45 +00:00
Gabriel Scherer f79d1a4e2d improve ocamlbuild API documentation (patch by Cristophe Troestler)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13786 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-16 17:04:29 +00:00
Gabriel Scherer 54a131a262 PR#4079: Queue.copy is now tail-recursive (patch from "Cristophe" on the bugtracker)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13784 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-16 16:19:30 +00:00
Xavier Leroy b23b2e0bde PR#5178: document in INSTALL how to build a 32-bit version under Linux x86-64
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13782 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-15 08:18:50 +00:00
Xavier Leroy 94381ab774 As originally written, this test would livelock under Linux because of contention on the output lock.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13778 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-14 08:07:08 +00:00
Damien Doligez e680af3602 update version number after branching 4.01
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13775 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-13 20:10:42 +00:00
Damien Doligez a213e574f2 before branching 4.01
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13774 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-13 19:18:40 +00:00
Damien Doligez 9bb57c63e6 ignore generated files
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13773 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-13 11:27:04 +00:00
Damien Doligez 493704f300 PR#5827: provide a dynamic command line parsing mechanism
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13772 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-13 11:26:16 +00:00
Fabrice Le Fessant b171e15a12 Fix fix to PR#3679 : discard CR instead of printing a dot
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13771 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-12 15:32:27 +00:00