[m-rev.] diff: delete residual GCC backend stuff

Julien Fischer jfischer at opturion.com
Wed Feb 20 16:27:42 AEDT 2013


Note: once you pull this patch you will need to be using a fairly recent
Mercury compiler; otherwise mmake will generate a lot of warnings.
-----------

Delete residual support for the GCC backend.

scripts/Mmake.vars.in:
scripts/final_grade_option.sh-subr:
scripts/init_grade_options.sh-subr:
scripts/mmake.in:
scripts/parse_grade_options.sh-subr:
	As above.

Julien.

diff --git a/scripts/Mmake.vars.in b/scripts/Mmake.vars.in
index f808d21..c21b166 100644
--- a/scripts/Mmake.vars.in
+++ b/scripts/Mmake.vars.in
@@ -67,15 +67,6 @@ DEFAULT_GRADE	= $(MERCURY_DEFAULT_GRADE)
 GRADE		= $(DEFAULT_GRADE)
 GRADESTRING	= $(shell $(MCOGS) $(ALL_GRADEFLAGS) $(ALL_MCFLAGS))

-# This may be overridden on the command line
-TARGET_ASM	= no
-
-ifeq ($(TARGET_ASM),yes)
-ASM_OPT  = --target asm
-else
-ASM_OPT  =
-endif
-
 MERCURY_MAIN_MODULES =

 #
@@ -111,7 +102,7 @@ endif
 # Stuff which is not specific to any back-end
 #

-ALL_GRADEFLAGS  = $(USUAL_GRADEFLAGS) $(ASM_OPT)
+ALL_GRADEFLAGS  = $(USUAL_GRADEFLAGS)
 USUAL_GRADEFLAGS = $(GRADEFLAGS) $(EXTRA_GRADEFLAGS) $(TARGET_GRADEFLAGS)
 GRADEFLAGS	= --grade $(GRADE)
 EXTRA_GRADEFLAGS =
diff --git a/scripts/final_grade_options.sh-subr
b/scripts/final_grade_options.sh-subr
index dc49f5d..74e7e0e 100644
--- a/scripts/final_grade_options.sh-subr
+++ b/scripts/final_grade_options.sh-subr
@@ -57,9 +57,9 @@ case $decl_debug in true)
 esac

 #
-# --target asm, IL, C#, Java, Erlang implies --high-level-code
+# --target IL, C#, Java, Erlang implies --high-level-code
 #
-case $target in asm|il|csharp|java|erlang)
+case $target in il|csharp|java|erlang)
 	highlevel_code=true ;;
 esac

diff --git a/scripts/init_grade_options.sh-subr
b/scripts/init_grade_options.sh-subr
index 15edf09..720251a 100644
--- a/scripts/init_grade_options.sh-subr
+++ b/scripts/init_grade_options.sh-subr
@@ -23,7 +23,7 @@
 grade_usage="\
 Grade options:
 	-s <grade>, --grade <grade>
-	--target {il, c, csharp, java, erlang, asm}
+	--target {il, c, csharp, java, erlang}
 	--il
 	--asm-labels
 	--gcc-non-local-gotos
diff --git a/scripts/mmake.in b/scripts/mmake.in
index c3b8133..0097326 100644
--- a/scripts/mmake.in
+++ b/scripts/mmake.in
@@ -27,8 +27,6 @@ Options:
 		rather than in the current directory.
 		(If the current directory already contains a \`Mercury'
 		subdirectory, then this option is the default.)
-	--target asm:
-		Compile directly to assembler, rather than going via C.
 	--target c:
 		Compile via C, rather than going directly to assembler.
 		This is the default."
@@ -94,7 +92,6 @@ else
 fi
 use_mmc_make=${MMAKE_USE_MMC_MAKE=no}
 warn_undefined_vars=true
-target_asm=${MMAKE_TARGET_ASM=default}

 while [ $# -gt 0 ]; do
 	case "$1" in
@@ -120,13 +117,12 @@ while [ $# -gt 0 ]; do
 			;;
 		--target)
 			case "$2" in
-				asm)	target_asm=yes ;;
-				c)	target_asm=no ;;
+				c)	;;
 				il)	# XXX we should do something
 					# sensible for `--target il'
 					echo "$0: warning: \`--target il'" \
 						"option not supported." 1>&2
-					target_asm=no ;;
+					;;
 				*)	echo "$0: invalid argument to" \
 						"\`--target' option" 1>&2
 					exit 1 ;;
@@ -310,12 +306,6 @@ else
 	esac
 fi

-case $target_asm in
-	yes)		set_target_asm="TARGET_ASM=yes" ;;
-	no)		set_target_asm="TARGET_ASM=no" ;;
-	default)	set_target_asm="" ;;
-esac
-
 MMAKE_MAKE_CMD="${MMAKE_MAKE} -f $tmp -r"

 # Enable checking for undefined variables -- but not when making the
@@ -356,7 +346,7 @@ if $verbose; then
 	echo export MMAKEFILE
 	echo cat ${MMAKE_VARS} $include_makefile $MMAKEFILE $ds $dvs $deps \
 		${MMAKE_RULES}">>" $tmp
-	echo ${MMAKE_MAKE} ${MMAKE_MAKE_OPTS} -f $tmp -r ${set_target_asm} "$@"
+	echo ${MMAKE_MAKE} ${MMAKE_MAKE_OPTS} -f $tmp -r "$@"
 fi
 export MMAKE
 export MMAKE_MAKE_CMD
@@ -382,6 +372,6 @@ cat $deps ${MMAKE_RULES}
 case $# in
 	# Note that we can't use `exec' here, because if we did that,
 	# that `trap' code which removes $tmp would never get executed.
-	0) ${MMAKE_MAKE} ${MMAKE_MAKE_OPTS} -f $tmp -r ${set_target_asm} ;;
-	*) ${MMAKE_MAKE} ${MMAKE_MAKE_OPTS} -f $tmp -r ${set_target_asm} "$@" ;;
+	0) ${MMAKE_MAKE} ${MMAKE_MAKE_OPTS} -f $tmp -r ;;
+	*) ${MMAKE_MAKE} ${MMAKE_MAKE_OPTS} -f $tmp -r "$@" ;;
 esac
diff --git a/scripts/parse_grade_options.sh-subr
b/scripts/parse_grade_options.sh-subr
index 84755b2..87a45d1 100644
--- a/scripts/parse_grade_options.sh-subr
+++ b/scripts/parse_grade_options.sh-subr
@@ -24,8 +24,6 @@
     --target)
         shift
         case "$1" in
-            asm)
-                target=asm ;;
             c|C)
                 target=c ;;
             il|IL)



More information about the reviews mailing list