diff options
| -rw-r--r-- | Makefile.config.in | 1 | ||||
| -rwxr-xr-x | configure | 19 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | utils/clflags.ml | 5 | ||||
| -rw-r--r-- | utils/config.fixed.ml | 1 | ||||
| -rw-r--r-- | utils/config.generated.ml.in | 1 | ||||
| -rw-r--r-- | utils/config.mli | 4 |
7 files changed, 1 insertions, 40 deletions
diff --git a/Makefile.config.in b/Makefile.config.in index c0559552db..0b83f398b5 100644 --- a/Makefile.config.in +++ b/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 @@ -780,7 +780,6 @@ build QS ocaml_libdir ocaml_bindir -force_instrumented_runtime compute_deps stdlib_manpages PACKLD @@ -969,7 +968,6 @@ enable_installing_bytecode_programs enable_native_compiler enable_flambda enable_flambda_invariants -enable_force_instrumented_runtime enable_cmm_invariants with_target_bindir enable_reserved_header_bits @@ -1658,8 +1656,6 @@ Optional Features: --enable-flambda enable flambda optimizations --enable-flambda-invariants enable invariants checks in flambda - --force-instrumented-runtime - force the usage of the instrumented runtime --enable-cmm-invariants enable invariants checks in Cmm --enable-reserved-header-bits=BITS reserve BITS (between 0 and 31) bits in block @@ -3239,7 +3235,6 @@ toolchain="cc" profinfo=false profinfo_width=0 instrumented_runtime=false -force_instrumented_runtime=false instrumented_runtime_libs="" bootstrapping_flexdll=false flexdll_dir= @@ -3399,7 +3394,6 @@ OCAML_VERSION_SHORT=5.1 - ## Generated files ac_config_files="$ac_config_files Makefile.build_config" @@ -3828,13 +3822,6 @@ then : fi -# Check whether --enable-force-instrumented-runtime was given. -if test ${enable_force_instrumented_runtime+y} -then : - enableval=$enable_force_instrumented_runtime; -fi - - # Check whether --enable-cmm-invariants was given. if test ${enable_cmm_invariants+y} then : @@ -16243,12 +16230,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac -if test "x$enable_force_instrumented_runtime" = "xyes" -then : - force_instrumented_runtime=true - -fi - # 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 diff --git a/configure.ac b/configure.ac index c4fd1bc0be..071e42a6bf 100644 --- a/configure.ac +++ b/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 diff --git a/utils/clflags.ml b/utils/clflags.ml index 68200b7157..569358c96d 100644 --- a/utils/clflags.ml +++ b/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 *) diff --git a/utils/config.fixed.ml b/utils/config.fixed.ml index 141fcea3d8..e29c94cfe1 100644 --- a/utils/config.fixed.ml +++ b/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 diff --git a/utils/config.generated.ml.in b/utils/config.generated.ml.in index af25f2ca1d..3808089004 100644 --- a/utils/config.generated.ml.in +++ b/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@ diff --git a/utils/config.mli b/utils/config.mli index c4333c055c..fb0d733509 100644 --- a/utils/config.mli +++ b/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 *) |