Add naked-pointers flag to ocamlc -config output (#10531)

* Add naked-pointers flag to `ocamlc -config` output * add Changes entry
ocaml · Aug 22, 2021 · 851d0ff · 851d0ff
1 parent 2642557
commit 851d0ff
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 0 deletions.
diff --git a/Changes b/Changes
@@ -71,6 +71,10 @@ Working version
   when module inclusion fails.
   (Antal Spector-Zabusky, review by Florian Angeletti)
 
+- #10531: add naked_pointers to ocamlc -config exporting NAKED_POINTERS from
+  Makefile.config.
+  (Damien Doligez, review by Mark Shinwell and Gabriel Scherer)
+
 ### Internal/compiler-libs changes:
 
 - #1599: add unset directive to ocamltest to clear environment variables before

diff --git a/utils/Makefile b/utils/Makefile
@@ -79,6 +79,7 @@ config.ml: config.mlp $(ROOTDIR)/Makefile.config Makefile
 	    $(call SUBST,FORCE_SAFE_STRING) \
 	    $(call SUBST,DEFAULT_SAFE_STRING) \
 	    $(call SUBST,WINDOWS_UNICODE) \
+	    $(call SUBST,NAKED_POINTERS) \
 	    $(call SUBST,SUPPORTS_SHARED_LIBRARIES) \
 	    $(call SUBST,SYSTEM) \
 	    $(call SUBST,SYSTHREAD_SUPPORT) \

diff --git a/utils/config.mli b/utils/config.mli
@@ -244,6 +244,11 @@ val function_sections : bool
 val windows_unicode: bool
 (** Whether Windows Unicode runtime is enabled *)
 
+val naked_pointers : bool
+(** Whether the runtime supports naked pointers
+
+    @since 4.14.0 *)
+
 val supports_shared_libraries: bool
 (** Whether shared libraries are supported
 

diff --git a/utils/config.mlp b/utils/config.mlp
@@ -84,6 +84,7 @@ let with_cmm_invariants = %%WITH_CMM_INVARIANTS%%
 let safe_string = %%FORCE_SAFE_STRING%%
 let default_safe_string = %%DEFAULT_SAFE_STRING%%
 let windows_unicode = %%WINDOWS_UNICODE%% != 0
+let naked_pointers = %%NAKED_POINTERS%%
 
 let flat_float_array = %%FLAT_FLOAT_ARRAY%%
 
@@ -203,6 +204,7 @@ let configuration_variables =
   p_bool "afl_instrument" afl_instrument;
   p_bool "windows_unicode" windows_unicode;
   p_bool "supports_shared_libraries" supports_shared_libraries;
+  p_bool "naked_pointers" naked_pointers;
 
   p "exec_magic_number" exec_magic_number;
   p "cmi_magic_number" cmi_magic_number;