flambda-backend: Allow --enable-middle-end=flambda2 etc (#89)

Author: mshinwell

Makefile.config.in

@@ -231,6 +231,7 @@ WITH_FPIC=@fpic@
 TARGET=@target@
 HOST=@host@
 FLAMBDA=@flambda@
+FLAMBDA2=@flambda2@
 WITH_FLAMBDA_INVARIANTS=@flambda_invariants@
 FORCE_SAFE_STRING=@force_safe_string@
 DEFAULT_SAFE_STRING=@default_safe_string@

configure

@@ -153,6 +153,7 @@ AC_SUBST([profinfo])
 AC_SUBST([profinfo_width])
 AC_SUBST([frame_pointers])
 AC_SUBST([flambda])
+AC_SUBST([flambda2])
 AC_SUBST([flambda_invariants])
 AC_SUBST([windows_unicode])
 AC_SUBST([flat_float_array])
@@ -304,12 +305,16 @@ AC_ARG_ENABLE([native-compiler],
 
 AC_ARG_ENABLE([flambda],
   [AS_HELP_STRING([--enable-flambda],
-    [enable flambda optimizations])])
+    [enable the Flambda 1 middle end])])
 
 AC_ARG_ENABLE([flambda-invariants],
   [AS_HELP_STRING([--enable-flambda-invariants],
     [enable invariants checks in flambda])])
 
+AC_ARG_ENABLE([flambda2],
+  [AS_HELP_STRING([--enable-flambda2],
+    [enable the Flambda 2 middle end])])
+
 AC_ARG_WITH([target-bindir],
   [AS_HELP_STRING([--with-target-bindir],
     [location of binary programs on target system])])
@@ -1764,11 +1769,20 @@ AS_CASE([$enable_ocamltest,AC_PACKAGE_VERSION],
 
 AS_IF([test x"$enable_flambda" = "xyes"],
   [flambda=true
-  AS_IF([test x"$enable_flambda_invariants" = "xyes"],
-    [flambda_invariants=true],
-    [flambda_invariants=false])],
-  [flambda=false
-  flambda_invariants=false])
+   flambda2=false
+   AS_IF([test x"$enable_flambda2" = "xyes"],
+     [AC_MSG_ERROR([please enable only one of Flambda 1 and Flambda 2])],
+     [])],
+  [flambda=false])
+
+AS_IF([test x"$enable_flambda2" = "xyes"],
+  [flambda2=true
+   flambda=false],
+  [flambda2=false])
+
+AS_IF([test x"$enable_flambda_invariants" = "xyes"],
+  [flambda_invariants=true],
+  [flambda_invariants=false])
 
 AS_IF([test x"$enable_flat_float_array" = "xno"],
   [flat_float_array=false],

configure.ac

@@ -57,6 +57,7 @@ config.ml: config.mlp $(ROOTDIR)/Makefile.config Makefile
 	    $(call SUBST_STRING,EXT_LIB) \
 	    $(call SUBST_STRING,EXT_OBJ) \
 	    $(call SUBST,FLAMBDA) \
+	    $(call SUBST,FLAMBDA2) \
 	    $(call SUBST,WITH_FLAMBDA_INVARIANTS) \
 	    $(call SUBST_STRING,FLEXLINK_FLAGS) \
 	    $(call SUBST_QUOTE,FLEXDLL_DIR) \

utils/Makefile

@@ -74,7 +74,7 @@ let mkdll, mkexe, mkmaindll =
     "%%MKDLL%%", "%%MKEXE%%", "%%MKMAINDLL%%"
 
 let flambda = %%FLAMBDA%%
-let flambda2 = false
+let flambda2 = %%FLAMBDA2%%
 let with_flambda_invariants = %%WITH_FLAMBDA_INVARIANTS%%
 let safe_string = %%FORCE_SAFE_STRING%%
 let default_safe_string = %%DEFAULT_SAFE_STRING%%