CVS commit: pkgsrc/lang/ocaml

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Wed Jul 18 00:09:12 UTC 2018

Modified Files:
        pkgsrc/lang/ocaml: distinfo
Added Files:
        pkgsrc/lang/ocaml/patches: patch-asmcomp_amd64_emit.mlp
            patch-asmrun_amd64.S

Log Message:
Fix attributes and entry size for the .rodata mergable constant section.


To generate a diff of this commit:
cvs rdiff -u -r1.120 -r1.121 pkgsrc/lang/ocaml/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp
cvs rdiff -u -r0 -r1.1 pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ocaml/distinfo
diff -u pkgsrc/lang/ocaml/distinfo:1.120 pkgsrc/lang/ocaml/distinfo:1.121
--- pkgsrc/lang/ocaml/distinfo:1.120    Mon Apr 30 10:38:04 2018
+++ pkgsrc/lang/ocaml/distinfo  Wed Jul 18 00:09:12 2018
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.120 2018/04/30 10:38:04 wiz Exp $
+$NetBSD: distinfo,v 1.121 2018/07/18 00:09:12 joerg Exp $
 
 SHA1 (ocaml-4.06.1.tar.gz) = 63dc362344f1a7b448336c94c33207c2940be475
 RMD160 (ocaml-4.06.1.tar.gz) = ad7a6038544a0d59b72b6fe9e81a4e69c158d397
 SHA512 (ocaml-4.06.1.tar.gz) = 42560874ce363212fa4e862138d7260113bc8dff8b39c040332bbd9b039ba938788344ba8ce63ffc0a251bf21a6e493f3c1e505b6f51db6fec4d21578921060e
 Size (ocaml-4.06.1.tar.gz) = 4049457 bytes
 SHA1 (patch-Makefile) = 7fb492bbc3c44bad1753b8fc6928b7b0cadac436
+SHA1 (patch-asmcomp_amd64_emit.mlp) = 68cc42afd6439347524f2d81c48305dcbc173869
 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f
 SHA1 (patch-asmrun_Makefile) = 86c88be262ae1278ca376d7966b496b49c549e72
+SHA1 (patch-asmrun_amd64.S) = 4be1058a241e03ff73cd08d2aa16b0134c4414ca
 SHA1 (patch-byterun_Makefile) = 02797b10d685b25c0c6f5aab8eadc324e26826e9
 SHA1 (patch-configure) = 0a4e40fb942a3154ca63259df23721e5bac3154c
 SHA1 (patch-driver_compenv.ml) = 658e315bb08f8a1093f11c8474ac1e4ad73c8306

Added files:

Index: pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp:1.3
--- /dev/null   Wed Jul 18 00:09:12 2018
+++ pkgsrc/lang/ocaml/patches/patch-asmcomp_amd64_emit.mlp      Wed Jul 18 00:09:12 2018
@@ -0,0 +1,22 @@
+$NetBSD: patch-asmcomp_amd64_emit.mlp,v 1.3 2018/07/18 00:09:12 joerg Exp $
+
+--- asmcomp/amd64/emit.mlp.orig        2018-07-17 21:17:05.536787953 +0000
++++ asmcomp/amd64/emit.mlp
+@@ -986,7 +986,7 @@ let begin_assembly() =
+     | S_macosx -> D.section ["__TEXT";"__literal16"] None ["16byte_literals"]
+     | S_mingw64 | S_cygwin -> D.section [".rdata"] (Some "dr") []
+     | S_win64 -> D.data ()
+-    | _ -> D.section [".rodata.cst8"] (Some "a") ["@progbits"]
++    | _ -> D.section [".rodata.cst8"] (Some "aM") ["@progbits,8"]
+     end;
+     D.align 16;
+     _label (emit_symbol "caml_negf_mask");
+@@ -1046,7 +1046,7 @@ let end_assembly() =
+     | S_macosx -> D.section ["__TEXT";"__literal8"] None ["8byte_literals"]
+     | S_mingw64 | S_cygwin -> D.section [".rdata"] (Some "dr") []
+     | S_win64 -> D.data ()
+-    | _ -> D.section [".rodata.cst8"] (Some "a") ["@progbits"]
++    | _ -> D.section [".rodata.cst8"] (Some "aM") ["@progbits,8"]
+     end;
+     List.iter (fun (cst,lbl) -> emit_float_constant cst lbl) !float_constants
+   end;

Index: pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S
diff -u /dev/null pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S:1.1
--- /dev/null   Wed Jul 18 00:09:12 2018
+++ pkgsrc/lang/ocaml/patches/patch-asmrun_amd64.S      Wed Jul 18 00:09:12 2018
@@ -0,0 +1,13 @@
+$NetBSD: patch-asmrun_amd64.S,v 1.1 2018/07/18 00:09:12 joerg Exp $
+
+--- asmrun/amd64.S.orig        2018-07-17 21:24:20.027817665 +0000
++++ asmrun/amd64.S
+@@ -724,7 +724,7 @@ G(caml_system__spacetime_shapes):
+ #elif defined(SYS_mingw64) || defined(SYS_cygwin)
+         .section .rdata,"dr"
+ #else
+-        .section    .rodata.cst8,"a",@progbits
++        .section    .rodata.cst8,"aM",@progbits,8
+ #endif
+         .globl  G(caml_negf_mask)
+         .align  SIXTEEN_ALIGN