delta/ocaml.git, branch contribution_workflow github.com: ocaml/ocaml Make it sounds less scary. 2017-07-24T16:58:06+00:00 alainfrisch alain@frisch.fr 2017-07-24T16:57:38+00:00 a5f8651028e2152d7ef769043ab33c7901a23f80 






Describe workflow.
2017-07-24T08:55:27+00:00

alainfrisch
alain@frisch.fr

2017-07-24T08:52:19+00:00

fa929c1450e2eb71df7ce628a5a771c18122c68a












Merge pull request #1258 from gasche/cleanup-Changes
2017-07-23T19:43:00+00:00

Gabriel Scherer
gabriel.scherer@gmail.com

2017-07-23T19:43:00+00:00

c427e583862fdf2812e9730a7098c68887c100cc

cleanup trunk Changes




cleanup trunk Changes






Merge pull request #1214 from gasche/escape-Makefile-injections
2017-07-23T19:26:41+00:00

Gabriel Scherer
gabriel.scherer@gmail.com

2017-07-23T19:26:41+00:00

c43ebef8cc8f945d5d075d4d460e8f3777601079

[minor] harden config/Makefile against '#' in PREFIX




[minor] harden config/Makefile against '#' in PREFIX






cleanup trunk Changes
2017-07-23T17:04:45+00:00

Gabriel Scherer
gabriel.scherer@gmail.com

2017-07-23T06:30:14+00:00

dade14d68373241f566c9f94a71d986de5cf8b6e

There seems to be many instances of merges introducing duplicated Changes lines recently,
this may be an unfortunate effect of the use of the 'union' merge driver
since 4d2f22f269fda0aeb7d6c547ef366fd4661008b6.





There seems to be many instances of merges introducing duplicated Changes lines recently,
this may be an unfortunate effect of the use of the 'union' merge driver
since 4d2f22f269fda0aeb7d6c547ef366fd4661008b6.







[minor] harden config/Makefile against '#' in PREFIX
2017-07-23T06:19:55+00:00

Gabriel Scherer
gabriel.scherer@gmail.com

2017-06-27T00:53:22+00:00

890c8bb2ca757cb4d6788b285d7a628a4c15039b

The opam-compiler-conf script will generate an opam switch name
(and thus a directory name) from the name of the current git
branch. Branches named 'PR#1234-foo-bar' would have the ./configure
script generate a config/Makefile with the lines

    PREFIX=~/.opam/4.06.0+local-git-PR#1234-foo-bar
    BINDIR=$(PREFIX)/bin
    BYTERUN=$(BINDIR)/ocamlrun
    LIBDIR=$(PREFIX)/lib/ocaml

The '#' in the first line parses as the start of a comment, so
the second part is ignored and the build system would then install
in ~/.opam/4.06.0+local-git-PR instead.

After this change, config/Makefile starts with:

    # generated by ./configure --prefix ~/.opam/4.06.0+local-git-PR#1234-foo-bar
    CONFIGURE_ARGS=--prefix ~/.opam/4.06.0+local-git-PR\#1234-foo-bar
    PREFIX=~/.opam/4.06.0+local-git-PR\#1234-foo-bar





The opam-compiler-conf script will generate an opam switch name
(and thus a directory name) from the name of the current git
branch. Branches named 'PR#1234-foo-bar' would have the ./configure
script generate a config/Makefile with the lines

    PREFIX=~/.opam/4.06.0+local-git-PR#1234-foo-bar
    BINDIR=$(PREFIX)/bin
    BYTERUN=$(BINDIR)/ocamlrun
    LIBDIR=$(PREFIX)/lib/ocaml

The '#' in the first line parses as the start of a comment, so
the second part is ignored and the build system would then install
in ~/.opam/4.06.0+local-git-PR instead.

After this change, config/Makefile starts with:

    # generated by ./configure --prefix ~/.opam/4.06.0+local-git-PR#1234-foo-bar
    CONFIGURE_ARGS=--prefix ~/.opam/4.06.0+local-git-PR\#1234-foo-bar
    PREFIX=~/.opam/4.06.0+local-git-PR\#1234-foo-bar







Merge pull request #1257 from ocaml/pr7591
2017-07-23T05:46:08+00:00

Gabriel Scherer
gabriel.scherer@gmail.com

2017-07-23T05:46:08+00:00

393ff30948202c850cd862ee0f2028cfe04d749c

MPR#7591: frametable not 8-aligned on x86-64 port




MPR#7591: frametable not 8-aligned on x86-64 port






MPR#7591, GPR#1257: Update Changelog
2017-07-22T21:28:33+00:00

Xavier Leroy
xavier.leroy@inria.fr

2017-07-22T21:28:33+00:00

99bb7322621f6d97062b1af0f2a34583a0e0af2e












MPR#7591: frametable not 8-aligned on x86-64 port
2017-07-22T20:32:23+00:00

Xavier Leroy
xavier.leroy@inria.fr

2017-07-22T20:32:23+00:00

7077b6057f59c86da2c2a7bdf9b3826b193e0ac9

Misalignment was due to the "D.long (const 0)" emitted just before the frametable, which sets the data pointer to 4 mod 8. Looks like someone cut-and-pasted from i386 to amd64 without thinking.

This commit fixes the bug twice (because belt and suspenders and all that) in two obvious ways:
- the data terminator D.long becomes D.qword
- explicit 8-alignment is requested before emitting the frame table.

(Mental note: why is the frame table in the data segment and not in a readonly data segment?)





Misalignment was due to the "D.long (const 0)" emitted just before the frametable, which sets the data pointer to 4 mod 8. Looks like someone cut-and-pasted from i386 to amd64 without thinking.

This commit fixes the bug twice (because belt and suspenders and all that) in two obvious ways:
- the data terminator D.long becomes D.qword
- explicit 8-alignment is requested before emitting the frame table.

(Mental note: why is the frame table in the data segment and not in a readonly data segment?)







Merge pull request #1256 from jacquev6/trunk
2017-07-21T18:19:56+00:00

Florian Angeletti
octa@polychoron.fr

2017-07-21T18:19:56+00:00

d9d7d5b8f19df9f7300c6b2cf1a1b881ab1cb7c1

Reference manual: fix grammar in Language extensions




Reference manual: fix grammar in Language extensions