[m-rev.] trivial diff: fix failure of hard_coded/intermod_unused_args

Julien Fischer juliensf at cs.mu.OZ.AU
Tue Feb 14 14:52:07 AEDT 2006


Estimated hours taken: 0.1
Branches: main

tests/hard_coded/Mercury.options:
	Fix the failure of tests/hard_coded/intermod_unused_args on hosts
	that run the tests with --intermodule-optimization.  This test case
	was failing because this test uses --intermodule-analysis and that
	is no longer compatible with --intermodule-optimization (it gets
	an error message from the compiler).

Julien.

Index: Mercury.options
===================================================================
RCS file: /home/mercury1/repository/tests/hard_coded/Mercury.options,v
retrieving revision 1.15
diff -u -r1.15 Mercury.options
--- Mercury.options	4 Jan 2006 07:14:35 -0000	1.15
+++ Mercury.options	14 Feb 2006 03:49:11 -0000
@@ -25,8 +25,13 @@
 MCFLAGS-intermod_type_qual2 =	--intermodule-optimization
 MCFLAGS-intermod_multimode =	--intermodule-optimization
 MCFLAGS-intermod_multimode_main = --intermodule-optimization
-MCFLAGS-intermod_unused_args =	--intermodule-analysis --optimise-unused-args
-MCFLAGS-intermod_unused_args2 =	--intermodule-analysis --optimise-unused-args
+
+# We disable intermodule-optimization here because it isn't compatible with
+# intermodule-analysis.
+#
+MCFLAGS-intermod_unused_args =	--no-intermodule-optimization --intermodule-analysis --optimise-unused-args
+MCFLAGS-intermod_unused_args2 = --no-intermodule-optimization --intermodule-analysis --optimise-unused-args
+
 MCFLAGS-loop_inv_test 	= 	--loop-invariants --trace-optimized
 MCFLAGS-loop_inv_test0 	= 	--loop-invariants --trace-optimized
 MCFLAGS-loop_inv_test1 	= 	--loop-invariants --trace-optimized

--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------



More information about the reviews mailing list