move f32 lib to fl2

middle_end/flambda2/numbers/dune

@@ -3,14 +3,23 @@
 (library
  (name flambda2_numbers)
  (wrapped true)
- (instrumentation (backend bisect_ppx))
+ (instrumentation
+  (backend bisect_ppx))
  (flags
-  (:standard
-   -principal
-   -open
-   Flambda2_algorithms
-   -open
-   Flambda2_ui))
+  (:standard -principal -open Flambda2_algorithms -open Flambda2_ui))
+ (foreign_stubs
+  (language c)
+  (names float32_stubs)
+  (flags
+   ((:include %{project_root}/oc_cflags.sexp)
+    (:include %{project_root}/sharedlib_cflags.sexp)
+    (:include %{project_root}/oc_cppflags.sexp))))
  (ocamlopt_flags
   (:standard -O3 -open Int_replace_polymorphic_compare))
- (libraries ocamlcommon flambda2_algorithms flambda2_ui compiler_float32))
+ (libraries ocamlcommon flambda2_algorithms flambda2_ui))
+
+(install
+ (files
+  (dllflambda2_numbers_stubs.so as stublibs/dllflambda2_numbers_stubs.so))
+ (section lib)
+ (package ocaml))

middle_end/flambda2/numbers/numeric_types.ml

@@ -320,7 +320,7 @@ end)
 
 module Float32_by_bit_pattern = Float_by_bit_pattern_gen (struct
   include Int32
-  module F32 = Compiler_float32
+  module F32 = Float32
 
   let of_string str = F32.to_bits (F32.of_string str)
 

ocaml/Makefile.common-jst

@@ -271,8 +271,6 @@ install_for_test: _install
 	# Various directories are put on the -I paths by tools/Makefile;
 	# utils/ is one such, so we just dump the .cm* files in there for
 	# various things.
-	mkdir _runtest/external
-	cp $(main_build)/external/float32/*.{cma,a,cmxa} _runtest/external
 	mkdir _runtest/utils
 	cp _install/lib/ocaml/compiler-libs/*.{cmi,cmx} _runtest/utils
 	cp $(main_build)/$(ocamldir)/.ocamlcommon.objs/byte/*.cmo _runtest/utils

testsuite/tools/Makefile

@@ -39,10 +39,9 @@ codegen_PROG = codegen$(EXE)
 codegen_DIRS = parsing utils typing middle_end bytecomp lambda asmcomp
 codegen_OCAMLFLAGS = $(addprefix -I $(ROOTDIR)/, $(codegen_DIRS)) -w +40 -g
 
-codegen_LIBS = unix $(ROOTDIR)/external/compiler_float32 \
-	$(addprefix $(COMPILERLIBSDIR)/,\
-  	  ocamlcommon \
-  	  ocamloptcomp)
+codegen_LIBS = unix $(addprefix $(COMPILERLIBSDIR)/,\
+  ocamlcommon \
+  ocamloptcomp)
 
 codegen_OBJECTS = $(addsuffix .cmo,\
   parsecmmaux parsecmm lexcmm codegen_main)