diff options
| -rw-r--r-- | byterun/compact.c | 2 | ||||
| -rw-r--r-- | byterun/compatibility.h | 1 | ||||
| -rw-r--r-- | byterun/fail.c | 6 | ||||
| -rw-r--r-- | byterun/fail.h | 1 | ||||
| -rw-r--r-- | byterun/startup.c | 2 |
5 files changed, 1 insertions, 11 deletions
diff --git a/byterun/compact.c b/byterun/compact.c index bf80301722..0afbd9dc4f 100644 --- a/byterun/compact.c +++ b/byterun/compact.c @@ -40,7 +40,7 @@ extern void caml_shrink_heap (char *); /* memory.c */ XXX Should be fixed: XXX The above assumes that all roots are aligned on a 4-byte boundary, XXX which is not always guaranteed by C. - XXX (see [caml_register_global_roots] and [caml_init_exceptions]) + XXX (see [caml_register_global_roots]) XXX Should be able to fix it to only assume 2-byte alignment. */ #define Make_ehd(s,t,c) (((s) << 10) | (t) << 2 | (c)) diff --git a/byterun/compatibility.h b/byterun/compatibility.h index 58bf2834f6..11181176c2 100644 --- a/byterun/compatibility.h +++ b/byterun/compatibility.h @@ -112,7 +112,6 @@ #define raise_zero_divide caml_raise_zero_divide #define raise_not_found caml_raise_not_found #define raise_sys_blocked_io caml_raise_sys_blocked_io -#define init_exceptions caml_init_exceptions /* **** asmrun/fail.c */ /* **** asmrun/<arch>.s */ diff --git a/byterun/fail.c b/byterun/fail.c index 991b71cd82..530ca5d138 100644 --- a/byterun/fail.c +++ b/byterun/fail.c @@ -140,12 +140,6 @@ CAMLexport void caml_raise_sys_blocked_io(void) caml_raise_constant(Field(caml_global_data, SYS_BLOCKED_IO)); } -/* Initialization of statically-allocated exception buckets */ - -void caml_init_exceptions(void) -{ -} - int caml_is_special_exception(value exn) { return exn == Field(caml_global_data, MATCH_FAILURE_EXN) || exn == Field(caml_global_data, ASSERT_FAILURE_EXN) diff --git a/byterun/fail.h b/byterun/fail.h index 6832274118..da72c7805a 100644 --- a/byterun/fail.h +++ b/byterun/fail.h @@ -74,7 +74,6 @@ CAMLextern void caml_raise_sys_error (value) Noreturn; CAMLextern void caml_raise_end_of_file (void) Noreturn; CAMLextern void caml_raise_zero_divide (void) Noreturn; CAMLextern void caml_raise_not_found (void) Noreturn; -CAMLextern void caml_init_exceptions (void); CAMLextern void caml_array_bound_error (void) Noreturn; CAMLextern void caml_raise_sys_blocked_io (void) Noreturn; diff --git a/byterun/startup.c b/byterun/startup.c index 923723f8d0..80ffe90b5d 100644 --- a/byterun/startup.c +++ b/byterun/startup.c @@ -429,7 +429,6 @@ CAMLexport void caml_main(char **argv) caml_oldify_one (caml_global_data, &caml_global_data); caml_oldify_mopup (); /* Initialize system libraries */ - caml_init_exceptions(); caml_sys_init(exe_name, argv + pos); #ifdef _WIN32 /* Start a thread to handle signals */ @@ -514,7 +513,6 @@ CAMLexport void caml_startup_code( caml_section_table = section_table; caml_section_table_size = section_table_size; /* Initialize system libraries */ - caml_init_exceptions(); caml_sys_init(exe_name, argv); /* Execute the program */ caml_debugger(PROGRAM_START); |