Commit Graph

104 Commits (e8625747fa4d96b0e42bc5568e4efb3b288ec320)

Author SHA1 Message Date
Damien Doligez b860d63145 whitespace cleanup, cut long lines, add some missing headers
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16415 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-09-11 11:58:31 +00:00
Damien Doligez 860c670848 merge branch 4.02 from 4.02.1 (rev 15540) to a few fixes after 4.02.2 (rev 16205)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@16214 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-07-17 14:31:05 +00:00
Damien Doligez 50886108cf remove temp file in case of link error
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15982 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-04-02 15:49:45 +00:00
Alain Frisch dd90f1b9c5 Avoid creating empty .asm files when using a binary backend.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15866 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-02-26 14:03:58 +00:00
Gabriel Scherer 41e0ecf2ef PR#6642: replace $CAMLORIGIN in -ccopt with the path to cma or cmxa
(Peter Zotov)

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15828 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2015-02-08 11:18:29 +00:00
Alain Frisch 14e22181c6 Need to call begin_assembly after Compilenv.reset.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/abstract_intel_emit@15189 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-09-03 16:02:50 +00:00
Alain Frisch 0652dda14d Factorize the sequencing of operations for setting up the assembly output, calling the assembler, closing/removing the assembly output.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/abstract_intel_emit@15184 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-09-03 12:48:13 +00:00
Damien Doligez cbfe627f92 merge changes from branch 4.02 from branching (rev 14852) to 4.02.0+rc1 (rev 15121)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@15125 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-08-22 13:45:02 +00:00
Fabrice Le Fessant 457958a9e6 Add reset functions to make modules reentrant when used through compiler-libs
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14770 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-05-09 12:01:21 +00:00
Jacques Garrigue 1ce29d9bfc re-commit Leo's weak-dependencies pull request
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14755 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-05-07 00:34:20 +00:00
Jacques Garrigue 95104b3924 revert commit 14719
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14723 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-05-02 06:19:55 +00:00
Mark Shinwell 521ac0213a weak dependencies with -trans-mod (github/ocamllabs/weak-depends 45e980a,21856a7,merge)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14719 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2014-05-01 12:50:20 +00:00
Alain Frisch 0f6f367ad4 Change the representation of exception slots: instead of being represented as 'string ref', they are now blocks
of size 2, with tag = Object_tag, the first field being the pointer to the string, and second one being a unique id, generated
from the same sequence as for object values.  Special case for predefined exceptions, represented with a negative id.

The unique id generator is moved from camlinternalOO to the C runtime system.

Also fix some bugs.



git-svn-id: http://caml.inria.fr/svn/ocaml/branches/raise_variants@14239 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-10-23 14:28:31 +00:00
Alain Frisch b92a3ca792 Continue.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/exception_registration@14122 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-09-12 15:50:47 +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
Fabrice Le Fessant ad6c285818 Improved implementation of OCAMLPARAM
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@13747 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2013-06-05 16:34:40 +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
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 864e8554ae #5527: absolute filenames for more error messages.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12201 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-03-07 17:40:17 +00:00
Alain Frisch 4cfd2fc2a6 Reverting bad commit.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12058 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-20 14:23:34 +00:00
Alain Frisch 7fe8c8ce6f Fix #5490.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@12057 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2012-01-20 14:21:03 +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
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
Damien Doligez a53ce2df70 add option -runtime-variant
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10982 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2011-03-17 16:18:05 +00:00
Xavier Leroy 2adec7d747 PR#5033: tools/objinfo made more general.
tools/dumpapprox removed, now subsumed by tools/objinfo.
Introduced asmcomp/cmx_format.mli and used consistently in asmcomp,
  tools/objinfo, and otherlibs/dynlink
Note: ocamlbuild -based build procedure not updated yet.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10424 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2010-05-19 11:29:38 +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
Alain Frisch 7b90710be5 Add explicit references to external primitive symbols.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8800 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2008-01-31 09:13:19 +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 7be32fff1b Remove unused variable.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8524 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-15 18:17:14 +00:00
Alain Frisch 32abe25b89 Same in native code.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8523 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-15 16:09:57 +00:00
Alain Frisch 1b059475c8 Cleanup and factorization of linker-related code.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8521 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-15 13:21:15 +00:00
Alain Frisch 3f12bd653a Use the variable mksharedlib from the configure script to build cmxs.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8510 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-12 17:18:32 +00:00
Alain Frisch 4944313b0c Make it work under Win64.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@8497 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-11-08 18:03:15 +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
Alain Frisch 5b23012b0e wrong branch... rollback
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7865 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-02-15 18:36:08 +00:00
Alain Frisch a06311fc5f starting to implement native dynlink for Unix
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7864 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2007-02-15 18:32:09 +00:00
Xavier Leroy 5901580fe9 Better handling of .cmx files in combination with -for-pack (PR#4124)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7693 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-10-17 12:33:58 +00:00
Xavier Leroy 8d3d91b9a3 Attempt to support Visual C++ 2005. Remain to be tested.
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7636 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-09-23 08:51:31 +00:00
Xavier Leroy 536dfe0d7c Ajout option /link /subsystem:console pour Windows/msvc et meilleur traitement des options /link passees via -ccopt
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@7405 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2006-05-09 16:00:36 +00:00
Jacques Garrigue 6a940ef65d switch to new vtable representation
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6331 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-05-26 11:10:52 +00:00
Damien Doligez ddc87e9802 PR#1914,PR#1956 depollution de l'espace de noms
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6055 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-01-04 14:32:34 +00:00
Damien Doligez 258688a333 depollution suite (PR#1914 et PR#1956)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@6050 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2004-01-03 12:51:20 +00:00
Xavier Leroy 9ca07e88e2 Revu detection definitions multiples (PR#1732)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5628 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2003-06-27 08:49:22 +00:00
Xavier Leroy ed53dd3827 Transmission des dependances sur .cmx absent a travers -pack (PR#1480)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5307 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-12-02 14:50:08 +00:00
Xavier Leroy 53e33caaab Profiling support for Sparc/Solaris
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5306 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-12-02 12:31:19 +00:00
Xavier Leroy 2fb5cf5111 Typos dans la verification de coherence
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5276 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-11-18 10:41:51 +00:00
Xavier Leroy 5e152f7945 - Revu en profondeur la verification des CRC d'interfaces.
Cela corrige le PR#1064.
- Les CRC des modules constituant un programme sont stockes dans
  l'executable bytecode, section CRCS.  Revu Dynlink pour utiliser ces
  CRC au lieu d'attendre de l'utilisateur qu'il les fournisse.
  MAJ du debugger en consequence.
- Introduction et utilisation du fichier stdlib/StdlibModules.


git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5272 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-11-17 16:42:12 +00:00
Xavier Leroy f0c5c1dcca Blindage de l'appel a Cmmgen.globals_map (PR#1252)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@5009 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-07-22 08:07:26 +00:00
Xavier Leroy 8c0a66d21a Pour MSVC, mettre les options -ccopt en dernier (PR#1130)
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4942 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-06-20 09:48:15 +00:00
Xavier Leroy 3fd05809f5 Suite portage Mingw
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@4936 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
2002-06-18 14:54:15 +00:00