Remove force-instrumented-runtime configure option (ocaml#11660)

Makefile.config.in

@@ -235,7 +235,6 @@ TARGET=@target@
 HOST=@host@
 FLAMBDA=@flambda@
 WITH_FLAMBDA_INVARIANTS=@flambda_invariants@
-FORCE_INSTRUMENTED_RUNTIME=@force_instrumented_runtime@
 WITH_CMM_INVARIANTS=@cmm_invariants@
 FORCE_SAFE_STRING=true
 DEFAULT_SAFE_STRING=true

configure.ac

@@ -64,7 +64,6 @@ toolchain="cc"
 profinfo=false
 profinfo_width=0
 instrumented_runtime=false
-force_instrumented_runtime=false
 instrumented_runtime_libs=""
 bootstrapping_flexdll=false
 flexdll_dir=
@@ -212,7 +211,6 @@ AC_SUBST([mkexe_ldflags_exp])
 AC_SUBST([PACKLD])
 AC_SUBST([stdlib_manpages])
 AC_SUBST([compute_deps])
-AC_SUBST([force_instrumented_runtime])
 AC_SUBST([ocaml_bindir])
 AC_SUBST([ocaml_libdir])
 AC_SUBST([QS])
@@ -417,10 +415,6 @@ AC_ARG_ENABLE([flambda-invariants],
   [AS_HELP_STRING([--enable-flambda-invariants],
     [enable invariants checks in flambda])])
 
-AC_ARG_ENABLE([force-instrumented-runtime],
-  [AS_HELP_STRING([--force-instrumented-runtime],
-    [force the usage of the instrumented runtime])])
-
 AC_ARG_ENABLE([cmm-invariants],
   [AS_HELP_STRING([--enable-cmm-invariants],
     [enable invariants checks in Cmm])])
@@ -1503,10 +1497,6 @@ AS_CASE([$host],
   ]
 )
 
-AS_IF([test "x$enable_force_instrumented_runtime" = "xyes"],
-  [force_instrumented_runtime=true]
-)
-
 # The instrumented runtime is built by default
 # if the proper clock source is found.
 # If asked via --enable-instrumented-runtime, configuration fails if the proper

utils/clflags.ml

@@ -166,10 +166,7 @@ let pic_code = ref (match Config.architecture with (* -fPIC *)
                      | "amd64" -> true
                      | _       -> false)
 
-let runtime_variant =
-  ref (match Config.force_instrumented_runtime with (* -runtime-variant *)
-        | true -> "i"
-        | false -> "")
+let runtime_variant = ref ""
 
 let with_runtime = ref true         (* -with-runtime *)
 

utils/config.fixed.ml

@@ -47,7 +47,6 @@ let flambda = false
 let with_flambda_invariants = false
 let with_cmm_invariants = false
 let windows_unicode = false
-let force_instrumented_runtime = false
 let flat_float_array = true
 let function_sections = false
 let afl_instrument = false

utils/config.generated.ml.in

@@ -78,7 +78,6 @@ let flambda = @flambda@
 let with_flambda_invariants = @flambda_invariants@
 let with_cmm_invariants = @cmm_invariants@
 let windows_unicode = @windows_unicode@ != 0
-let force_instrumented_runtime = @force_instrumented_runtime@
 
 let flat_float_array = @flat_float_array@
 

utils/config.mli

@@ -239,10 +239,6 @@ val supports_shared_libraries: bool
 
     @since 4.08 *)
 
-val force_instrumented_runtime: bool
-(** Force runtime-variant to be "i" at configure time
-    when ocamlc or ocamlopt link executables. *)
-
 val afl_instrument : bool
 (** Whether afl-fuzz instrumentation is generated by default *)