Skip to content

Commit 5343e09

Browse files
authored
flambda-backend: Delete x86 architecture check (#2381)
* delete * fix build
1 parent 1ef8d46 commit 5343e09

File tree

14 files changed

+4
-576
lines changed

14 files changed

+4
-576
lines changed

Makefile

+2-6
Original file line numberDiff line numberDiff line change
@@ -634,7 +634,6 @@ runtime4_COMMON_C_SOURCES = \
634634
interp \
635635
ints \
636636
io \
637-
isa \
638637
lexing \
639638
main \
640639
major_gc \
@@ -674,8 +673,7 @@ runtime4_NATIVE_ONLY_C_SOURCES = \
674673
fail_nat \
675674
roots_nat \
676675
startup_nat \
677-
signals_nat \
678-
isa
676+
signals_nat
679677

680678
# Runtime system source files (v5)
681679

@@ -704,7 +702,6 @@ runtime_COMMON_C_SOURCES = \
704702
intern \
705703
ints \
706704
io \
707-
isa \
708705
lexing \
709706
lf_skiplist \
710707
main \
@@ -747,8 +744,7 @@ runtime_NATIVE_ONLY_C_SOURCES = \
747744
fail_nat \
748745
frame_descriptors \
749746
startup_nat \
750-
signals_nat \
751-
isa
747+
signals_nat
752748

753749
# The runtime system
754750

runtime/caml/dune

-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
(interp.h as caml/interp.h)
6666
(intext.h as caml/intext.h)
6767
(io.h as caml/io.h)
68-
(isa.h as caml/isa.h)
6968
(lf_skiplist.h as caml/lf_skiplist.h)
7069
(m.h as caml/m.h)
7170
(major_gc.h as caml/major_gc.h)

runtime/caml/isa.h

-111
This file was deleted.

runtime/caml/mlvalues.h

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#include "config.h"
2020
#include "misc.h"
21-
#include "isa.h"
2221

2322
#ifdef __cplusplus
2423
extern "C" {

runtime/isa.c

-165
This file was deleted.

runtime/startup_aux.c

-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
and native code. */
2222

2323
#include <stdio.h>
24-
#include "caml/isa.h"
2524
#include "caml/backtrace.h"
2625
#include "caml/memory.h"
2726
#include "caml/callback.h"
@@ -115,7 +114,6 @@ void caml_parse_ocamlrunparam(void)
115114
case 'v': scanmult (opt, (uintnat *)&caml_verb_gc); break;
116115
case 'V': scanmult (opt, &params.verify_heap); break;
117116
case 'W': scanmult (opt, &caml_runtime_warnings); break;
118-
case 'X': scanmult (opt, &caml_skip_arch_extension_check); break;
119117
case ',': continue;
120118
}
121119
while (*opt != '\0'){

runtime/startup_nat.c

-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#include "caml/stack.h"
3939
#include "caml/startup_aux.h"
4040
#include "caml/sys.h"
41-
#include "caml/isa.h"
4241

4342
extern int caml_parser_trace;
4443
extern char caml_system__code_begin, caml_system__code_end;
@@ -94,9 +93,6 @@ value caml_startup_common(char_os **argv, int pooling)
9493
/* Determine options */
9594
caml_parse_ocamlrunparam();
9695

97-
// CR mslater: re-enable architecture check
98-
// caml_assert_arch_extensions();
99-
10096
#ifdef DEBUG
10197
// Silenced in flambda-backend to make it easier to run tests that
10298
// check program output.

runtime4/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ BYTECODE_C_SOURCES := $(addsuffix .c, \
2525
signals_byt printexc backtrace_byt backtrace compare ints eventlog prng \
2626
floats simd str array io extern intern hash sys meta parsing gc_ctrl md5 obj \
2727
lexing callback debugger weak compact finalise custom dynlink \
28-
afl $(UNIX_OR_WIN32) bigarray main memprof domain isa \
28+
afl $(UNIX_OR_WIN32) bigarray main memprof domain \
2929
skiplist codefrag)
3030

3131
NATIVE_C_SOURCES := $(addsuffix .c, \
@@ -34,7 +34,7 @@ NATIVE_C_SOURCES := $(addsuffix .c, \
3434
floats simd str array io extern intern hash sys parsing gc_ctrl eventlog prng md5 obj \
3535
lexing $(UNIX_OR_WIN32) printexc callback weak compact finalise custom \
3636
globroots backtrace_nat backtrace dynlink_nat debugger meta \
37-
dynlink clambda_checks afl bigarray isa \
37+
dynlink clambda_checks afl bigarray \
3838
memprof domain skiplist codefrag)
3939

4040
# Header files generated by configure

runtime4/caml/dune

-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
(interp.h as caml/interp.h)
7575
(intext.h as caml/intext.h)
7676
(io.h as caml/io.h)
77-
(isa.h as caml/isa.h)
7877
(jumptbl.h as caml/jumptbl.h)
7978
(m.h as caml/m.h)
8079
(major_gc.h as caml/major_gc.h)

0 commit comments

Comments
 (0)