diff options
| author | Nick Barnes <Nick.Barnes@pobox.com> | 2023-01-22 17:58:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-22 18:58:51 +0100 |
| commit | f1550145d4ebe8ee22853d13f97fca288aaef51f (patch) | |
| tree | 7e62f10c9b92aef17958bf9a5637a63e27db6c52 /utils | |
| parent | eb04c8bce70090163b656a69ff29e51cffd32425 (diff) | |
| download | ocaml-f1550145d4ebe8ee22853d13f97fca288aaef51f.tar.gz | |
Fix #11287 by cleaning up "reserved header bits" in the runtime (#11872)
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/config.fixed.ml | 3 | ||||
| -rw-r--r-- | utils/config.generated.ml.in | 3 | ||||
| -rw-r--r-- | utils/config.mli | 8 |
3 files changed, 4 insertions, 10 deletions
diff --git a/utils/config.fixed.ml b/utils/config.fixed.ml index fe82c904f0..1299aa682f 100644 --- a/utils/config.fixed.ml +++ b/utils/config.fixed.ml @@ -58,8 +58,7 @@ let system = "unknown" let asm = boot_cannot_call "the assembler" let asm_cfi_supported = false let with_frame_pointers = false -let profinfo = false -let profinfo_width = 0 +let reserved_header_bits = 0 let ext_exe = ".ex_The boot compiler should not be using Config.ext_exe" let ext_obj = ".o_The boot compiler cannot process C objects" let ext_asm = ".s_The boot compiler should not be using Config.ext_asm" diff --git a/utils/config.generated.ml.in b/utils/config.generated.ml.in index ad7ee66e26..c6c9114465 100644 --- a/utils/config.generated.ml.in +++ b/utils/config.generated.ml.in @@ -94,8 +94,7 @@ let system = {@QS@|@system@|@QS@} let asm = {@QS@|@AS@|@QS@} let asm_cfi_supported = @asm_cfi_supported@ let with_frame_pointers = @frame_pointers@ -let profinfo = @profinfo@ -let profinfo_width = @profinfo_width@ +let reserved_header_bits = @reserved_header_bits@ let ext_exe = {@QS@|@exeext@|@QS@} let ext_obj = "." ^ {@QS@|@OBJEXT@|@QS@} diff --git a/utils/config.mli b/utils/config.mli index db3dfc8455..07e99457b8 100644 --- a/utils/config.mli +++ b/utils/config.mli @@ -216,12 +216,8 @@ val with_flambda_invariants : bool val with_cmm_invariants : bool (** Whether the invariants checks for Cmm are enabled *) -val profinfo : bool -(** Whether the compiler was configured for profiling *) - -val profinfo_width : int -(** How many bits are to be used in values' headers for profiling - information *) +val reserved_header_bits : int +(** How many bits of a block's header are reserved *) val flat_float_array : bool (** Whether the compiler and runtime automagically flatten float |