flambda-backend: Cpp mangling is now a configuration option (ocaml#614)

Makefile.config.in

@@ -225,6 +225,7 @@ WITH_OCAMLDOC=@ocamldoc@
 WITH_OCAMLTEST=@ocamltest@
 ASM_CFI_SUPPORTED=@asm_cfi_supported@
 WITH_FRAME_POINTERS=@frame_pointers@
+WITH_CPP_MANGLING=@cpp_mangling@
 WITH_PROFINFO=@profinfo@
 PROFINFO_WIDTH=@profinfo_width@
 WITH_FPIC=@fpic@

configure.ac

@@ -152,6 +152,7 @@ AC_SUBST([install_source_artifacts])
 AC_SUBST([profinfo])
 AC_SUBST([profinfo_width])
 AC_SUBST([frame_pointers])
+AC_SUBST([cpp_mangling])
 AC_SUBST([flambda])
 AC_SUBST([flambda2])
 AC_SUBST([flambda_invariants])
@@ -278,6 +279,10 @@ AC_ARG_ENABLE([frame-pointers],
   [AS_HELP_STRING([--enable-frame-pointers],
     [use frame pointers in runtime and generated code])])
 
+AC_ARG_ENABLE([cpp-mangling],
+  [AS_HELP_STRING([--enable-cpp-mangling],
+    [use cpp mangling for exported symbols])])
+
 AC_ARG_ENABLE([naked-pointers],
   [AS_HELP_STRING([--disable-naked-pointers],
     [do not allow naked pointers])])
@@ -1738,6 +1743,13 @@ AS_IF([test x"$enable_frame_pointers" = "xyes"],
   [AC_MSG_NOTICE([not using frame pointers])
   frame_pointers=false])
 
+## CPP mangling
+
+AS_IF([test x"$enable_cpp_mangling" = "xyes"],
+  [cpp_mangling=true
+    AC_DEFINE([WITH_CPP_MANGLING])],
+  [cpp_mangling=false])
+
 ## No naked pointers
 
 AS_IF([test x"$enable_naked_pointers" = "xno" ],

utils/Makefile

@@ -86,6 +86,7 @@ config.ml: config.mlp $(ROOTDIR)/Makefile.config Makefile
 	    $(call SUBST,SYSTHREAD_SUPPORT) \
 	    $(call SUBST,TARGET) \
 	    $(call SUBST,WITH_FRAME_POINTERS) \
+	    $(call SUBST,WITH_CPP_MANGLING) \
 	    $(call SUBST,WITH_PROFINFO) \
 	    $(call SUBST,FLAT_FLOAT_ARRAY) \
 	    $(call SUBST,FUNCTION_SECTIONS) \

utils/config.mli

@@ -164,6 +164,9 @@ val asm_cfi_supported: bool
 val with_frame_pointers : bool
 (** Whether assembler should maintain frame pointers *)
 
+val with_cpp_mangling : bool
+(** Whether symbol names should be following the cpp mangling convention *)
+
 val ext_obj: string
 (** Extension for object files, e.g. [.o] under Unix. *)
 

utils/config.mlp

@@ -135,6 +135,7 @@ let system = "%%SYSTEM%%"
 let asm = "%%ASM%%"
 let asm_cfi_supported = %%ASM_CFI_SUPPORTED%%
 let with_frame_pointers = %%WITH_FRAME_POINTERS%%
+let with_cpp_mangling = %%WITH_CPP_MANGLING%%
 let profinfo = %%WITH_PROFINFO%%
 let profinfo_width = %%PROFINFO_WIDTH%%
 
@@ -190,6 +191,7 @@ let configuration_variables =
   p "asm" asm;
   p_bool "asm_cfi_supported" asm_cfi_supported;
   p_bool "with_frame_pointers" with_frame_pointers;
+  p_bool "with_cpp_mangling" with_cpp_mangling;
   p "ext_exe" ext_exe;
   p "ext_obj" ext_obj;
   p "ext_asm" ext_asm;