Update 0006 patch from Stephane

diff --git a/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch b/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch
index d29ef9a3c8ac82af48c856c2df61717892bb2027..1441bccbda19729778f0ec1589597a12513c98cf 100644 (file)
--- a/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch
+++ b/debian/patches/0006-Embed-bytecode-in-C-object-when-using-custom.patch
@@ -1,5 +1,5 @@
 From: Stephane Glondu <steph@glondu.net>
-Date: Sat, 21 Jul 2012 15:40:52 +0200
+Date: Tue, 11 Jul 2017 13:27:34 +0200
 Subject: Embed bytecode in C object when using -custom
 
 This patch fixes non-strippability of bytecode executables linked with
@@ -19,11 +19,15 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
  testsuite/tests/gc-roots/Makefile             |  3 ++
  testsuite/tests/lib-dynlink-bytecode/Makefile |  3 ++
  testsuite/tests/lib-marshal/Makefile          |  3 ++
- 7 files changed, 57 insertions(+), 4 deletions(-)
+ testsuite/tests/regression/pr3612/Makefile    |  3 ++
+ testsuite/tests/runtime-C-exceptions/Makefile |  3 ++
+ 9 files changed, 63 insertions(+), 4 deletions(-)
 
+diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
+index 40a3351..ae887c3 100644
 --- a/bytecomp/bytelink.ml
 +++ b/bytecomp/bytelink.ml
-@@ -465,7 +465,7 @@
+@@ -465,7 +465,7 @@ let mlvalues_primitives = [
  
  (* Output a bytecode executable as a C file *)
  
@@ -32,7 +36,7 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
    let outchan = open_out outfile in
    begin try
      (* The bytecode *)
-@@ -507,14 +507,27 @@
+@@ -507,7 +507,18 @@ let link_bytecode_as_c ppf tolink outfile =
      (* The table of primitives *)
      Symtable.output_primitive_table outchan mlvalues_primitives;
      (* The entry point *)
@@ -52,17 +56,18 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
  \nvoid caml_startup(char ** argv)\
  \n{\
  \n  caml_startup_code(caml_code, sizeof(caml_code),\
- \n                    caml_data, sizeof(caml_data),\
- \n                    caml_sections, sizeof(caml_sections),\
- \n                    argv);\
+@@ -521,7 +532,9 @@ let link_bytecode_as_c ppf tolink outfile =
+ \n                               caml_data, sizeof(caml_data),\
+ \n                               caml_sections, sizeof(caml_sections),\
+ \n                               argv);\
 -\n}\
 +\n}\n"
-+    end;
++      end;
 +    output_string outchan "\
  \n#ifdef __cplusplus\
  \n}\
  \n#endif\n";
-@@ -553,6 +566,17 @@
+@@ -560,6 +573,17 @@ let fix_exec_name name =
        if String.contains name '.' then name else name ^ ".exe"
    | _ -> name
  
@@ -80,7 +85,7 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
  (* Main entry point (build a custom runtime if needed) *)
  
  let link ppf objfiles output_name =
-@@ -575,6 +599,16 @@
+@@ -582,6 +606,16 @@ let link ppf objfiles output_name =
    Clflags.dllibs := !lib_dllibs @ !Clflags.dllibs; (* put user's DLLs first *)
    if not !Clflags.custom_runtime then
      link_bytecode ppf tolink output_name true
@@ -97,7 +102,7 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
    else if not !Clflags.output_c_object then begin
      let bytecode_name = Filename.temp_file "camlcode" "" in
      let prim_name = Filename.temp_file "camlprim" ".c" in
-@@ -624,7 +658,7 @@
+@@ -631,7 +665,7 @@ let link ppf objfiles output_name =
      if Sys.file_exists c_file then raise(Error(File_exists c_file));
      let temps = ref [] in
      try
@@ -106,9 +111,11 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
        if not (Filename.check_suffix output_name ".c") then begin
          temps := c_file :: !temps;
          if Ccomp.compile_file c_file <> 0 then
+diff --git a/testsuite/tests/basic-manyargs/Makefile b/testsuite/tests/basic-manyargs/Makefile
+index b387d6e..e75ba7d 100644
 --- a/testsuite/tests/basic-manyargs/Makefile
 +++ b/testsuite/tests/basic-manyargs/Makefile
-@@ -18,5 +18,8 @@
+@@ -18,5 +18,8 @@ BASEDIR=../..
  MAIN_MODULE=manyargs
  C_FILES=manyargsprim
  
@@ -117,9 +124,11 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
 +
  include $(BASEDIR)/makefiles/Makefile.one
  include $(BASEDIR)/makefiles/Makefile.common
+diff --git a/testsuite/tests/callback/Makefile b/testsuite/tests/callback/Makefile
+index d6615a1..8e1b4cb 100644
 --- a/testsuite/tests/callback/Makefile
 +++ b/testsuite/tests/callback/Makefile
-@@ -19,6 +19,9 @@
+@@ -19,6 +19,9 @@ CC=$(NATIVECC) -I $(CTOPDIR)/byterun
  COMPFLAGS=-I $(OTOPDIR)/otherlibs/unix
  LD_PATH=$(TOPDIR)/otherlibs/unix
  
@@ -129,6 +138,8 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
  .PHONY: default
  default:
        @case " $(OTHERLIBRARIES) " in \
+diff --git a/testsuite/tests/embedded/Makefile b/testsuite/tests/embedded/Makefile
+index 679c5b9..4d38cd8 100644
 --- a/testsuite/tests/embedded/Makefile
 +++ b/testsuite/tests/embedded/Makefile
 @@ -16,6 +16,10 @@
@@ -142,9 +153,11 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
  default:
        @$(MAKE) compile
        @$(MAKE) run
+diff --git a/testsuite/tests/gc-roots/Makefile b/testsuite/tests/gc-roots/Makefile
+index c8e24cc..7057e12 100644
 --- a/testsuite/tests/gc-roots/Makefile
 +++ b/testsuite/tests/gc-roots/Makefile
-@@ -19,5 +19,8 @@
+@@ -19,5 +19,8 @@ MAIN_MODULE=globroots
  C_FILES=globrootsprim
  ADD_COMPFLAGS=-w a
  
@@ -153,9 +166,11 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
 +
  include $(BASEDIR)/makefiles/Makefile.one
  include $(BASEDIR)/makefiles/Makefile.common
+diff --git a/testsuite/tests/lib-dynlink-bytecode/Makefile b/testsuite/tests/lib-dynlink-bytecode/Makefile
+index 1e56b16..62a0034 100644
 --- a/testsuite/tests/lib-dynlink-bytecode/Makefile
 +++ b/testsuite/tests/lib-dynlink-bytecode/Makefile
-@@ -18,6 +18,9 @@
+@@ -18,6 +18,9 @@ BASEDIR=../..
  COMPFLAGS=-I $(OTOPDIR)/otherlibs/dynlink
  LD_PATH=.:$(TOPDIR)/otherlibs/dynlink
  
@@ -165,9 +180,11 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
  .PHONY: default
  default:
        @if ! $(SUPPORTS_SHARED_LIBRARIES); then \
+diff --git a/testsuite/tests/lib-marshal/Makefile b/testsuite/tests/lib-marshal/Makefile
+index a79f6bd..d30d409 100644
 --- a/testsuite/tests/lib-marshal/Makefile
 +++ b/testsuite/tests/lib-marshal/Makefile
-@@ -18,5 +18,8 @@
+@@ -18,5 +18,8 @@ BASEDIR=../..
  MAIN_MODULE=intext
  C_FILES=intextaux
  
@@ -176,6 +193,8 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
 +
  include $(BASEDIR)/makefiles/Makefile.one
  include $(BASEDIR)/makefiles/Makefile.common
+diff --git a/testsuite/tests/regression/pr3612/Makefile b/testsuite/tests/regression/pr3612/Makefile
+index 866927b..6d0b361 100644
 --- a/testsuite/tests/regression/pr3612/Makefile
 +++ b/testsuite/tests/regression/pr3612/Makefile
 @@ -16,6 +16,9 @@
@@ -188,3 +207,16 @@ Signed-off-by: Stephane Glondu <steph@glondu.net>
  BASEDIR=../../..
  include $(BASEDIR)/makefiles/Makefile.one
  include $(BASEDIR)/makefiles/Makefile.common
+diff --git a/testsuite/tests/runtime-C-exceptions/Makefile b/testsuite/tests/runtime-C-exceptions/Makefile
+index da534b7..e9598df 100644
+--- a/testsuite/tests/runtime-C-exceptions/Makefile
++++ b/testsuite/tests/runtime-C-exceptions/Makefile
+@@ -3,5 +3,8 @@ BASEDIR=../..
+ MAIN_MODULE=test
+ C_FILES=stub_test
+ 
++# This test relies on the upstream behaviour of -custom
++export OCAML_CUSTOM_EMBED=n
++
+ include $(BASEDIR)/makefiles/Makefile.one
+ include $(BASEDIR)/makefiles/Makefile.common

diff --git a/debian/patches/series b/debian/patches/series
index e7b9ccecf2619628e01a0db1fde66884c52db63a..e7e792677d01508d0dcd7518a361e73799af62ac 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,7 +3,6 @@
 0003-Don-t-use-rpath.patch
 0004-Put-manpages-in-section-3o-instead-of-3.patch
 0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch
-# TODO: need to patch again
-#0006-Embed-bytecode-in-C-object-when-using-custom.patch
+0006-Embed-bytecode-in-C-object-when-using-custom.patch
 0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch
 0010-arm-default-PIC.patch