From 524f4d72e2abc30a705a451f45e3339da04a353c Mon Sep 17 00:00:00 2001
From: Peter Wang <novalazy@gmail.com>
Date: Mon, 26 Oct 2020 15:24:55 +1100
Subject: [PATCH] Delete references to Erlang backend in makefiles.

Mmake.workspace:
Mmakefile:
*/Mmakefile:
tests/*/Mmakefile:
tests/valid/Mmake.valid.common:
trace/Mmakefile:
    As above.
---
 Mmake.workspace                      |  2 +-
 Mmakefile                            |  4 ++--
 browser/Mmakefile                    | 15 +++----------
 compiler/Mmakefile                   |  4 ++--
 deep_profiler/Mmakefile              |  8 +++----
 grade_lib/Mmakefile                  |  2 +-
 library/Mmakefile                    | 11 ++++------
 mdbcomp/Mmakefile                    | 15 +++----------
 mfilterjavac/Mmakefile               |  4 ++--
 profiler/Mmakefile                   |  4 ++--
 runtime/Mmakefile                    |  5 ++---
 slice/Mmakefile                      |  8 +++----
 ssdb/Mmakefile                       | 15 +++----------
 tests/debugger/Mmakefile             |  3 +--
 tests/declarative_debugger/Mmakefile |  4 ++--
 tests/hard_coded/Mmakefile           | 32 +++++++++++-----------------
 tests/invalid/Mmakefile              |  6 +++---
 tests/par_conj/Mmakefile             |  8 +++----
 tests/stm/Mmakefile                  |  6 +++---
 tests/structure_reuse/Mmakefile      |  2 +-
 tests/submodules/Mmakefile           |  2 +-
 tests/valid/Mmake.valid.common       | 18 ++++++----------
 tests/warnings/Mmakefile             |  9 +-------
 trace/Mmakefile                      |  8 +++----
 24 files changed, 72 insertions(+), 123 deletions(-)

diff --git a/Mmake.workspace b/Mmake.workspace
index a129e60f2..632228f6e 100644
--- a/Mmake.workspace
+++ b/Mmake.workspace
@@ -201,7 +201,7 @@ STATIC_TRACE_LIBS = $(TRACE_DIR)/lib$(TRACE_LIB_NAME).$A \
 endif
 endif
 endif
-ifeq ("$(filter csharp% erlang% java%,$(GRADE))","")
+ifeq ("$(filter csharp% java%,$(GRADE))","")
 MLOBJS += $(STATIC_TRACE_LIBS) $(STATIC_STD_LIBS) \
 		$(STATIC_RT_LIBS) $(STATIC_GC_LIBS)
 endif
diff --git a/Mmakefile b/Mmakefile
index b9ae86a65..fe554cbc2 100644
--- a/Mmakefile
+++ b/Mmakefile
@@ -643,7 +643,7 @@ install_trace: trace
 # be able to compile anything in .gc grades.
 #
 .PHONY: install_boehm_gc
-ifeq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifeq ("$(filter csharp% java%,$(GRADE))","")
 install_boehm_gc: boehm_gc
 	+gc_grade=`scripts/ml --grade $(GRADE) --print-gc-grade`; \
 	cd boehm_gc && $(SUBDIR_MMAKE) install GC_GRADE=$$gc_grade
@@ -725,7 +725,7 @@ install_grades: install_main
 	    IWS=`/bin/pwd`/install_grade_dir.$${grade};                       \
 	    (                                                                 \
 		case $${grade} in                                             \
-			csharp*|java*|erlang*) MMAKE_USE_MMC_MAKE=yes;        \
+			csharp*|java*) MMAKE_USE_MMC_MAKE=yes;		      \
 		esac;                                                         \
 		scripts/prepare_install_dir $${IWS} &&                        \
 		( cd $${IWS}/boehm_gc &&                                      \
diff --git a/browser/Mmakefile b/browser/Mmakefile
index 3bcde5674..f2d8bcf47 100644
--- a/browser/Mmakefile
+++ b/browser/Mmakefile
@@ -67,7 +67,7 @@ MLFLAGS      += -R$(FINAL_INSTALL_MERC_LIB_DIR)	\
 MCFLAGS      += -R$(FINAL_INSTALL_MERC_LIB_DIR)	\
 		-R$(FINAL_INSTALL_MERC_GC_LIB_DIR)
 endif
-ifeq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifeq ("$(filter csharp% java%,$(GRADE))","")
 MLLIBS 	     += $(SOCKET_LIBRARY) $(NSL_LIBRARY) $(DL_LIBRARY) \
 		$(READLINE_LIBRARIES)
 endif
@@ -106,11 +106,11 @@ LN	= ln
 
 #-----------------------------------------------------------------------------#
 
-# The C#, Java, Erlang implementations of the standard library are not yet
+# The C# and Java implementations of the standard library are not yet
 # complete, so we need to pass `--allow-stubs' to get them to compile.
 # Since the standard library is compiled with `--halt-at-warn',
 # we also need `--no-warn-stubs'.
-ifneq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifneq ("$(filter csharp% java%,$(GRADE))","")
 MCFLAGS += --allow-stubs --no-warn-stubs
 endif
 
@@ -276,14 +276,6 @@ realclean_local:
 .PHONY: install
 install: install_library
 
-ifneq ("$(filter erlang%,$(GRADE))","")
-
-# there is no browser in the .NET or Erlang backends
-
-.PHONY: install_library
-install_library:
-
-else
 ifeq ($(MMAKE_USE_MMC_MAKE),yes)
 
 .PHONY: install_library
@@ -298,6 +290,5 @@ install_library:				\
 	lib$(BROWSER_LIB_NAME).install_hdrs
 
 endif
-endif
 
 #-----------------------------------------------------------------------------#
diff --git a/compiler/Mmakefile b/compiler/Mmakefile
index 79a306b77..449bfe0df 100644
--- a/compiler/Mmakefile
+++ b/compiler/Mmakefile
@@ -45,7 +45,7 @@ VPATH = \
 
 MCFLAGS	     += --flags COMP_FLAGS $(CONFIG_OVERRIDE)
 
-ifeq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifeq ("$(filter csharp% java%,$(GRADE))","")
 MLLIBS       += $(THREAD_LIBS)
 else
 MLOBJS =
@@ -116,7 +116,7 @@ endif
 # Add some additional dependencies, so that Mmake knows to remake the
 # compiler if one of the libraries changes.
 
-ifeq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifeq ("$(filter csharp% java%,$(GRADE))","")
 $(MC_PROG): $(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A
 $(MC_PROG): $(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A
 $(MC_PROG): $(MDBCOMP_DIR)/lib$(MDBCOMP_LIB_NAME).$A
diff --git a/deep_profiler/Mmakefile b/deep_profiler/Mmakefile
index 4d25bb562..88948d717 100644
--- a/deep_profiler/Mmakefile
+++ b/deep_profiler/Mmakefile
@@ -90,17 +90,17 @@ endif
 
 #-----------------------------------------------------------------------------#
 
-ifneq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifneq ("$(filter csharp% java%,$(GRADE))","")
 MLOBJS =
 endif
 
 #-----------------------------------------------------------------------------#
 
 # The deep profiler contains quite a lot of C code for which there are
-# currently not C#, Java or Erlang implementations. We need to pass
+# currently not C# or Java implementations. We need to pass
 # `--allow-stubs' in order to compile it.
 #
-ifneq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifneq ("$(filter csharp% java%,$(GRADE))","")
 MCFLAGS += --allow-stubs --no-warn-stubs
 endif
 
@@ -158,7 +158,7 @@ RUN_LIB = \
 	$(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A \
 	$(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A
 
-ifeq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifeq ("$(filter csharp% java%,$(GRADE))","")
 mdprof_cgi:		$(RUN_LIB)
 mdprof_test:		$(RUN_LIB)
 mdprof_dump:		$(RUN_LIB)
diff --git a/grade_lib/Mmakefile b/grade_lib/Mmakefile
index ade005943..2f21f2a96 100644
--- a/grade_lib/Mmakefile
+++ b/grade_lib/Mmakefile
@@ -32,7 +32,7 @@ endif
 
 #-----------------------------------------------------------------------------#
 
-ifneq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifneq ("$(filter csharp% java%,$(GRADE))","")
 MLOBJS =
 endif
 
diff --git a/library/Mmakefile b/library/Mmakefile
index ca892b75d..3800373ac 100644
--- a/library/Mmakefile
+++ b/library/Mmakefile
@@ -100,11 +100,11 @@ endif
 MCFLAGS += --flags LIB_FLAGS $(CONFIG_OVERRIDE)
 MCFLAGS += $(LIBRARY_TRACE_LEVEL) $(INTER_FLAGS)
 
-# The C#, Java and Erlang implementations of the standard library are not
+# The C# and Java implementations of the standard library are not
 # yet complete, so we need to pass `--allow-stubs' to get them to compile.
 # Since the standard library is compiled with `--halt-at-warn',
 # we also need `--no-warn-stubs'.
-ifneq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifneq ("$(filter csharp% java%,$(GRADE))","")
 MCFLAGS += --allow-stubs --no-warn-stubs
 endif
 
@@ -403,13 +403,10 @@ endif
 ifeq ("$(findstring java,$(GRADE))","java")
 lib_std: $(STD_LIB_NAME).jar $(RT_LIB_NAME).jar
 endif
-ifeq ("$(findstring erlang,$(GRADE))","erlang")
-lib_std: $(STD_LIB_NAME).beams
-endif
 endif
 
 # Some extra rules that we need for the C back-ends.
-ifeq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifeq ("$(filter csharp% java%,$(GRADE))","")
 
 # The following dependency is just there to improve compilation speed;
 # making tree234.$O first improves effective parallelism with parallel makes.
@@ -426,7 +423,7 @@ else
 MCFLAGS += --extra-init-command ./print_extra_inits
 endif
 
-endif	# GRADE != csharp && GRADE != java && GRADE != erlang
+endif	# GRADE != csharp && GRADE != java
 
 #-----------------------------------------------------------------------------#
 
diff --git a/mdbcomp/Mmakefile b/mdbcomp/Mmakefile
index c67802d8a..f621f434f 100644
--- a/mdbcomp/Mmakefile
+++ b/mdbcomp/Mmakefile
@@ -58,7 +58,7 @@ MLFLAGS      += -R$(FINAL_INSTALL_MERC_LIB_DIR)	\
 MCFLAGS      += -R$(FINAL_INSTALL_MERC_LIB_DIR)	\
 		-R$(FINAL_INSTALL_MERC_GC_LIB_DIR)
 endif
-ifeq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifeq ("$(filter csharp% java%,$(GRADE))","")
 MLLIBS       += $(SOCKET_LIBRARY) $(NSL_LIBRARY) $(DL_LIBRARY) \
 		$(READLINE_LIBRARIES)
 endif
@@ -95,11 +95,11 @@ LN	= ln
 
 #-----------------------------------------------------------------------------#
 
-# The C#, Java and Erlang implementations of the standard library are not yet
+# The C# and Java implementations of the standard library are not yet
 # complete, so we need to pass `--allow-stubs' to get them to compile.
 # Since the standard library is compiled with `--halt-at-warn',
 # we also need `--no-warn-stubs'.
-ifneq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifneq ("$(filter csharp% java%,$(GRADE))","")
 MCFLAGS += --allow-stubs --no-warn-stubs
 endif
 
@@ -238,14 +238,6 @@ realclean_local:
 .PHONY: install
 install: install_library
 
-ifneq ("$(filter erlang%,$(GRADE))","")
-
-# there is no debugger in the Erlang backends
-
-.PHONY: install_library
-install_library:
-
-else
 ifeq ($(MMAKE_USE_MMC_MAKE),yes)
 
 .PHONY: install_library
@@ -260,4 +252,3 @@ install_library:				\
 	lib$(MDBCOMP_LIB_NAME).install_hdrs
 
 endif
-endif
diff --git a/mfilterjavac/Mmakefile b/mfilterjavac/Mmakefile
index 585e9eefa..82c3ae42a 100644
--- a/mfilterjavac/Mmakefile
+++ b/mfilterjavac/Mmakefile
@@ -51,7 +51,7 @@ endif
 
 #-----------------------------------------------------------------------------#
 
-ifneq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifneq ("$(filter csharp% java%,$(GRADE))","")
 MLOBJS =
 endif
 
@@ -73,7 +73,7 @@ all:	$(ALL_MODULES) $(TAGS_FILE_EXISTS)
 # Add some additional dependencies, so that Mmake knows to remake the
 # profiler if one of the libraries changes.
 
-ifeq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifeq ("$(filter csharp% java%,$(GRADE))","")
 mfilterjavac: \
 	$(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A \
 	$(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A
diff --git a/profiler/Mmakefile b/profiler/Mmakefile
index 793b749ce..45cafdc6f 100644
--- a/profiler/Mmakefile
+++ b/profiler/Mmakefile
@@ -55,7 +55,7 @@ demangle_test.depend: PROF_FLAGS
 # Add some additional dependencies, so that Mmake knows to remake the
 # profiler if one of the libraries changes.
 
-ifeq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifeq ("$(filter csharp% java%,$(GRADE))","")
 mercury_profile: $(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A
 mercury_profile: $(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A
 # XXX Should also depend on $(BOEHM_GC_DIR)/libgc(_prof).$A, but only
@@ -64,7 +64,7 @@ endif
 
 $(cs_subdir)mercury_profile_init.c: $(UTIL_DIR)/mkinit$(EXT_FOR_EXE)
 
-ifneq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifneq ("$(filter csharp% java%,$(GRADE))","")
 MLOBJS =
 endif
 
diff --git a/runtime/Mmakefile b/runtime/Mmakefile
index 90e0bc695..4defdba98 100644
--- a/runtime/Mmakefile
+++ b/runtime/Mmakefile
@@ -345,7 +345,7 @@ mercury_method_call_codes.i: ../tools/make_spec_method_call
 .PHONY: all
 all:	runtime $(TAGS_FILE_EXISTS)
 
-ifneq "$(filter csharp% java% erlang%,$(GRADE))" ""
+ifneq "$(filter csharp% java%,$(GRADE))" ""
 #
 # For these grades, there's nothing to do.
 
@@ -447,7 +447,7 @@ install_dirs:
 	-[ -d $(INSTALL_RECONF_DIR)/runtime ] || \
 		mkdir -p $(INSTALL_RECONF_DIR)/runtime
 
-ifneq "$(filter csharp% java% erlang%,$(GRADE))" ""
+ifneq "$(filter csharp% java%,$(GRADE))" ""
 
 # For non-C grades, the only thing that needs to be done is install the runtime
 # headers (see the comment above the install_headers target for the rationale).
@@ -456,7 +456,6 @@ ifneq "$(filter csharp% java% erlang%,$(GRADE))" ""
 # The C# version of the Mercury runtime *is* in this directory (in
 # mercury_dotnet.cs.in), but it is included directly in the standard library
 # assembly (mer_std.dll) by ../library/Mmakefile.
-# The Erlang version of the Mercury runtime is in the library directory.
 
 .PHONY: install_init
 install_init:
diff --git a/slice/Mmakefile b/slice/Mmakefile
index ea4a05ec1..ff46b7bf4 100644
--- a/slice/Mmakefile
+++ b/slice/Mmakefile
@@ -71,7 +71,7 @@ MCFLAGS += --flags SLICE_FLAGS $(CONFIG_OVERRIDE)
 
 #-----------------------------------------------------------------------------#
 
-ifneq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifneq ("$(filter csharp% java%,$(GRADE))","")
 MLOBJS =
 endif
 
@@ -125,11 +125,11 @@ $(MDBCOMP_MODULES): %: $(MDBCOMP_DIR)/%
 
 #-----------------------------------------------------------------------------#
 
-# The C#, Java and Erlang implementations of the mdbcomp library are not yet
+# The C# and Java implementations of the mdbcomp library are not yet
 # complete, so we need to pass `--allow-stubs' to get them to compile.
 # Since the standard library is compiled with `--halt-at-warn',
 # we also need `--no-warn-stubs'.
-ifneq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifneq ("$(filter csharp% java%,$(GRADE))","")
 MCFLAGS += --allow-stubs --no-warn-stubs
 endif
 
@@ -145,7 +145,7 @@ RUN_LIB_BROW = \
 	$(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A \
 	$(BROWSER_DIR)/lib$(BROWSER_LIB_NAME).$A
 
-ifeq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifeq ("$(filter csharp% java%,$(GRADE))","")
 mslice:		$(RUN_LIB_BROW)
 mdice:		$(RUN_LIB_BROW)
 mcov:		$(RUN_LIB_BROW)
diff --git a/ssdb/Mmakefile b/ssdb/Mmakefile
index bd6201f89..cf2986f62 100644
--- a/ssdb/Mmakefile
+++ b/ssdb/Mmakefile
@@ -67,7 +67,7 @@ MLFLAGS      += -R$(FINAL_INSTALL_MERC_LIB_DIR)	\
 MCFLAGS      += -R$(FINAL_INSTALL_MERC_LIB_DIR)	\
 		-R$(FINAL_INSTALL_MERC_GC_LIB_DIR)
 endif
-ifeq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifeq ("$(filter csharp% java%,$(GRADE))","")
 MLLIBS 	     += $(SOCKET_LIBRARY) $(NSL_LIBRARY) $(DL_LIBRARY) \
 		$(READLINE_LIBRARIES)
 endif
@@ -106,11 +106,11 @@ LN	= ln
 
 #-----------------------------------------------------------------------------#
 
-# The C#, Java, Erlang implementations of the standard library are not yet
+# The C# and Java implementations of the standard library are not yet
 # complete, so we need to pass `--allow-stubs' to get them to compile.
 # Since the standard library is compiled with `--halt-at-warn',
 # we also need `--no-warn-stubs'.
-ifneq ("$(filter csharp% java% erlang%,$(GRADE))","")
+ifneq ("$(filter csharp% java%,$(GRADE))","")
 MCFLAGS += --allow-stubs --no-warn-stubs
 endif
 
@@ -245,14 +245,6 @@ realclean_local:
 .PHONY: install
 install: install_library
 
-ifneq ("$(filter erlang%,$(GRADE))","")
-
-# There is no ssdb in the .NET or Erlang backends.
-
-.PHONY: install_library
-install_library:
-
-else
 ifeq ($(MMAKE_USE_MMC_MAKE),yes)
 
 .PHONY: install_library
@@ -267,4 +259,3 @@ install_library:				\
 	lib$(SSDB_LIB_NAME).install_hdrs
 
 endif
-endif
diff --git a/tests/debugger/Mmakefile b/tests/debugger/Mmakefile
index f71f5a1c8..12d554770 100644
--- a/tests/debugger/Mmakefile
+++ b/tests/debugger/Mmakefile
@@ -194,7 +194,6 @@ ALL_NONRETRY_PROGS = \
 	$(MMOS_PROGS)
 
 # Debugging doesn't yet don't work in MLDS grades (hl*, csharp, java),
-# or the Erlang grade,
 # and the retry command doesn't and will not work in deep profiling
 # grades (profdeep).
 # Also base grades `jump' and `fast' cannot be used with
@@ -218,7 +217,7 @@ else
     DEBUGGER_PROGS = $(DEBUGGER_PROGS0)
 endif
 
-ifneq "$(filter hl% java% csharp% erlang%,$(GRADE))" ""
+ifneq "$(filter hl% java% csharp%,$(GRADE))" ""
     PROGS =
 else
     ifneq "$(findstring asm_,$(GRADE))" ""
diff --git a/tests/declarative_debugger/Mmakefile b/tests/declarative_debugger/Mmakefile
index 8b05204c2..e4ac42835 100644
--- a/tests/declarative_debugger/Mmakefile
+++ b/tests/declarative_debugger/Mmakefile
@@ -144,12 +144,12 @@ else
 endif
 
 # Debugging does not work in MLDS (hl*, csharp*, java*) grades
-# or Erlang grades or deep profiling (profdeep) grades.
+# or deep profiling (profdeep) grades.
 # Base grades `jump' and `fast' cannot be used with
 # stack layouts (which are required for tracing).
 # Also, declarative debugging only works in `.gc' grades.
 
-ifeq "$(filter hl% csharp% java% erlang%,$(GRADE))$(findstring profdeep,$(GRADE))" ""
+ifeq "$(filter hl% csharp% java%,$(GRADE))$(findstring profdeep,$(GRADE))" ""
     ifneq "$(findstring .gc,$(GRADE))" ""
        ifneq "$(findstring asm_,$(GRADE))" ""
            PROGS = $(PROGS_2)
diff --git a/tests/hard_coded/Mmakefile b/tests/hard_coded/Mmakefile
index 3472821d8..b4ad0702c 100644
--- a/tests/hard_coded/Mmakefile
+++ b/tests/hard_coded/Mmakefile
@@ -488,7 +488,7 @@ endif
 # grades because deep profiling cannot yet handle exceptions being caught and
 # this test does that.
 #
-ifeq "$(filter csharp% java% erlang%,$(GRADE))" ""
+ifeq "$(filter csharp% java%,$(GRADE))" ""
 	ifeq "$(findstring profdeep,$(GRADE))" ""
 		SOLVER_PROGS_2 = \
 			solver_default_eq_cmp
@@ -505,7 +505,7 @@ else
 endif
 
 # Foreign enum pragmas only (currently) work in the C and C# grades.
-ifeq "$(filter java% erlang%,$(GRADE))" ""
+ifeq "$(filter java%,$(GRADE))" ""
 	FOREIGN_ENUM_PROGS = \
 		exported_foreign_enum \
 		foreign_enum_dummy \
@@ -514,18 +514,12 @@ else
 	FOREIGN_ENUM_PROGS =
 endif
 
-# Tests of the random module do not work in the Erlang grade due to support for
-# fixed size integer types in that grade being incomplete.
-ifeq "$(filter erlang%,$(GRADE))" ""
-	RANDOM_PROGS = \
-		random1 \
-		random2 \
-		random3 \
-		random_shuffle \
-		random_shuffle2
-else
-	RANDOM_PROGS =
-endif
+RANDOM_PROGS = \
+	random1 \
+	random2 \
+	random3 \
+	random_shuffle \
+	random_shuffle2
 
 # Some tests only link in trailing grades.
 ifeq "$(filter tr%,$(GRADE))" ""
@@ -557,7 +551,7 @@ TRACE_GOAL_ENV_PROGS = \
 # The programs listed in CTGC_PROGS_2 do not currently work in non-C grades.
 #
 ifeq "$(findstring debug,$(GRADE))" ""
-	ifeq "$(filter csharp% java% erlang%,$(GRADE))" ""
+	ifeq "$(filter csharp% java%,$(GRADE))" ""
 		CTGC_PROGS_2 = \
 			bad_direct_reuse \
 			bad_indirect_reuse2 \
@@ -617,7 +611,7 @@ endif
 # The foreign_type_assertion test is currently meaningful only in C grades.
 # Tests of the C foreign language interface only work in C grades.
 # Runtime options are specific to the C backend.
-ifeq "$(filter csharp% java% erlang%,$(GRADE))" ""
+ifeq "$(filter csharp% java%,$(GRADE))" ""
 	C_ONLY_PROGS = \
 		factt \
 		factt_sort_test \
@@ -717,7 +711,7 @@ CLOSURE_LAYOUT_PROGS = \
 # they use backjumping, which is NI for the non-C grades.
 #
 ifeq "$(findstring profdeep,$(GRADE))" ""
-	ifeq "$(filter csharp% java% erlang%,$(GRADE))" ""
+	ifeq "$(filter csharp% java%,$(GRADE))" ""
 		NON_PROFDEEP_PROGS_2 = \
 			backend_external \
 			backend_external_func \
@@ -813,7 +807,7 @@ endif
 # be replaced by a test that exercises functionality enabled by type tables.
 # However, this must wait for the implementation of that functionality.
 
-ifeq "$(filter hl% csharp% java% erlang%,$(GRADE))" ""
+ifeq "$(filter hl% csharp% java%,$(GRADE))" ""
 	ifeq "$(findstring profdeep,$(GRADE))" ""
 		BACKEND_PROGS_2 = \
 			factt_non \
@@ -855,7 +849,7 @@ ifneq "$(findstring apple-darwin,$(FULLARCH))" "apple-darwin"
   ifneq "$(findstring solaris,$(FULLARCH))" "solaris"
 	# The `parse' test also links with the debug libraries,
 	# so it only works in LLDS grades.
-	ifeq "$(filter hl% csharp% java% erlang%,$(GRADE))" ""
+	ifeq "$(filter hl% csharp% java%,$(GRADE))" ""
 		STATIC_LINK_PROGS = parse
 	endif
   endif
diff --git a/tests/invalid/Mmakefile b/tests/invalid/Mmakefile
index e4efcc4e5..eddb16c61 100644
--- a/tests/invalid/Mmakefile
+++ b/tests/invalid/Mmakefile
@@ -410,15 +410,15 @@ NON_PROFDEEP_MODULES = \
 
 # These tests test things which only work for back-ends which support
 # the C interface.
-ifneq "$(filter java% csharp% erlang%,$(GRADE))" ""
+ifneq "$(filter java% csharp%,$(GRADE))" ""
 	C_INTERFACE_PROGS=
 else
 	C_INTERFACE_PROGS=$(C_INTERFACE_MODULES)
 endif
 
-# The java, csharp and erlang grades compile with num_tag_bits = 0.
+# The java and csharp grades compile with num_tag_bits = 0.
 # NOTE We don't support reserving tags anymore.
-# ifneq "$(filter java% csharp% erlang%,$(GRADE))" ""
+# ifneq "$(filter java% csharp%,$(GRADE))" ""
 # 	RESERVE_TAG_PROGS =
 # else
 # 	RESERVE_TAG_PROGS = $(RESERVE_TAG_MODULES)
diff --git a/tests/par_conj/Mmakefile b/tests/par_conj/Mmakefile
index 3abbc8e34..3f1936f75 100644
--- a/tests/par_conj/Mmakefile
+++ b/tests/par_conj/Mmakefile
@@ -67,13 +67,13 @@ INDEP_PAR_CONJ_PROGS = \
 	threads_hang
 
 # These tests require debugging, which hasn't been implemented for
-# the MLDS backend or Erlang backend.
+# the MLDS backend.
 #
 LLDS_PROGS = \
 	par_ddeath \
 	par_ddeath_2
 
-ifeq "$(filter hl% java% csharp% erlang%,$(GRADE))" ""
+ifeq "$(filter hl% java% csharp%,$(GRADE))" ""
 	PROGS0 = $(LLDS_PROGS)
 else
 	PROGS0 =
@@ -126,7 +126,7 @@ $(OBJ_PROGS:%=%.runtest): %.runtest: %.$(TARGET_OBJ_EXT) ;
 
 # Exercise multiple Mercury engines in lowlevel grades.
 ENGINES :=
-ifeq "$(filter hl% java% csharp% il% erlang%,$(GRADE))" ""
+ifeq "$(filter hl% java% csharp%,$(GRADE))" ""
 	ENGINES := MERCURY_OPTIONS=-P2
 endif
 
@@ -134,7 +134,7 @@ endif
 	{ [ -f $*.inp ] && cat $*.inp; } | $(ENGINES) ./$< > $@ 2>&1 || \
 		{ grep . $@ /dev/null; exit 1; }
 
-ifeq "$(filter hl% java% csharp% il% erlang%,$(GRADE))" ""
+ifeq "$(filter hl% java% csharp%,$(GRADE))" ""
 
 # Run threads_hang with multiple OS threads in lowlevel parallel grades.
 # Repeat the test a few times in increase the chances of getting a deadlock.
diff --git a/tests/stm/Mmakefile b/tests/stm/Mmakefile
index 8d025bff2..c039d293f 100644
--- a/tests/stm/Mmakefile
+++ b/tests/stm/Mmakefile
@@ -36,11 +36,11 @@ MULTI_PROGS =			\
 	conflict
 
 # These tests require debugging, which hasn't been implemented for
-# the MLDS backend or Erlang backend.
+# the MLDS backend.
 #
 LLDS_PROGS =
 
-ifeq "$(filter hl% java% csharp% il% erlang%,$(GRADE))" ""
+ifeq "$(filter hl% java% csharp%,$(GRADE))" ""
 	PROGS0 = $(LLDS_PROGS)
 else
 	PROGS0 =
@@ -106,7 +106,7 @@ endif
 
 # Exercise multiple Mercury engines in lowlevel grades.
 ENGINES :=
-ifeq "$(filter hl% java% csharp% il% erlang%,$(GRADE))" ""
+ifeq "$(filter hl% java% csharp%,$(GRADE))" ""
 	ENGINES := MERCURY_OPTIONS=-P8
 endif
 
diff --git a/tests/structure_reuse/Mmakefile b/tests/structure_reuse/Mmakefile
index b9bfd15ec..44c7240f0 100644
--- a/tests/structure_reuse/Mmakefile
+++ b/tests/structure_reuse/Mmakefile
@@ -12,7 +12,7 @@ STRUCTURE_REUSE_PROGS = \
 	interpret
 
 # We currently don't do any testing in some grades on this directory.
-ifneq "$(filter java% csharp% erlang%,$(GRADE))" ""
+ifneq "$(filter java% csharp%,$(GRADE))" ""
 	PROGS=
 else
 	PROGS=$(STRUCTURE_REUSE_PROGS)
diff --git a/tests/submodules/Mmakefile b/tests/submodules/Mmakefile
index 4413517df..9c5e5ac96 100644
--- a/tests/submodules/Mmakefile
+++ b/tests/submodules/Mmakefile
@@ -42,7 +42,7 @@ SUB_MODULE_PROGS = \
 	use_submodule
 
 # Solver types only work in C grades.
-ifeq "$(filter csharp% java% erlang%,$(GRADE))" ""
+ifeq "$(filter csharp% java%,$(GRADE))" ""
 	SOLVER_PROGS = \
 		ts
 else
diff --git a/tests/valid/Mmake.valid.common b/tests/valid/Mmake.valid.common
index 8c6e872e5..8be3efeff 100644
--- a/tests/valid/Mmake.valid.common
+++ b/tests/valid/Mmake.valid.common
@@ -52,10 +52,10 @@
 ifeq "$(findstring hl,$(GRADE))$(findstring .agc,$(GRADE))" "hl"
 	PROGS1 = $(TYPECLASS_PROGS) $(OTHER_PROGS)
 else
-	# The agc.* tests don't work in the java, csharp or erlang grades.
+	# The agc.* tests don't work in the java or csharp grades.
 	# The agc.* tests also don't work in minimal model grades,
 	# because the collector doesn't scan the copied areas of the stacks.
-	ifneq "$(filter java% csharp% erlang%,$(GRADE))$(findstring mm,$(GRADE))" ""
+	ifneq "$(filter java% csharp%,$(GRADE))$(findstring mm,$(GRADE))" ""
 		PROGS1 = $(TYPECLASS_PROGS) $(OTHER_PROGS)
 	else
 		PROGS1 = $(AGC_PROGS) $(TYPECLASS_PROGS) $(OTHER_PROGS)
@@ -65,20 +65,20 @@ endif
 ifneq "$(findstring mm,$(GRADE))" ""
 	PROGS2 = $(PROGS1)
 else
-	ifeq "$(filter java% csharp% erlang%,$(GRADE))" ""
+	ifeq "$(filter java% csharp%,$(GRADE))" ""
 		PROGS2 = $(PROGS1) $(TRAIL_PROGS)
 	else
 		PROGS2 = $(PROGS1)
 	endif
 endif
 
-ifneq "$(filter java% csharp% erlang%,$(GRADE))$(findstring profdeep,$(GRADE))" ""
+ifneq "$(filter java% csharp%,$(GRADE))$(findstring profdeep,$(GRADE))" ""
 	PROGS3 = $(PROGS2)
 else
 	PROGS3 = $(PROGS2) $(TABLE_PROGS)
 endif
 
-ifeq "$(filter hl% java% csharp% erlang%,$(GRADE))" ""
+ifeq "$(filter hl% java% csharp%,$(GRADE))" ""
 	PROGS4 = $(PROGS3) $(C_INTERFACE_PROGS) $(SOLVER_PROGS) \
 		$(DEEP_PROF_CAPABLE_PROGS) $(LLDS_PROGS)
 else
@@ -97,7 +97,7 @@ else
 	PROGS6 = $(PROGS5)
 endif
 
-ifeq "$(filter hl% java% csharp% erlang%,$(GRADE))$(findstring decldebug,$(GRADE))" ""
+ifeq "$(filter hl% java% csharp%,$(GRADE))$(findstring decldebug,$(GRADE))" ""
 	PROGS7 = $(PROGS6) $(NON_DECLDEBUG_PROGS)
 else
 	PROGS7 = $(PROGS6)
@@ -128,11 +128,6 @@ ifeq ($(findstring csharp,$(GRADE)),csharp)
 	TARGET_OBJ_EXT = cs
 	TARGET_OBJ_SUBDIR = $(DLLS_SUBDIR)
 else
-ifeq ($(findstring erlang,$(GRADE)),erlang)
-	TARGET_OBJ_EXT = beam
-	# Erlang backend currently requires `mmc --make'.
-	TARGET_OBJ_SUBDIR =
-else
 ifeq ($(findstring java,$(GRADE)),java)
 	TARGET_OBJ_EXT = class
 	TARGET_OBJ_SUBDIR = $(CLASSES_SUBDIR)
@@ -141,7 +136,6 @@ else
 	TARGET_OBJ_SUBDIR = $(OS_SUBDIR)
 endif
 endif
-endif
 OBJS =	$(OBJ_PROGS:%=$(TARGET_OBJ_SUBDIR)%.$(TARGET_OBJ_EXT))
 
 #-----------------------------------------------------------------------------#
diff --git a/tests/warnings/Mmakefile b/tests/warnings/Mmakefile
index 65eed2bc2..c68aa1f54 100644
--- a/tests/warnings/Mmakefile
+++ b/tests/warnings/Mmakefile
@@ -58,6 +58,7 @@ ERRORCHECK_PROGS = \
 	warn_non_contiguous \
 	warn_non_contiguous_foreign \
 	warn_non_contiguous_foreign_group \
+	warn_return \
 	warn_self_import \
 	warn_stubs \
 	warn_succ_ind
@@ -70,14 +71,6 @@ ifeq ($(MMAKE_USE_MMC_MAKE),yes)
 	ERRORCHECK_PROGS += unused_args_analysis
 endif
 
-# We don't run these tests in the erlang grade:
-#
-#     warn_return  (Erlang doesn't have return statements).
-#
-ifeq "$(filter erlang%,$(GRADE))" ""
-	ERRORCHECK_PROGS += warn_return
-endif
-
 PROGS = $(COMPILE_PROGS) $(ERRORCHECK_PROGS) up_to_date
 
 TESTS = $(sort $(PROGS))
diff --git a/trace/Mmakefile b/trace/Mmakefile
index a2da89ff6..eb5f6f198 100644
--- a/trace/Mmakefile
+++ b/trace/Mmakefile
@@ -216,8 +216,8 @@ mercury_event_spec.$(EXT_FOR_PIC_OBJECTS): $(GEN_EVENTSPEC_HDRS)
 
 .PHONY: all
 .PHONY: trace
-ifneq ("$(filter csharp% java% erlang%,$(GRADE))","")
-# there is no tracing in the C#, Java, Erlang backends
+ifneq ("$(filter csharp% java%,$(GRADE))","")
+# there is no tracing in the C# or Java backends
 
 all:
 
@@ -319,9 +319,9 @@ tags_file_exists:
 .PHONY: install
 install: install_headers install_lib
 
-ifneq ("$(filter il% csharp% java% erlang%,$(GRADE))","")
+ifneq ("$(filter csharp% java%,$(GRADE))","")
 
-# there is no tracing in the .NET, Java, Erlang backends
+# there is no tracing in the C# or Java backends
 
 .PHONY: install_headers
 install_headers: