Update to Mercury 0.13.1

The list of changes is too long, it includes 5 years of development.
See NEWS and HISTORY files for details.

21 files changed, 1258 insertions, 517 deletions

diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 4aae2ad72aa..88035170beb 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.35 2009/05/20 00:58:19 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/07/20 12:29:20 asau Exp $
 
-DISTNAME=		mercury-compiler-0.11.0
-PKGNAME=		mercury-0.11.0
-PKGREVISION=		6
+DISTNAME=		mercury-compiler-0.13.1
+PKGNAME=		mercury-0.13.1
 CATEGORIES=		lang
 MASTER_SITES=		ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/ \
+			http://www.mercury.cs.mu.oz.au/download/files/ \
 			${MASTER_SITE_SUNSITE:=devel/lang/mercury/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
@@ -15,6 +15,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake pax
+USE_TOOLS+=		perl # ?
 USE_GNU_READLINE=	yes	# rl_prep_term_function
 INFO_FILES=		# PLIST
 
@@ -31,10 +32,7 @@ BUILD_MAKE_FLAGS=	${MAKE_FLAGS}
 BUILD_MAKE_FLAGS+=	INSTALL_PREFIX=${INSTALL_PREFIX:Q}
 BUILD_MAKE_FLAGS+=	INSTALL_INFO_DIR=${INSTALL_PREFIX:Q}/${PKGINFODIR:Q}
 BUILD_MAKE_FLAGS+=	INSTALL_MAN_DIR=${INSTALL_PREFIX:Q}/${PKGMANDIR:Q}
-BUILD_MAKE_FLAGS+=	MERCURY_COMPILER=${INSTALL_PREFIX:Q}/lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_compile
-
-.include "../../devel/readline/buildlink3.mk"
-.include "../../devel/ncurses/buildlink3.mk"
+BUILD_MAKE_FLAGS+=	MERCURY_COMPILER=${INSTALL_PREFIX:Q}/bin/mercury_compile
 
 post-patch:
 	${TOUCH} \
@@ -55,4 +53,6 @@ do-install:
 	cd ${WRKSRC}/samples && \
 	pax -rw . ${DESTDIR}${PREFIX}/share/examples/mercury
 
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/mercury/PLIST b/lang/mercury/PLIST
index 8e0494dd82b..7610ed490ba 100644
--- a/lang/mercury/PLIST
+++ b/lang/mercury/PLIST
@@ -1,11 +1,16 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:03:36 joerg Exp $
+@comment $NetBSD: PLIST,v 1.11 2010/07/20 12:29:20 asau Exp $
 bin/c2init
 bin/canonical_grade
 bin/info_to_mdb
 bin/mdb
 bin/mdemangle
+bin/mdice
+bin/mdprof
 bin/mercury.bat
 bin/mercury_cleanup_install
+bin/mercury_compile
+bin/mercury_config
+bin/mercury_profile
 bin/mercury_update_interface
 bin/mgnuc
 bin/mkfifo_using_mknod
@@ -15,7 +20,11 @@ bin/mmake
 bin/mmc
 bin/mprof
 bin/mprof_merge_runs
+bin/mslice
 bin/mtags
+bin/mtc
+bin/mtc_union
+bin/prepare_tmp_dir_fixed_part
 bin/vpath_find
 info/mercury.info
 info/mercury_faq.info
@@ -23,9 +32,10 @@ info/mercury_library.info
 info/mercury_ref.info
 info/mercury_trans_guide.info
 info/mercury_user_guide.info
-lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_compile
-lib/mercury/bin/${MACHINE_GNU_PLATFORM}/mercury_profile
+lib/mercury/conf/Mercury.config
+lib/mercury/conf/mercury_conf.h
 lib/mercury/inc/array.mh
+lib/mercury/inc/array2d.mh
 lib/mercury/inc/assoc_list.mh
 lib/mercury/inc/bag.mh
 lib/mercury/inc/benchmarking.mh
@@ -38,6 +48,7 @@ lib/mercury/inc/bt_array.mh
 lib/mercury/inc/builtin.mh
 lib/mercury/inc/char.mh
 lib/mercury/inc/construct.mh
+lib/mercury/inc/cord.mh
 lib/mercury/inc/counter.mh
 lib/mercury/inc/deconstruct.mh
 lib/mercury/inc/dir.mh
@@ -47,14 +58,17 @@ lib/mercury/inc/exception.mh
 lib/mercury/inc/float.mh
 lib/mercury/inc/gc.h
 lib/mercury/inc/gc.mh
+lib/mercury/inc/gc_config_macros.h
 lib/mercury/inc/gc_inl.h
 lib/mercury/inc/gc_local_alloc.h
 lib/mercury/inc/gc_mark.h
 lib/mercury/inc/gc_pthread_redirects.h
 lib/mercury/inc/getopt.mh
+lib/mercury/inc/getopt_io.mh
 lib/mercury/inc/graph.mh
 lib/mercury/inc/group.mh
 lib/mercury/inc/hash_table.mh
+lib/mercury/inc/injection.mh
 lib/mercury/inc/int.mh
 lib/mercury/inc/integer.mh
 lib/mercury/inc/io.mh
@@ -62,14 +76,18 @@ lib/mercury/inc/lexer.mh
 lib/mercury/inc/library.mh
 lib/mercury/inc/list.mh
 lib/mercury/inc/machdeps/alpha_regs.h
+lib/mercury/inc/machdeps/arm_regs.h
 lib/mercury/inc/machdeps/i386_regs.h
+lib/mercury/inc/machdeps/ia64_regs.h
 lib/mercury/inc/machdeps/mips_regs.h
 lib/mercury/inc/machdeps/no_regs.h
 lib/mercury/inc/machdeps/pa_regs.h
 lib/mercury/inc/machdeps/rs6000_regs.h
 lib/mercury/inc/machdeps/sparc_regs.h
+lib/mercury/inc/machdeps/x86_64_regs.h
 lib/mercury/inc/map.mh
 lib/mercury/inc/math.mh
+lib/mercury/inc/maybe.mh
 lib/mercury/inc/mer_std.mh
 lib/mercury/inc/mercury.h
 lib/mercury/inc/mercury_accurate_gc.h
@@ -77,8 +95,9 @@ lib/mercury/inc/mercury_agc_debug.h
 lib/mercury/inc/mercury_array_macros.h
 lib/mercury/inc/mercury_bootstrap.h
 lib/mercury/inc/mercury_builtin_types.h
+lib/mercury/inc/mercury_builtin_types_proc_layouts.h
 lib/mercury/inc/mercury_calls.h
-lib/mercury/inc/mercury_conf.h
+lib/mercury/inc/mercury_complexity.h
 lib/mercury/inc/mercury_conf_bootstrap.h
 lib/mercury/inc/mercury_conf_param.h
 lib/mercury/inc/mercury_construct.h
@@ -107,6 +126,7 @@ lib/mercury/inc/mercury_goto.h
 lib/mercury/inc/mercury_grade.h
 lib/mercury/inc/mercury_hand_compare_body.h
 lib/mercury/inc/mercury_hand_unify_body.h
+lib/mercury/inc/mercury_hash_lookup_or_add_body.h
 lib/mercury/inc/mercury_hash_table.h
 lib/mercury/inc/mercury_heap.h
 lib/mercury/inc/mercury_heap_profile.h
@@ -121,18 +141,20 @@ lib/mercury/inc/mercury_make_type_info_body.h
 lib/mercury/inc/mercury_memory.h
 lib/mercury/inc/mercury_memory_handlers.h
 lib/mercury/inc/mercury_memory_zones.h
+lib/mercury/inc/mercury_minimal_model.h
 lib/mercury/inc/mercury_misc.h
 lib/mercury/inc/mercury_ml_arg_body.h
 lib/mercury/inc/mercury_ml_deconstruct_body.h
 lib/mercury/inc/mercury_ml_expand_body.h
 lib/mercury/inc/mercury_ml_functor_body.h
+lib/mercury/inc/mercury_mm_own_stacks.h
 lib/mercury/inc/mercury_overflow.h
+lib/mercury/inc/mercury_proc_id.h
 lib/mercury/inc/mercury_prof.h
 lib/mercury/inc/mercury_prof_mem.h
 lib/mercury/inc/mercury_prof_time.h
 lib/mercury/inc/mercury_profiling_builtin.h
 lib/mercury/inc/mercury_reg_workarounds.h
-lib/mercury/inc/mercury_regorder.h
 lib/mercury/inc/mercury_regs.h
 lib/mercury/inc/mercury_runtime_util.h
 lib/mercury/inc/mercury_signal.h
@@ -143,33 +165,53 @@ lib/mercury/inc/mercury_std.h
 lib/mercury/inc/mercury_string.h
 lib/mercury/inc/mercury_tabling.h
 lib/mercury/inc/mercury_tabling_macros.h
+lib/mercury/inc/mercury_tabling_preds.h
 lib/mercury/inc/mercury_tags.h
+lib/mercury/inc/mercury_term_size.h
 lib/mercury/inc/mercury_thread.h
 lib/mercury/inc/mercury_timing.h
 lib/mercury/inc/mercury_trace.h
 lib/mercury/inc/mercury_trace_alias.h
 lib/mercury/inc/mercury_trace_base.h
 lib/mercury/inc/mercury_trace_browse.h
+lib/mercury/inc/mercury_trace_cmd_backward.h
+lib/mercury/inc/mercury_trace_cmd_breakpoint.h
+lib/mercury/inc/mercury_trace_cmd_browsing.h
+lib/mercury/inc/mercury_trace_cmd_dd.h
+lib/mercury/inc/mercury_trace_cmd_developer.h
+lib/mercury/inc/mercury_trace_cmd_exp.h
+lib/mercury/inc/mercury_trace_cmd_help.h
+lib/mercury/inc/mercury_trace_cmd_misc.h
+lib/mercury/inc/mercury_trace_cmd_parameter.h
+lib/mercury/inc/mercury_trace_cmd_queries.h
+lib/mercury/inc/mercury_trace_cmd_table_io.h
+lib/mercury/inc/mercury_trace_cmds.h
 lib/mercury/inc/mercury_trace_completion.h
 lib/mercury/inc/mercury_trace_declarative.h
 lib/mercury/inc/mercury_trace_external.h
 lib/mercury/inc/mercury_trace_help.h
+lib/mercury/inc/mercury_trace_hold_vars.h
 lib/mercury/inc/mercury_trace_internal.h
 lib/mercury/inc/mercury_trace_readline.h
 lib/mercury/inc/mercury_trace_source.h
 lib/mercury/inc/mercury_trace_spy.h
 lib/mercury/inc/mercury_trace_tables.h
+lib/mercury/inc/mercury_trace_term.h
 lib/mercury/inc/mercury_trace_util.h
 lib/mercury/inc/mercury_trace_vars.h
 lib/mercury/inc/mercury_trail.h
 lib/mercury/inc/mercury_type_desc.h
 lib/mercury/inc/mercury_type_info.h
 lib/mercury/inc/mercury_type_tables.h
+lib/mercury/inc/mercury_typeclass_info.h
 lib/mercury/inc/mercury_types.h
 lib/mercury/inc/mercury_unify_compare_body.h
+lib/mercury/inc/mercury_univ.h
 lib/mercury/inc/mercury_wrapper.h
 lib/mercury/inc/multi_map.mh
+lib/mercury/inc/mutvar.mh
 lib/mercury/inc/ops.mh
+lib/mercury/inc/pair.mh
 lib/mercury/inc/parser.mh
 lib/mercury/inc/pprint.mh
 lib/mercury/inc/pqueue.mh
@@ -186,23 +228,48 @@ lib/mercury/inc/rational.mh
 lib/mercury/inc/rbtree.mh
 lib/mercury/inc/relation.mh
 lib/mercury/inc/require.mh
+lib/mercury/inc/robdd.mh
+lib/mercury/inc/rtree.mh
 lib/mercury/inc/rtti_implementation.mh
 lib/mercury/inc/set.mh
 lib/mercury/inc/set_bbbtree.mh
+lib/mercury/inc/set_ctree234.mh
 lib/mercury/inc/set_ordlist.mh
+lib/mercury/inc/set_tree234.mh
 lib/mercury/inc/set_unordlist.mh
+lib/mercury/inc/solutions.mh
 lib/mercury/inc/sparse_bitset.mh
 lib/mercury/inc/stack.mh
 lib/mercury/inc/std_util.mh
 lib/mercury/inc/store.mh
 lib/mercury/inc/string.mh
+lib/mercury/inc/svarray.mh
+lib/mercury/inc/svbag.mh
+lib/mercury/inc/svbimap.mh
+lib/mercury/inc/sveqvclass.mh
+lib/mercury/inc/svmap.mh
+lib/mercury/inc/svmulti_map.mh
+lib/mercury/inc/svqueue.mh
+lib/mercury/inc/svrelation.mh
+lib/mercury/inc/svset.mh
+lib/mercury/inc/svvarset.mh
 lib/mercury/inc/table_builtin.mh
 lib/mercury/inc/term.mh
 lib/mercury/inc/term_io.mh
+lib/mercury/inc/term_size_prof_builtin.mh
+lib/mercury/inc/term_to_xml.mh
 lib/mercury/inc/time.mh
 lib/mercury/inc/tree234.mh
 lib/mercury/inc/type_desc.mh
+lib/mercury/inc/unit.mh
+lib/mercury/inc/univ.mh
 lib/mercury/inc/varset.mh
+lib/mercury/inc/version_array.mh
+lib/mercury/inc/version_array2d.mh
+lib/mercury/inc/version_bitmap.mh
+lib/mercury/inc/version_hash_table.mh
+lib/mercury/inc/version_store.mh
+lib/mercury/inc/version_types.mh
 lib/mercury/ints/Mercury/int2s
 lib/mercury/ints/Mercury/int3s
 lib/mercury/ints/Mercury/ints
@@ -218,10 +285,216 @@ lib/mercury/ints/array.mih
 lib/mercury/ints/array.module_dep
 lib/mercury/ints/array.opt
 lib/mercury/ints/array.trans_opt
+lib/mercury/ints/array2d.int
+lib/mercury/ints/array2d.int2
+lib/mercury/ints/array2d.int3
+lib/mercury/ints/array2d.mh
+lib/mercury/ints/array2d.mih
+lib/mercury/ints/array2d.module_dep
+lib/mercury/ints/array2d.opt
+lib/mercury/ints/array2d.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/Mercury/opts
+lib/mercury/ints/asm_fast.gc.decldebug/Mercury/trans_opts
+lib/mercury/ints/asm_fast.gc.decldebug/array.opt
+lib/mercury/ints/asm_fast.gc.decldebug/array.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/array2d.opt
+lib/mercury/ints/asm_fast.gc.decldebug/array2d.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/assoc_list.opt
+lib/mercury/ints/asm_fast.gc.decldebug/assoc_list.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/bag.opt
+lib/mercury/ints/asm_fast.gc.decldebug/bag.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/benchmarking.opt
+lib/mercury/ints/asm_fast.gc.decldebug/benchmarking.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/bimap.opt
+lib/mercury/ints/asm_fast.gc.decldebug/bimap.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/bintree.opt
+lib/mercury/ints/asm_fast.gc.decldebug/bintree.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/bintree_set.opt
+lib/mercury/ints/asm_fast.gc.decldebug/bintree_set.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/bitmap.opt
+lib/mercury/ints/asm_fast.gc.decldebug/bitmap.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/bool.opt
+lib/mercury/ints/asm_fast.gc.decldebug/bool.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/bt_array.opt
+lib/mercury/ints/asm_fast.gc.decldebug/bt_array.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/builtin.opt
+lib/mercury/ints/asm_fast.gc.decldebug/builtin.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/char.opt
+lib/mercury/ints/asm_fast.gc.decldebug/char.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/construct.opt
+lib/mercury/ints/asm_fast.gc.decldebug/construct.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/cord.opt
+lib/mercury/ints/asm_fast.gc.decldebug/cord.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/counter.opt
+lib/mercury/ints/asm_fast.gc.decldebug/counter.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/deconstruct.opt
+lib/mercury/ints/asm_fast.gc.decldebug/deconstruct.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/dir.opt
+lib/mercury/ints/asm_fast.gc.decldebug/dir.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/enum.opt
+lib/mercury/ints/asm_fast.gc.decldebug/enum.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/eqvclass.opt
+lib/mercury/ints/asm_fast.gc.decldebug/eqvclass.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/exception.opt
+lib/mercury/ints/asm_fast.gc.decldebug/exception.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/float.opt
+lib/mercury/ints/asm_fast.gc.decldebug/float.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/gc.opt
+lib/mercury/ints/asm_fast.gc.decldebug/gc.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/getopt.opt
+lib/mercury/ints/asm_fast.gc.decldebug/getopt.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/getopt_io.opt
+lib/mercury/ints/asm_fast.gc.decldebug/getopt_io.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/graph.opt
+lib/mercury/ints/asm_fast.gc.decldebug/graph.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/group.opt
+lib/mercury/ints/asm_fast.gc.decldebug/group.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/hash_table.opt
+lib/mercury/ints/asm_fast.gc.decldebug/hash_table.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/injection.opt
+lib/mercury/ints/asm_fast.gc.decldebug/injection.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/int.opt
+lib/mercury/ints/asm_fast.gc.decldebug/int.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/integer.opt
+lib/mercury/ints/asm_fast.gc.decldebug/integer.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/io.opt
+lib/mercury/ints/asm_fast.gc.decldebug/io.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/lexer.opt
+lib/mercury/ints/asm_fast.gc.decldebug/lexer.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/library.opt
+lib/mercury/ints/asm_fast.gc.decldebug/library.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/list.opt
+lib/mercury/ints/asm_fast.gc.decldebug/list.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/map.opt
+lib/mercury/ints/asm_fast.gc.decldebug/map.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/math.opt
+lib/mercury/ints/asm_fast.gc.decldebug/math.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/maybe.opt
+lib/mercury/ints/asm_fast.gc.decldebug/maybe.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/mer_std.opt
+lib/mercury/ints/asm_fast.gc.decldebug/mer_std.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/multi_map.opt
+lib/mercury/ints/asm_fast.gc.decldebug/multi_map.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/mutvar.opt
+lib/mercury/ints/asm_fast.gc.decldebug/mutvar.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/ops.opt
+lib/mercury/ints/asm_fast.gc.decldebug/ops.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/pair.opt
+lib/mercury/ints/asm_fast.gc.decldebug/pair.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/parser.opt
+lib/mercury/ints/asm_fast.gc.decldebug/parser.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/pprint.opt
+lib/mercury/ints/asm_fast.gc.decldebug/pprint.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/pqueue.opt
+lib/mercury/ints/asm_fast.gc.decldebug/pqueue.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/private_builtin.opt
+lib/mercury/ints/asm_fast.gc.decldebug/private_builtin.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/profiling_builtin.opt
+lib/mercury/ints/asm_fast.gc.decldebug/profiling_builtin.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/prolog.opt
+lib/mercury/ints/asm_fast.gc.decldebug/prolog.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/queue.opt
+lib/mercury/ints/asm_fast.gc.decldebug/queue.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/random.opt
+lib/mercury/ints/asm_fast.gc.decldebug/random.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/rational.opt
+lib/mercury/ints/asm_fast.gc.decldebug/rational.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/rbtree.opt
+lib/mercury/ints/asm_fast.gc.decldebug/rbtree.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/relation.opt
+lib/mercury/ints/asm_fast.gc.decldebug/relation.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/require.opt
+lib/mercury/ints/asm_fast.gc.decldebug/require.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/robdd.opt
+lib/mercury/ints/asm_fast.gc.decldebug/robdd.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/rtree.opt
+lib/mercury/ints/asm_fast.gc.decldebug/rtree.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/rtti_implementation.opt
+lib/mercury/ints/asm_fast.gc.decldebug/rtti_implementation.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/set.opt
+lib/mercury/ints/asm_fast.gc.decldebug/set.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/set_bbbtree.opt
+lib/mercury/ints/asm_fast.gc.decldebug/set_bbbtree.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/set_ctree234.opt
+lib/mercury/ints/asm_fast.gc.decldebug/set_ctree234.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/set_ordlist.opt
+lib/mercury/ints/asm_fast.gc.decldebug/set_ordlist.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/set_tree234.opt
+lib/mercury/ints/asm_fast.gc.decldebug/set_tree234.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/set_unordlist.opt
+lib/mercury/ints/asm_fast.gc.decldebug/set_unordlist.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/solutions.opt
+lib/mercury/ints/asm_fast.gc.decldebug/solutions.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/sparse_bitset.opt
+lib/mercury/ints/asm_fast.gc.decldebug/sparse_bitset.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/stack.opt
+lib/mercury/ints/asm_fast.gc.decldebug/stack.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/std_util.opt
+lib/mercury/ints/asm_fast.gc.decldebug/std_util.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/store.opt
+lib/mercury/ints/asm_fast.gc.decldebug/store.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/string.opt
+lib/mercury/ints/asm_fast.gc.decldebug/string.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/svarray.opt
+lib/mercury/ints/asm_fast.gc.decldebug/svarray.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/svbag.opt
+lib/mercury/ints/asm_fast.gc.decldebug/svbag.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/svbimap.opt
+lib/mercury/ints/asm_fast.gc.decldebug/svbimap.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/sveqvclass.opt
+lib/mercury/ints/asm_fast.gc.decldebug/sveqvclass.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/svmap.opt
+lib/mercury/ints/asm_fast.gc.decldebug/svmap.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/svmulti_map.opt
+lib/mercury/ints/asm_fast.gc.decldebug/svmulti_map.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/svqueue.opt
+lib/mercury/ints/asm_fast.gc.decldebug/svqueue.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/svrelation.opt
+lib/mercury/ints/asm_fast.gc.decldebug/svrelation.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/svset.opt
+lib/mercury/ints/asm_fast.gc.decldebug/svset.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/svvarset.opt
+lib/mercury/ints/asm_fast.gc.decldebug/svvarset.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/table_builtin.opt
+lib/mercury/ints/asm_fast.gc.decldebug/table_builtin.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/term.opt
+lib/mercury/ints/asm_fast.gc.decldebug/term.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/term_io.opt
+lib/mercury/ints/asm_fast.gc.decldebug/term_io.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/term_size_prof_builtin.opt
+lib/mercury/ints/asm_fast.gc.decldebug/term_size_prof_builtin.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/term_to_xml.opt
+lib/mercury/ints/asm_fast.gc.decldebug/term_to_xml.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/time.opt
+lib/mercury/ints/asm_fast.gc.decldebug/time.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/tree234.opt
+lib/mercury/ints/asm_fast.gc.decldebug/tree234.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/type_desc.opt
+lib/mercury/ints/asm_fast.gc.decldebug/type_desc.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/unit.opt
+lib/mercury/ints/asm_fast.gc.decldebug/unit.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/univ.opt
+lib/mercury/ints/asm_fast.gc.decldebug/univ.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/varset.opt
+lib/mercury/ints/asm_fast.gc.decldebug/varset.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/version_array.opt
+lib/mercury/ints/asm_fast.gc.decldebug/version_array.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/version_array2d.opt
+lib/mercury/ints/asm_fast.gc.decldebug/version_array2d.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/version_bitmap.opt
+lib/mercury/ints/asm_fast.gc.decldebug/version_bitmap.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/version_hash_table.opt
+lib/mercury/ints/asm_fast.gc.decldebug/version_hash_table.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/version_store.opt
+lib/mercury/ints/asm_fast.gc.decldebug/version_store.trans_opt
+lib/mercury/ints/asm_fast.gc.decldebug/version_types.opt
+lib/mercury/ints/asm_fast.gc.decldebug/version_types.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/Mercury/opts
 lib/mercury/ints/asm_fast.gc.memprof/Mercury/trans_opts
 lib/mercury/ints/asm_fast.gc.memprof/array.opt
 lib/mercury/ints/asm_fast.gc.memprof/array.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/array2d.opt
+lib/mercury/ints/asm_fast.gc.memprof/array2d.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/assoc_list.opt
 lib/mercury/ints/asm_fast.gc.memprof/assoc_list.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/bag.opt
@@ -246,6 +519,8 @@ lib/mercury/ints/asm_fast.gc.memprof/char.opt
 lib/mercury/ints/asm_fast.gc.memprof/char.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/construct.opt
 lib/mercury/ints/asm_fast.gc.memprof/construct.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/cord.opt
+lib/mercury/ints/asm_fast.gc.memprof/cord.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/counter.opt
 lib/mercury/ints/asm_fast.gc.memprof/counter.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/deconstruct.opt
@@ -264,12 +539,16 @@ lib/mercury/ints/asm_fast.gc.memprof/gc.opt
 lib/mercury/ints/asm_fast.gc.memprof/gc.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/getopt.opt
 lib/mercury/ints/asm_fast.gc.memprof/getopt.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/getopt_io.opt
+lib/mercury/ints/asm_fast.gc.memprof/getopt_io.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/graph.opt
 lib/mercury/ints/asm_fast.gc.memprof/graph.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/group.opt
 lib/mercury/ints/asm_fast.gc.memprof/group.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/hash_table.opt
 lib/mercury/ints/asm_fast.gc.memprof/hash_table.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/injection.opt
+lib/mercury/ints/asm_fast.gc.memprof/injection.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/int.opt
 lib/mercury/ints/asm_fast.gc.memprof/int.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/integer.opt
@@ -286,12 +565,18 @@ lib/mercury/ints/asm_fast.gc.memprof/map.opt
 lib/mercury/ints/asm_fast.gc.memprof/map.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/math.opt
 lib/mercury/ints/asm_fast.gc.memprof/math.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/maybe.opt
+lib/mercury/ints/asm_fast.gc.memprof/maybe.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/mer_std.opt
 lib/mercury/ints/asm_fast.gc.memprof/mer_std.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/multi_map.opt
 lib/mercury/ints/asm_fast.gc.memprof/multi_map.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/mutvar.opt
+lib/mercury/ints/asm_fast.gc.memprof/mutvar.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/ops.opt
 lib/mercury/ints/asm_fast.gc.memprof/ops.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/pair.opt
+lib/mercury/ints/asm_fast.gc.memprof/pair.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/parser.opt
 lib/mercury/ints/asm_fast.gc.memprof/parser.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/pprint.opt
@@ -316,16 +601,26 @@ lib/mercury/ints/asm_fast.gc.memprof/relation.opt
 lib/mercury/ints/asm_fast.gc.memprof/relation.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/require.opt
 lib/mercury/ints/asm_fast.gc.memprof/require.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/robdd.opt
+lib/mercury/ints/asm_fast.gc.memprof/robdd.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/rtree.opt
+lib/mercury/ints/asm_fast.gc.memprof/rtree.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/rtti_implementation.opt
 lib/mercury/ints/asm_fast.gc.memprof/rtti_implementation.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/set.opt
 lib/mercury/ints/asm_fast.gc.memprof/set.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/set_bbbtree.opt
 lib/mercury/ints/asm_fast.gc.memprof/set_bbbtree.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/set_ctree234.opt
+lib/mercury/ints/asm_fast.gc.memprof/set_ctree234.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/set_ordlist.opt
 lib/mercury/ints/asm_fast.gc.memprof/set_ordlist.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/set_tree234.opt
+lib/mercury/ints/asm_fast.gc.memprof/set_tree234.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/set_unordlist.opt
 lib/mercury/ints/asm_fast.gc.memprof/set_unordlist.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/solutions.opt
+lib/mercury/ints/asm_fast.gc.memprof/solutions.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/sparse_bitset.opt
 lib/mercury/ints/asm_fast.gc.memprof/sparse_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/stack.opt
@@ -336,24 +631,66 @@ lib/mercury/ints/asm_fast.gc.memprof/store.opt
 lib/mercury/ints/asm_fast.gc.memprof/store.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/string.opt
 lib/mercury/ints/asm_fast.gc.memprof/string.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/svarray.opt
+lib/mercury/ints/asm_fast.gc.memprof/svarray.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/svbag.opt
+lib/mercury/ints/asm_fast.gc.memprof/svbag.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/svbimap.opt
+lib/mercury/ints/asm_fast.gc.memprof/svbimap.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/sveqvclass.opt
+lib/mercury/ints/asm_fast.gc.memprof/sveqvclass.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/svmap.opt
+lib/mercury/ints/asm_fast.gc.memprof/svmap.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/svmulti_map.opt
+lib/mercury/ints/asm_fast.gc.memprof/svmulti_map.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/svqueue.opt
+lib/mercury/ints/asm_fast.gc.memprof/svqueue.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/svrelation.opt
+lib/mercury/ints/asm_fast.gc.memprof/svrelation.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/svset.opt
+lib/mercury/ints/asm_fast.gc.memprof/svset.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/svvarset.opt
+lib/mercury/ints/asm_fast.gc.memprof/svvarset.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/table_builtin.opt
 lib/mercury/ints/asm_fast.gc.memprof/table_builtin.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/term.opt
 lib/mercury/ints/asm_fast.gc.memprof/term.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/term_io.opt
 lib/mercury/ints/asm_fast.gc.memprof/term_io.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/term_size_prof_builtin.opt
+lib/mercury/ints/asm_fast.gc.memprof/term_size_prof_builtin.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/term_to_xml.opt
+lib/mercury/ints/asm_fast.gc.memprof/term_to_xml.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/time.opt
 lib/mercury/ints/asm_fast.gc.memprof/time.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/tree234.opt
 lib/mercury/ints/asm_fast.gc.memprof/tree234.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/type_desc.opt
 lib/mercury/ints/asm_fast.gc.memprof/type_desc.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/unit.opt
+lib/mercury/ints/asm_fast.gc.memprof/unit.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/univ.opt
+lib/mercury/ints/asm_fast.gc.memprof/univ.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/varset.opt
 lib/mercury/ints/asm_fast.gc.memprof/varset.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/version_array.opt
+lib/mercury/ints/asm_fast.gc.memprof/version_array.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/version_array2d.opt
+lib/mercury/ints/asm_fast.gc.memprof/version_array2d.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/version_bitmap.opt
+lib/mercury/ints/asm_fast.gc.memprof/version_bitmap.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/version_hash_table.opt
+lib/mercury/ints/asm_fast.gc.memprof/version_hash_table.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/version_store.opt
+lib/mercury/ints/asm_fast.gc.memprof/version_store.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/version_types.opt
+lib/mercury/ints/asm_fast.gc.memprof/version_types.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/Mercury/opts
 lib/mercury/ints/asm_fast.gc.prof/Mercury/trans_opts
 lib/mercury/ints/asm_fast.gc.prof/array.opt
 lib/mercury/ints/asm_fast.gc.prof/array.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/array2d.opt
+lib/mercury/ints/asm_fast.gc.prof/array2d.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/assoc_list.opt
 lib/mercury/ints/asm_fast.gc.prof/assoc_list.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/bag.opt
@@ -378,6 +715,8 @@ lib/mercury/ints/asm_fast.gc.prof/char.opt
 lib/mercury/ints/asm_fast.gc.prof/char.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/construct.opt
 lib/mercury/ints/asm_fast.gc.prof/construct.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/cord.opt
+lib/mercury/ints/asm_fast.gc.prof/cord.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/counter.opt
 lib/mercury/ints/asm_fast.gc.prof/counter.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/deconstruct.opt
@@ -396,12 +735,16 @@ lib/mercury/ints/asm_fast.gc.prof/gc.opt
 lib/mercury/ints/asm_fast.gc.prof/gc.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/getopt.opt
 lib/mercury/ints/asm_fast.gc.prof/getopt.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/getopt_io.opt
+lib/mercury/ints/asm_fast.gc.prof/getopt_io.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/graph.opt
 lib/mercury/ints/asm_fast.gc.prof/graph.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/group.opt
 lib/mercury/ints/asm_fast.gc.prof/group.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/hash_table.opt
 lib/mercury/ints/asm_fast.gc.prof/hash_table.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/injection.opt
+lib/mercury/ints/asm_fast.gc.prof/injection.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/int.opt
 lib/mercury/ints/asm_fast.gc.prof/int.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/integer.opt
@@ -418,12 +761,18 @@ lib/mercury/ints/asm_fast.gc.prof/map.opt
 lib/mercury/ints/asm_fast.gc.prof/map.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/math.opt
 lib/mercury/ints/asm_fast.gc.prof/math.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/maybe.opt
+lib/mercury/ints/asm_fast.gc.prof/maybe.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/mer_std.opt
 lib/mercury/ints/asm_fast.gc.prof/mer_std.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/multi_map.opt
 lib/mercury/ints/asm_fast.gc.prof/multi_map.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/mutvar.opt
+lib/mercury/ints/asm_fast.gc.prof/mutvar.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/ops.opt
 lib/mercury/ints/asm_fast.gc.prof/ops.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/pair.opt
+lib/mercury/ints/asm_fast.gc.prof/pair.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/parser.opt
 lib/mercury/ints/asm_fast.gc.prof/parser.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/pprint.opt
@@ -448,16 +797,26 @@ lib/mercury/ints/asm_fast.gc.prof/relation.opt
 lib/mercury/ints/asm_fast.gc.prof/relation.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/require.opt
 lib/mercury/ints/asm_fast.gc.prof/require.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/robdd.opt
+lib/mercury/ints/asm_fast.gc.prof/robdd.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/rtree.opt
+lib/mercury/ints/asm_fast.gc.prof/rtree.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/rtti_implementation.opt
 lib/mercury/ints/asm_fast.gc.prof/rtti_implementation.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/set.opt
 lib/mercury/ints/asm_fast.gc.prof/set.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/set_bbbtree.opt
 lib/mercury/ints/asm_fast.gc.prof/set_bbbtree.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/set_ctree234.opt
+lib/mercury/ints/asm_fast.gc.prof/set_ctree234.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/set_ordlist.opt
 lib/mercury/ints/asm_fast.gc.prof/set_ordlist.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/set_tree234.opt
+lib/mercury/ints/asm_fast.gc.prof/set_tree234.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/set_unordlist.opt
 lib/mercury/ints/asm_fast.gc.prof/set_unordlist.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/solutions.opt
+lib/mercury/ints/asm_fast.gc.prof/solutions.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/sparse_bitset.opt
 lib/mercury/ints/asm_fast.gc.prof/sparse_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/stack.opt
@@ -468,24 +827,66 @@ lib/mercury/ints/asm_fast.gc.prof/store.opt
 lib/mercury/ints/asm_fast.gc.prof/store.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/string.opt
 lib/mercury/ints/asm_fast.gc.prof/string.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/svarray.opt
+lib/mercury/ints/asm_fast.gc.prof/svarray.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/svbag.opt
+lib/mercury/ints/asm_fast.gc.prof/svbag.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/svbimap.opt
+lib/mercury/ints/asm_fast.gc.prof/svbimap.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/sveqvclass.opt
+lib/mercury/ints/asm_fast.gc.prof/sveqvclass.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/svmap.opt
+lib/mercury/ints/asm_fast.gc.prof/svmap.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/svmulti_map.opt
+lib/mercury/ints/asm_fast.gc.prof/svmulti_map.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/svqueue.opt
+lib/mercury/ints/asm_fast.gc.prof/svqueue.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/svrelation.opt
+lib/mercury/ints/asm_fast.gc.prof/svrelation.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/svset.opt
+lib/mercury/ints/asm_fast.gc.prof/svset.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/svvarset.opt
+lib/mercury/ints/asm_fast.gc.prof/svvarset.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/table_builtin.opt
 lib/mercury/ints/asm_fast.gc.prof/table_builtin.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/term.opt
 lib/mercury/ints/asm_fast.gc.prof/term.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/term_io.opt
 lib/mercury/ints/asm_fast.gc.prof/term_io.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/term_size_prof_builtin.opt
+lib/mercury/ints/asm_fast.gc.prof/term_size_prof_builtin.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/term_to_xml.opt
+lib/mercury/ints/asm_fast.gc.prof/term_to_xml.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/time.opt
 lib/mercury/ints/asm_fast.gc.prof/time.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/tree234.opt
 lib/mercury/ints/asm_fast.gc.prof/tree234.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/type_desc.opt
 lib/mercury/ints/asm_fast.gc.prof/type_desc.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/unit.opt
+lib/mercury/ints/asm_fast.gc.prof/unit.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/univ.opt
+lib/mercury/ints/asm_fast.gc.prof/univ.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/varset.opt
 lib/mercury/ints/asm_fast.gc.prof/varset.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/version_array.opt
+lib/mercury/ints/asm_fast.gc.prof/version_array.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/version_array2d.opt
+lib/mercury/ints/asm_fast.gc.prof/version_array2d.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/version_bitmap.opt
+lib/mercury/ints/asm_fast.gc.prof/version_bitmap.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/version_hash_table.opt
+lib/mercury/ints/asm_fast.gc.prof/version_hash_table.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/version_store.opt
+lib/mercury/ints/asm_fast.gc.prof/version_store.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/version_types.opt
+lib/mercury/ints/asm_fast.gc.prof/version_types.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/Mercury/opts
 lib/mercury/ints/asm_fast.gc.tr.debug/Mercury/trans_opts
 lib/mercury/ints/asm_fast.gc.tr.debug/array.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/array.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/array2d.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/array2d.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/assoc_list.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/assoc_list.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/bag.opt
@@ -510,6 +911,8 @@ lib/mercury/ints/asm_fast.gc.tr.debug/char.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/char.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/construct.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/construct.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/cord.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/cord.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/counter.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/counter.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/deconstruct.opt
@@ -528,12 +931,16 @@ lib/mercury/ints/asm_fast.gc.tr.debug/gc.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/gc.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/getopt.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/getopt.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/getopt_io.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/getopt_io.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/graph.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/graph.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/group.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/group.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/hash_table.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/hash_table.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/injection.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/injection.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/int.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/int.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/integer.opt
@@ -550,12 +957,18 @@ lib/mercury/ints/asm_fast.gc.tr.debug/map.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/map.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/math.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/math.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/maybe.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/maybe.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/mer_std.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/mer_std.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/multi_map.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/multi_map.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/mutvar.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/mutvar.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/ops.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/ops.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/pair.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/pair.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/parser.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/parser.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/pprint.opt
@@ -580,16 +993,26 @@ lib/mercury/ints/asm_fast.gc.tr.debug/relation.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/relation.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/require.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/require.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/robdd.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/robdd.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/rtree.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/rtree.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/rtti_implementation.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/rtti_implementation.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/set.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/set.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/set_bbbtree.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/set_bbbtree.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/set_ctree234.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/set_ctree234.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/set_ordlist.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/set_ordlist.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/set_tree234.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/set_tree234.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/set_unordlist.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/set_unordlist.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/solutions.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/solutions.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/sparse_bitset.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/sparse_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/stack.opt
@@ -600,24 +1023,66 @@ lib/mercury/ints/asm_fast.gc.tr.debug/store.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/store.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/string.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/string.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svarray.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svarray.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svbag.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svbag.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svbimap.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svbimap.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/sveqvclass.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/sveqvclass.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svmap.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svmap.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svmulti_map.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svmulti_map.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svqueue.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svqueue.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svrelation.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svrelation.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svset.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svset.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svvarset.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/svvarset.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/table_builtin.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/table_builtin.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/term.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/term.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/term_io.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/term_io.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/term_size_prof_builtin.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/term_size_prof_builtin.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/term_to_xml.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/term_to_xml.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/time.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/time.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/tree234.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/tree234.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/type_desc.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/type_desc.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/unit.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/unit.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/univ.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/univ.trans_opt
 lib/mercury/ints/asm_fast.gc.tr.debug/varset.opt
 lib/mercury/ints/asm_fast.gc.tr.debug/varset.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/version_array.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/version_array.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/version_array2d.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/version_array2d.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/version_bitmap.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/version_bitmap.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/version_hash_table.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/version_hash_table.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/version_store.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/version_store.trans_opt
+lib/mercury/ints/asm_fast.gc.tr.debug/version_types.opt
+lib/mercury/ints/asm_fast.gc.tr.debug/version_types.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/Mercury/opts
 lib/mercury/ints/asm_fast.gc.tr/Mercury/trans_opts
 lib/mercury/ints/asm_fast.gc.tr/array.opt
 lib/mercury/ints/asm_fast.gc.tr/array.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/array2d.opt
+lib/mercury/ints/asm_fast.gc.tr/array2d.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/assoc_list.opt
 lib/mercury/ints/asm_fast.gc.tr/assoc_list.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/bag.opt
@@ -642,6 +1107,8 @@ lib/mercury/ints/asm_fast.gc.tr/char.opt
 lib/mercury/ints/asm_fast.gc.tr/char.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/construct.opt
 lib/mercury/ints/asm_fast.gc.tr/construct.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/cord.opt
+lib/mercury/ints/asm_fast.gc.tr/cord.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/counter.opt
 lib/mercury/ints/asm_fast.gc.tr/counter.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/deconstruct.opt
@@ -660,12 +1127,16 @@ lib/mercury/ints/asm_fast.gc.tr/gc.opt
 lib/mercury/ints/asm_fast.gc.tr/gc.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/getopt.opt
 lib/mercury/ints/asm_fast.gc.tr/getopt.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/getopt_io.opt
+lib/mercury/ints/asm_fast.gc.tr/getopt_io.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/graph.opt
 lib/mercury/ints/asm_fast.gc.tr/graph.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/group.opt
 lib/mercury/ints/asm_fast.gc.tr/group.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/hash_table.opt
 lib/mercury/ints/asm_fast.gc.tr/hash_table.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/injection.opt
+lib/mercury/ints/asm_fast.gc.tr/injection.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/int.opt
 lib/mercury/ints/asm_fast.gc.tr/int.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/integer.opt
@@ -682,12 +1153,18 @@ lib/mercury/ints/asm_fast.gc.tr/map.opt
 lib/mercury/ints/asm_fast.gc.tr/map.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/math.opt
 lib/mercury/ints/asm_fast.gc.tr/math.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/maybe.opt
+lib/mercury/ints/asm_fast.gc.tr/maybe.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/mer_std.opt
 lib/mercury/ints/asm_fast.gc.tr/mer_std.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/multi_map.opt
 lib/mercury/ints/asm_fast.gc.tr/multi_map.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/mutvar.opt
+lib/mercury/ints/asm_fast.gc.tr/mutvar.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/ops.opt
 lib/mercury/ints/asm_fast.gc.tr/ops.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/pair.opt
+lib/mercury/ints/asm_fast.gc.tr/pair.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/parser.opt
 lib/mercury/ints/asm_fast.gc.tr/parser.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/pprint.opt
@@ -712,16 +1189,26 @@ lib/mercury/ints/asm_fast.gc.tr/relation.opt
 lib/mercury/ints/asm_fast.gc.tr/relation.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/require.opt
 lib/mercury/ints/asm_fast.gc.tr/require.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/robdd.opt
+lib/mercury/ints/asm_fast.gc.tr/robdd.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/rtree.opt
+lib/mercury/ints/asm_fast.gc.tr/rtree.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/rtti_implementation.opt
 lib/mercury/ints/asm_fast.gc.tr/rtti_implementation.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/set.opt
 lib/mercury/ints/asm_fast.gc.tr/set.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/set_bbbtree.opt
 lib/mercury/ints/asm_fast.gc.tr/set_bbbtree.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/set_ctree234.opt
+lib/mercury/ints/asm_fast.gc.tr/set_ctree234.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/set_ordlist.opt
 lib/mercury/ints/asm_fast.gc.tr/set_ordlist.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/set_tree234.opt
+lib/mercury/ints/asm_fast.gc.tr/set_tree234.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/set_unordlist.opt
 lib/mercury/ints/asm_fast.gc.tr/set_unordlist.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/solutions.opt
+lib/mercury/ints/asm_fast.gc.tr/solutions.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/sparse_bitset.opt
 lib/mercury/ints/asm_fast.gc.tr/sparse_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/stack.opt
@@ -732,24 +1219,66 @@ lib/mercury/ints/asm_fast.gc.tr/store.opt
 lib/mercury/ints/asm_fast.gc.tr/store.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/string.opt
 lib/mercury/ints/asm_fast.gc.tr/string.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/svarray.opt
+lib/mercury/ints/asm_fast.gc.tr/svarray.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/svbag.opt
+lib/mercury/ints/asm_fast.gc.tr/svbag.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/svbimap.opt
+lib/mercury/ints/asm_fast.gc.tr/svbimap.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/sveqvclass.opt
+lib/mercury/ints/asm_fast.gc.tr/sveqvclass.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/svmap.opt
+lib/mercury/ints/asm_fast.gc.tr/svmap.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/svmulti_map.opt
+lib/mercury/ints/asm_fast.gc.tr/svmulti_map.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/svqueue.opt
+lib/mercury/ints/asm_fast.gc.tr/svqueue.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/svrelation.opt
+lib/mercury/ints/asm_fast.gc.tr/svrelation.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/svset.opt
+lib/mercury/ints/asm_fast.gc.tr/svset.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/svvarset.opt
+lib/mercury/ints/asm_fast.gc.tr/svvarset.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/table_builtin.opt
 lib/mercury/ints/asm_fast.gc.tr/table_builtin.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/term.opt
 lib/mercury/ints/asm_fast.gc.tr/term.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/term_io.opt
 lib/mercury/ints/asm_fast.gc.tr/term_io.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/term_size_prof_builtin.opt
+lib/mercury/ints/asm_fast.gc.tr/term_size_prof_builtin.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/term_to_xml.opt
+lib/mercury/ints/asm_fast.gc.tr/term_to_xml.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/time.opt
 lib/mercury/ints/asm_fast.gc.tr/time.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/tree234.opt
 lib/mercury/ints/asm_fast.gc.tr/tree234.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/type_desc.opt
 lib/mercury/ints/asm_fast.gc.tr/type_desc.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/unit.opt
+lib/mercury/ints/asm_fast.gc.tr/unit.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/univ.opt
+lib/mercury/ints/asm_fast.gc.tr/univ.trans_opt
 lib/mercury/ints/asm_fast.gc.tr/varset.opt
 lib/mercury/ints/asm_fast.gc.tr/varset.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/version_array.opt
+lib/mercury/ints/asm_fast.gc.tr/version_array.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/version_array2d.opt
+lib/mercury/ints/asm_fast.gc.tr/version_array2d.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/version_bitmap.opt
+lib/mercury/ints/asm_fast.gc.tr/version_bitmap.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/version_hash_table.opt
+lib/mercury/ints/asm_fast.gc.tr/version_hash_table.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/version_store.opt
+lib/mercury/ints/asm_fast.gc.tr/version_store.trans_opt
+lib/mercury/ints/asm_fast.gc.tr/version_types.opt
+lib/mercury/ints/asm_fast.gc.tr/version_types.trans_opt
 lib/mercury/ints/asm_fast.gc/Mercury/opts
 lib/mercury/ints/asm_fast.gc/Mercury/trans_opts
 lib/mercury/ints/asm_fast.gc/array.opt
 lib/mercury/ints/asm_fast.gc/array.trans_opt
+lib/mercury/ints/asm_fast.gc/array2d.opt
+lib/mercury/ints/asm_fast.gc/array2d.trans_opt
 lib/mercury/ints/asm_fast.gc/assoc_list.opt
 lib/mercury/ints/asm_fast.gc/assoc_list.trans_opt
 lib/mercury/ints/asm_fast.gc/bag.opt
@@ -774,6 +1303,8 @@ lib/mercury/ints/asm_fast.gc/char.opt
 lib/mercury/ints/asm_fast.gc/char.trans_opt
 lib/mercury/ints/asm_fast.gc/construct.opt
 lib/mercury/ints/asm_fast.gc/construct.trans_opt
+lib/mercury/ints/asm_fast.gc/cord.opt
+lib/mercury/ints/asm_fast.gc/cord.trans_opt
 lib/mercury/ints/asm_fast.gc/counter.opt
 lib/mercury/ints/asm_fast.gc/counter.trans_opt
 lib/mercury/ints/asm_fast.gc/deconstruct.opt
@@ -792,12 +1323,16 @@ lib/mercury/ints/asm_fast.gc/gc.opt
 lib/mercury/ints/asm_fast.gc/gc.trans_opt
 lib/mercury/ints/asm_fast.gc/getopt.opt
 lib/mercury/ints/asm_fast.gc/getopt.trans_opt
+lib/mercury/ints/asm_fast.gc/getopt_io.opt
+lib/mercury/ints/asm_fast.gc/getopt_io.trans_opt
 lib/mercury/ints/asm_fast.gc/graph.opt
 lib/mercury/ints/asm_fast.gc/graph.trans_opt
 lib/mercury/ints/asm_fast.gc/group.opt
 lib/mercury/ints/asm_fast.gc/group.trans_opt
 lib/mercury/ints/asm_fast.gc/hash_table.opt
 lib/mercury/ints/asm_fast.gc/hash_table.trans_opt
+lib/mercury/ints/asm_fast.gc/injection.opt
+lib/mercury/ints/asm_fast.gc/injection.trans_opt
 lib/mercury/ints/asm_fast.gc/int.opt
 lib/mercury/ints/asm_fast.gc/int.trans_opt
 lib/mercury/ints/asm_fast.gc/integer.opt
@@ -814,12 +1349,18 @@ lib/mercury/ints/asm_fast.gc/map.opt
 lib/mercury/ints/asm_fast.gc/map.trans_opt
 lib/mercury/ints/asm_fast.gc/math.opt
 lib/mercury/ints/asm_fast.gc/math.trans_opt
+lib/mercury/ints/asm_fast.gc/maybe.opt
+lib/mercury/ints/asm_fast.gc/maybe.trans_opt
 lib/mercury/ints/asm_fast.gc/mer_std.opt
 lib/mercury/ints/asm_fast.gc/mer_std.trans_opt
 lib/mercury/ints/asm_fast.gc/multi_map.opt
 lib/mercury/ints/asm_fast.gc/multi_map.trans_opt
+lib/mercury/ints/asm_fast.gc/mutvar.opt
+lib/mercury/ints/asm_fast.gc/mutvar.trans_opt
 lib/mercury/ints/asm_fast.gc/ops.opt
 lib/mercury/ints/asm_fast.gc/ops.trans_opt
+lib/mercury/ints/asm_fast.gc/pair.opt
+lib/mercury/ints/asm_fast.gc/pair.trans_opt
 lib/mercury/ints/asm_fast.gc/parser.opt
 lib/mercury/ints/asm_fast.gc/parser.trans_opt
 lib/mercury/ints/asm_fast.gc/pprint.opt
@@ -844,16 +1385,26 @@ lib/mercury/ints/asm_fast.gc/relation.opt
 lib/mercury/ints/asm_fast.gc/relation.trans_opt
 lib/mercury/ints/asm_fast.gc/require.opt
 lib/mercury/ints/asm_fast.gc/require.trans_opt
+lib/mercury/ints/asm_fast.gc/robdd.opt
+lib/mercury/ints/asm_fast.gc/robdd.trans_opt
+lib/mercury/ints/asm_fast.gc/rtree.opt
+lib/mercury/ints/asm_fast.gc/rtree.trans_opt
 lib/mercury/ints/asm_fast.gc/rtti_implementation.opt
 lib/mercury/ints/asm_fast.gc/rtti_implementation.trans_opt
 lib/mercury/ints/asm_fast.gc/set.opt
 lib/mercury/ints/asm_fast.gc/set.trans_opt
 lib/mercury/ints/asm_fast.gc/set_bbbtree.opt
 lib/mercury/ints/asm_fast.gc/set_bbbtree.trans_opt
+lib/mercury/ints/asm_fast.gc/set_ctree234.opt
+lib/mercury/ints/asm_fast.gc/set_ctree234.trans_opt
 lib/mercury/ints/asm_fast.gc/set_ordlist.opt
 lib/mercury/ints/asm_fast.gc/set_ordlist.trans_opt
+lib/mercury/ints/asm_fast.gc/set_tree234.opt
+lib/mercury/ints/asm_fast.gc/set_tree234.trans_opt
 lib/mercury/ints/asm_fast.gc/set_unordlist.opt
 lib/mercury/ints/asm_fast.gc/set_unordlist.trans_opt
+lib/mercury/ints/asm_fast.gc/solutions.opt
+lib/mercury/ints/asm_fast.gc/solutions.trans_opt
 lib/mercury/ints/asm_fast.gc/sparse_bitset.opt
 lib/mercury/ints/asm_fast.gc/sparse_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc/stack.opt
@@ -864,20 +1415,60 @@ lib/mercury/ints/asm_fast.gc/store.opt
 lib/mercury/ints/asm_fast.gc/store.trans_opt
 lib/mercury/ints/asm_fast.gc/string.opt
 lib/mercury/ints/asm_fast.gc/string.trans_opt
+lib/mercury/ints/asm_fast.gc/svarray.opt
+lib/mercury/ints/asm_fast.gc/svarray.trans_opt
+lib/mercury/ints/asm_fast.gc/svbag.opt
+lib/mercury/ints/asm_fast.gc/svbag.trans_opt
+lib/mercury/ints/asm_fast.gc/svbimap.opt
+lib/mercury/ints/asm_fast.gc/svbimap.trans_opt
+lib/mercury/ints/asm_fast.gc/sveqvclass.opt
+lib/mercury/ints/asm_fast.gc/sveqvclass.trans_opt
+lib/mercury/ints/asm_fast.gc/svmap.opt
+lib/mercury/ints/asm_fast.gc/svmap.trans_opt
+lib/mercury/ints/asm_fast.gc/svmulti_map.opt
+lib/mercury/ints/asm_fast.gc/svmulti_map.trans_opt
+lib/mercury/ints/asm_fast.gc/svqueue.opt
+lib/mercury/ints/asm_fast.gc/svqueue.trans_opt
+lib/mercury/ints/asm_fast.gc/svrelation.opt
+lib/mercury/ints/asm_fast.gc/svrelation.trans_opt
+lib/mercury/ints/asm_fast.gc/svset.opt
+lib/mercury/ints/asm_fast.gc/svset.trans_opt
+lib/mercury/ints/asm_fast.gc/svvarset.opt
+lib/mercury/ints/asm_fast.gc/svvarset.trans_opt
 lib/mercury/ints/asm_fast.gc/table_builtin.opt
 lib/mercury/ints/asm_fast.gc/table_builtin.trans_opt
 lib/mercury/ints/asm_fast.gc/term.opt
 lib/mercury/ints/asm_fast.gc/term.trans_opt
 lib/mercury/ints/asm_fast.gc/term_io.opt
 lib/mercury/ints/asm_fast.gc/term_io.trans_opt
+lib/mercury/ints/asm_fast.gc/term_size_prof_builtin.opt
+lib/mercury/ints/asm_fast.gc/term_size_prof_builtin.trans_opt
+lib/mercury/ints/asm_fast.gc/term_to_xml.opt
+lib/mercury/ints/asm_fast.gc/term_to_xml.trans_opt
 lib/mercury/ints/asm_fast.gc/time.opt
 lib/mercury/ints/asm_fast.gc/time.trans_opt
 lib/mercury/ints/asm_fast.gc/tree234.opt
 lib/mercury/ints/asm_fast.gc/tree234.trans_opt
 lib/mercury/ints/asm_fast.gc/type_desc.opt
 lib/mercury/ints/asm_fast.gc/type_desc.trans_opt
+lib/mercury/ints/asm_fast.gc/unit.opt
+lib/mercury/ints/asm_fast.gc/unit.trans_opt
+lib/mercury/ints/asm_fast.gc/univ.opt
+lib/mercury/ints/asm_fast.gc/univ.trans_opt
 lib/mercury/ints/asm_fast.gc/varset.opt
 lib/mercury/ints/asm_fast.gc/varset.trans_opt
+lib/mercury/ints/asm_fast.gc/version_array.opt
+lib/mercury/ints/asm_fast.gc/version_array.trans_opt
+lib/mercury/ints/asm_fast.gc/version_array2d.opt
+lib/mercury/ints/asm_fast.gc/version_array2d.trans_opt
+lib/mercury/ints/asm_fast.gc/version_bitmap.opt
+lib/mercury/ints/asm_fast.gc/version_bitmap.trans_opt
+lib/mercury/ints/asm_fast.gc/version_hash_table.opt
+lib/mercury/ints/asm_fast.gc/version_hash_table.trans_opt
+lib/mercury/ints/asm_fast.gc/version_store.opt
+lib/mercury/ints/asm_fast.gc/version_store.trans_opt
+lib/mercury/ints/asm_fast.gc/version_types.opt
+lib/mercury/ints/asm_fast.gc/version_types.trans_opt
 lib/mercury/ints/assoc_list.int
 lib/mercury/ints/assoc_list.int2
 lib/mercury/ints/assoc_list.int3
@@ -974,6 +1565,14 @@ lib/mercury/ints/construct.mih
 lib/mercury/ints/construct.module_dep
 lib/mercury/ints/construct.opt
 lib/mercury/ints/construct.trans_opt
+lib/mercury/ints/cord.int
+lib/mercury/ints/cord.int2
+lib/mercury/ints/cord.int3
+lib/mercury/ints/cord.mh
+lib/mercury/ints/cord.mih
+lib/mercury/ints/cord.module_dep
+lib/mercury/ints/cord.opt
+lib/mercury/ints/cord.trans_opt
 lib/mercury/ints/counter.int
 lib/mercury/ints/counter.int2
 lib/mercury/ints/counter.int3
@@ -1046,6 +1645,14 @@ lib/mercury/ints/getopt.mih
 lib/mercury/ints/getopt.module_dep
 lib/mercury/ints/getopt.opt
 lib/mercury/ints/getopt.trans_opt
+lib/mercury/ints/getopt_io.int
+lib/mercury/ints/getopt_io.int2
+lib/mercury/ints/getopt_io.int3
+lib/mercury/ints/getopt_io.mh
+lib/mercury/ints/getopt_io.mih
+lib/mercury/ints/getopt_io.module_dep
+lib/mercury/ints/getopt_io.opt
+lib/mercury/ints/getopt_io.trans_opt
 lib/mercury/ints/graph.int
 lib/mercury/ints/graph.int2
 lib/mercury/ints/graph.int3
@@ -1074,6 +1681,8 @@ lib/mercury/ints/hlc.gc/Mercury/opts
 lib/mercury/ints/hlc.gc/Mercury/trans_opts
 lib/mercury/ints/hlc.gc/array.opt
 lib/mercury/ints/hlc.gc/array.trans_opt
+lib/mercury/ints/hlc.gc/array2d.opt
+lib/mercury/ints/hlc.gc/array2d.trans_opt
 lib/mercury/ints/hlc.gc/assoc_list.opt
 lib/mercury/ints/hlc.gc/assoc_list.trans_opt
 lib/mercury/ints/hlc.gc/bag.opt
@@ -1098,6 +1707,8 @@ lib/mercury/ints/hlc.gc/char.opt
 lib/mercury/ints/hlc.gc/char.trans_opt
 lib/mercury/ints/hlc.gc/construct.opt
 lib/mercury/ints/hlc.gc/construct.trans_opt
+lib/mercury/ints/hlc.gc/cord.opt
+lib/mercury/ints/hlc.gc/cord.trans_opt
 lib/mercury/ints/hlc.gc/counter.opt
 lib/mercury/ints/hlc.gc/counter.trans_opt
 lib/mercury/ints/hlc.gc/deconstruct.opt
@@ -1116,12 +1727,16 @@ lib/mercury/ints/hlc.gc/gc.opt
 lib/mercury/ints/hlc.gc/gc.trans_opt
 lib/mercury/ints/hlc.gc/getopt.opt
 lib/mercury/ints/hlc.gc/getopt.trans_opt
+lib/mercury/ints/hlc.gc/getopt_io.opt
+lib/mercury/ints/hlc.gc/getopt_io.trans_opt
 lib/mercury/ints/hlc.gc/graph.opt
 lib/mercury/ints/hlc.gc/graph.trans_opt
 lib/mercury/ints/hlc.gc/group.opt
 lib/mercury/ints/hlc.gc/group.trans_opt
 lib/mercury/ints/hlc.gc/hash_table.opt
 lib/mercury/ints/hlc.gc/hash_table.trans_opt
+lib/mercury/ints/hlc.gc/injection.opt
+lib/mercury/ints/hlc.gc/injection.trans_opt
 lib/mercury/ints/hlc.gc/int.opt
 lib/mercury/ints/hlc.gc/int.trans_opt
 lib/mercury/ints/hlc.gc/integer.opt
@@ -1138,12 +1753,18 @@ lib/mercury/ints/hlc.gc/map.opt
 lib/mercury/ints/hlc.gc/map.trans_opt
 lib/mercury/ints/hlc.gc/math.opt
 lib/mercury/ints/hlc.gc/math.trans_opt
+lib/mercury/ints/hlc.gc/maybe.opt
+lib/mercury/ints/hlc.gc/maybe.trans_opt
 lib/mercury/ints/hlc.gc/mer_std.opt
 lib/mercury/ints/hlc.gc/mer_std.trans_opt
 lib/mercury/ints/hlc.gc/multi_map.opt
 lib/mercury/ints/hlc.gc/multi_map.trans_opt
+lib/mercury/ints/hlc.gc/mutvar.opt
+lib/mercury/ints/hlc.gc/mutvar.trans_opt
 lib/mercury/ints/hlc.gc/ops.opt
 lib/mercury/ints/hlc.gc/ops.trans_opt
+lib/mercury/ints/hlc.gc/pair.opt
+lib/mercury/ints/hlc.gc/pair.trans_opt
 lib/mercury/ints/hlc.gc/parser.opt
 lib/mercury/ints/hlc.gc/parser.trans_opt
 lib/mercury/ints/hlc.gc/pprint.opt
@@ -1168,16 +1789,26 @@ lib/mercury/ints/hlc.gc/relation.opt
 lib/mercury/ints/hlc.gc/relation.trans_opt
 lib/mercury/ints/hlc.gc/require.opt
 lib/mercury/ints/hlc.gc/require.trans_opt
+lib/mercury/ints/hlc.gc/robdd.opt
+lib/mercury/ints/hlc.gc/robdd.trans_opt
+lib/mercury/ints/hlc.gc/rtree.opt
+lib/mercury/ints/hlc.gc/rtree.trans_opt
 lib/mercury/ints/hlc.gc/rtti_implementation.opt
 lib/mercury/ints/hlc.gc/rtti_implementation.trans_opt
 lib/mercury/ints/hlc.gc/set.opt
 lib/mercury/ints/hlc.gc/set.trans_opt
 lib/mercury/ints/hlc.gc/set_bbbtree.opt
 lib/mercury/ints/hlc.gc/set_bbbtree.trans_opt
+lib/mercury/ints/hlc.gc/set_ctree234.opt
+lib/mercury/ints/hlc.gc/set_ctree234.trans_opt
 lib/mercury/ints/hlc.gc/set_ordlist.opt
 lib/mercury/ints/hlc.gc/set_ordlist.trans_opt
+lib/mercury/ints/hlc.gc/set_tree234.opt
+lib/mercury/ints/hlc.gc/set_tree234.trans_opt
 lib/mercury/ints/hlc.gc/set_unordlist.opt
 lib/mercury/ints/hlc.gc/set_unordlist.trans_opt
+lib/mercury/ints/hlc.gc/solutions.opt
+lib/mercury/ints/hlc.gc/solutions.trans_opt
 lib/mercury/ints/hlc.gc/sparse_bitset.opt
 lib/mercury/ints/hlc.gc/sparse_bitset.trans_opt
 lib/mercury/ints/hlc.gc/stack.opt
@@ -1188,152 +1819,68 @@ lib/mercury/ints/hlc.gc/store.opt
 lib/mercury/ints/hlc.gc/store.trans_opt
 lib/mercury/ints/hlc.gc/string.opt
 lib/mercury/ints/hlc.gc/string.trans_opt
+lib/mercury/ints/hlc.gc/svarray.opt
+lib/mercury/ints/hlc.gc/svarray.trans_opt
+lib/mercury/ints/hlc.gc/svbag.opt
+lib/mercury/ints/hlc.gc/svbag.trans_opt
+lib/mercury/ints/hlc.gc/svbimap.opt
+lib/mercury/ints/hlc.gc/svbimap.trans_opt
+lib/mercury/ints/hlc.gc/sveqvclass.opt
+lib/mercury/ints/hlc.gc/sveqvclass.trans_opt
+lib/mercury/ints/hlc.gc/svmap.opt
+lib/mercury/ints/hlc.gc/svmap.trans_opt
+lib/mercury/ints/hlc.gc/svmulti_map.opt
+lib/mercury/ints/hlc.gc/svmulti_map.trans_opt
+lib/mercury/ints/hlc.gc/svqueue.opt
+lib/mercury/ints/hlc.gc/svqueue.trans_opt
+lib/mercury/ints/hlc.gc/svrelation.opt
+lib/mercury/ints/hlc.gc/svrelation.trans_opt
+lib/mercury/ints/hlc.gc/svset.opt
+lib/mercury/ints/hlc.gc/svset.trans_opt
+lib/mercury/ints/hlc.gc/svvarset.opt
+lib/mercury/ints/hlc.gc/svvarset.trans_opt
 lib/mercury/ints/hlc.gc/table_builtin.opt
 lib/mercury/ints/hlc.gc/table_builtin.trans_opt
 lib/mercury/ints/hlc.gc/term.opt
 lib/mercury/ints/hlc.gc/term.trans_opt
 lib/mercury/ints/hlc.gc/term_io.opt
 lib/mercury/ints/hlc.gc/term_io.trans_opt
+lib/mercury/ints/hlc.gc/term_size_prof_builtin.opt
+lib/mercury/ints/hlc.gc/term_size_prof_builtin.trans_opt
+lib/mercury/ints/hlc.gc/term_to_xml.opt
+lib/mercury/ints/hlc.gc/term_to_xml.trans_opt
 lib/mercury/ints/hlc.gc/time.opt
 lib/mercury/ints/hlc.gc/time.trans_opt
 lib/mercury/ints/hlc.gc/tree234.opt
 lib/mercury/ints/hlc.gc/tree234.trans_opt
 lib/mercury/ints/hlc.gc/type_desc.opt
 lib/mercury/ints/hlc.gc/type_desc.trans_opt
+lib/mercury/ints/hlc.gc/unit.opt
+lib/mercury/ints/hlc.gc/unit.trans_opt
+lib/mercury/ints/hlc.gc/univ.opt
+lib/mercury/ints/hlc.gc/univ.trans_opt
 lib/mercury/ints/hlc.gc/varset.opt
 lib/mercury/ints/hlc.gc/varset.trans_opt
-lib/mercury/ints/hlc.par.gc/Mercury/opts
-lib/mercury/ints/hlc.par.gc/Mercury/trans_opts
-lib/mercury/ints/hlc.par.gc/array.opt
-lib/mercury/ints/hlc.par.gc/array.trans_opt
-lib/mercury/ints/hlc.par.gc/assoc_list.opt
-lib/mercury/ints/hlc.par.gc/assoc_list.trans_opt
-lib/mercury/ints/hlc.par.gc/bag.opt
-lib/mercury/ints/hlc.par.gc/bag.trans_opt
-lib/mercury/ints/hlc.par.gc/benchmarking.opt
-lib/mercury/ints/hlc.par.gc/benchmarking.trans_opt
-lib/mercury/ints/hlc.par.gc/bimap.opt
-lib/mercury/ints/hlc.par.gc/bimap.trans_opt
-lib/mercury/ints/hlc.par.gc/bintree.opt
-lib/mercury/ints/hlc.par.gc/bintree.trans_opt
-lib/mercury/ints/hlc.par.gc/bintree_set.opt
-lib/mercury/ints/hlc.par.gc/bintree_set.trans_opt
-lib/mercury/ints/hlc.par.gc/bitmap.opt
-lib/mercury/ints/hlc.par.gc/bitmap.trans_opt
-lib/mercury/ints/hlc.par.gc/bool.opt
-lib/mercury/ints/hlc.par.gc/bool.trans_opt
-lib/mercury/ints/hlc.par.gc/bt_array.opt
-lib/mercury/ints/hlc.par.gc/bt_array.trans_opt
-lib/mercury/ints/hlc.par.gc/builtin.opt
-lib/mercury/ints/hlc.par.gc/builtin.trans_opt
-lib/mercury/ints/hlc.par.gc/char.opt
-lib/mercury/ints/hlc.par.gc/char.trans_opt
-lib/mercury/ints/hlc.par.gc/construct.opt
-lib/mercury/ints/hlc.par.gc/construct.trans_opt
-lib/mercury/ints/hlc.par.gc/counter.opt
-lib/mercury/ints/hlc.par.gc/counter.trans_opt
-lib/mercury/ints/hlc.par.gc/deconstruct.opt
-lib/mercury/ints/hlc.par.gc/deconstruct.trans_opt
-lib/mercury/ints/hlc.par.gc/dir.opt
-lib/mercury/ints/hlc.par.gc/dir.trans_opt
-lib/mercury/ints/hlc.par.gc/enum.opt
-lib/mercury/ints/hlc.par.gc/enum.trans_opt
-lib/mercury/ints/hlc.par.gc/eqvclass.opt
-lib/mercury/ints/hlc.par.gc/eqvclass.trans_opt
-lib/mercury/ints/hlc.par.gc/exception.opt
-lib/mercury/ints/hlc.par.gc/exception.trans_opt
-lib/mercury/ints/hlc.par.gc/float.opt
-lib/mercury/ints/hlc.par.gc/float.trans_opt
-lib/mercury/ints/hlc.par.gc/gc.opt
-lib/mercury/ints/hlc.par.gc/gc.trans_opt
-lib/mercury/ints/hlc.par.gc/getopt.opt
-lib/mercury/ints/hlc.par.gc/getopt.trans_opt
-lib/mercury/ints/hlc.par.gc/graph.opt
-lib/mercury/ints/hlc.par.gc/graph.trans_opt
-lib/mercury/ints/hlc.par.gc/group.opt
-lib/mercury/ints/hlc.par.gc/group.trans_opt
-lib/mercury/ints/hlc.par.gc/hash_table.opt
-lib/mercury/ints/hlc.par.gc/hash_table.trans_opt
-lib/mercury/ints/hlc.par.gc/int.opt
-lib/mercury/ints/hlc.par.gc/int.trans_opt
-lib/mercury/ints/hlc.par.gc/integer.opt
-lib/mercury/ints/hlc.par.gc/integer.trans_opt
-lib/mercury/ints/hlc.par.gc/io.opt
-lib/mercury/ints/hlc.par.gc/io.trans_opt
-lib/mercury/ints/hlc.par.gc/lexer.opt
-lib/mercury/ints/hlc.par.gc/lexer.trans_opt
-lib/mercury/ints/hlc.par.gc/library.opt
-lib/mercury/ints/hlc.par.gc/library.trans_opt
-lib/mercury/ints/hlc.par.gc/list.opt
-lib/mercury/ints/hlc.par.gc/list.trans_opt
-lib/mercury/ints/hlc.par.gc/map.opt
-lib/mercury/ints/hlc.par.gc/map.trans_opt
-lib/mercury/ints/hlc.par.gc/math.opt
-lib/mercury/ints/hlc.par.gc/math.trans_opt
-lib/mercury/ints/hlc.par.gc/mer_std.opt
-lib/mercury/ints/hlc.par.gc/mer_std.trans_opt
-lib/mercury/ints/hlc.par.gc/multi_map.opt
-lib/mercury/ints/hlc.par.gc/multi_map.trans_opt
-lib/mercury/ints/hlc.par.gc/ops.opt
-lib/mercury/ints/hlc.par.gc/ops.trans_opt
-lib/mercury/ints/hlc.par.gc/parser.opt
-lib/mercury/ints/hlc.par.gc/parser.trans_opt
-lib/mercury/ints/hlc.par.gc/pprint.opt
-lib/mercury/ints/hlc.par.gc/pprint.trans_opt
-lib/mercury/ints/hlc.par.gc/pqueue.opt
-lib/mercury/ints/hlc.par.gc/pqueue.trans_opt
-lib/mercury/ints/hlc.par.gc/private_builtin.opt
-lib/mercury/ints/hlc.par.gc/private_builtin.trans_opt
-lib/mercury/ints/hlc.par.gc/profiling_builtin.opt
-lib/mercury/ints/hlc.par.gc/profiling_builtin.trans_opt
-lib/mercury/ints/hlc.par.gc/prolog.opt
-lib/mercury/ints/hlc.par.gc/prolog.trans_opt
-lib/mercury/ints/hlc.par.gc/queue.opt
-lib/mercury/ints/hlc.par.gc/queue.trans_opt
-lib/mercury/ints/hlc.par.gc/random.opt
-lib/mercury/ints/hlc.par.gc/random.trans_opt
-lib/mercury/ints/hlc.par.gc/rational.opt
-lib/mercury/ints/hlc.par.gc/rational.trans_opt
-lib/mercury/ints/hlc.par.gc/rbtree.opt
-lib/mercury/ints/hlc.par.gc/rbtree.trans_opt
-lib/mercury/ints/hlc.par.gc/relation.opt
-lib/mercury/ints/hlc.par.gc/relation.trans_opt
-lib/mercury/ints/hlc.par.gc/require.opt
-lib/mercury/ints/hlc.par.gc/require.trans_opt
-lib/mercury/ints/hlc.par.gc/rtti_implementation.opt
-lib/mercury/ints/hlc.par.gc/rtti_implementation.trans_opt
-lib/mercury/ints/hlc.par.gc/set.opt
-lib/mercury/ints/hlc.par.gc/set.trans_opt
-lib/mercury/ints/hlc.par.gc/set_bbbtree.opt
-lib/mercury/ints/hlc.par.gc/set_bbbtree.trans_opt
-lib/mercury/ints/hlc.par.gc/set_ordlist.opt
-lib/mercury/ints/hlc.par.gc/set_ordlist.trans_opt
-lib/mercury/ints/hlc.par.gc/set_unordlist.opt
-lib/mercury/ints/hlc.par.gc/set_unordlist.trans_opt
-lib/mercury/ints/hlc.par.gc/sparse_bitset.opt
-lib/mercury/ints/hlc.par.gc/sparse_bitset.trans_opt
-lib/mercury/ints/hlc.par.gc/stack.opt
-lib/mercury/ints/hlc.par.gc/stack.trans_opt
-lib/mercury/ints/hlc.par.gc/std_util.opt
-lib/mercury/ints/hlc.par.gc/std_util.trans_opt
-lib/mercury/ints/hlc.par.gc/store.opt
-lib/mercury/ints/hlc.par.gc/store.trans_opt
-lib/mercury/ints/hlc.par.gc/string.opt
-lib/mercury/ints/hlc.par.gc/string.trans_opt
-lib/mercury/ints/hlc.par.gc/table_builtin.opt
-lib/mercury/ints/hlc.par.gc/table_builtin.trans_opt
-lib/mercury/ints/hlc.par.gc/term.opt
-lib/mercury/ints/hlc.par.gc/term.trans_opt
-lib/mercury/ints/hlc.par.gc/term_io.opt
-lib/mercury/ints/hlc.par.gc/term_io.trans_opt
-lib/mercury/ints/hlc.par.gc/time.opt
-lib/mercury/ints/hlc.par.gc/time.trans_opt
-lib/mercury/ints/hlc.par.gc/tree234.opt
-lib/mercury/ints/hlc.par.gc/tree234.trans_opt
-lib/mercury/ints/hlc.par.gc/type_desc.opt
-lib/mercury/ints/hlc.par.gc/type_desc.trans_opt
-lib/mercury/ints/hlc.par.gc/varset.opt
-lib/mercury/ints/hlc.par.gc/varset.trans_opt
+lib/mercury/ints/hlc.gc/version_array.opt
+lib/mercury/ints/hlc.gc/version_array.trans_opt
+lib/mercury/ints/hlc.gc/version_array2d.opt
+lib/mercury/ints/hlc.gc/version_array2d.trans_opt
+lib/mercury/ints/hlc.gc/version_bitmap.opt
+lib/mercury/ints/hlc.gc/version_bitmap.trans_opt
+lib/mercury/ints/hlc.gc/version_hash_table.opt
+lib/mercury/ints/hlc.gc/version_hash_table.trans_opt
+lib/mercury/ints/hlc.gc/version_store.opt
+lib/mercury/ints/hlc.gc/version_store.trans_opt
+lib/mercury/ints/hlc.gc/version_types.opt
+lib/mercury/ints/hlc.gc/version_types.trans_opt
+lib/mercury/ints/injection.int
+lib/mercury/ints/injection.int2
+lib/mercury/ints/injection.int3
+lib/mercury/ints/injection.mh
+lib/mercury/ints/injection.mih
+lib/mercury/ints/injection.module_dep
+lib/mercury/ints/injection.opt
+lib/mercury/ints/injection.trans_opt
 lib/mercury/ints/int.int
 lib/mercury/ints/int.int2
 lib/mercury/ints/int.int3
@@ -1398,6 +1945,14 @@ lib/mercury/ints/math.mih
 lib/mercury/ints/math.module_dep
 lib/mercury/ints/math.opt
 lib/mercury/ints/math.trans_opt
+lib/mercury/ints/maybe.int
+lib/mercury/ints/maybe.int2
+lib/mercury/ints/maybe.int3
+lib/mercury/ints/maybe.mh
+lib/mercury/ints/maybe.mih
+lib/mercury/ints/maybe.module_dep
+lib/mercury/ints/maybe.opt
+lib/mercury/ints/maybe.trans_opt
 lib/mercury/ints/mer_std.int
 lib/mercury/ints/mer_std.int2
 lib/mercury/ints/mer_std.int3
@@ -1414,6 +1969,14 @@ lib/mercury/ints/multi_map.mih
 lib/mercury/ints/multi_map.module_dep
 lib/mercury/ints/multi_map.opt
 lib/mercury/ints/multi_map.trans_opt
+lib/mercury/ints/mutvar.int
+lib/mercury/ints/mutvar.int2
+lib/mercury/ints/mutvar.int3
+lib/mercury/ints/mutvar.mh
+lib/mercury/ints/mutvar.mih
+lib/mercury/ints/mutvar.module_dep
+lib/mercury/ints/mutvar.opt
+lib/mercury/ints/mutvar.trans_opt
 lib/mercury/ints/ops.int
 lib/mercury/ints/ops.int2
 lib/mercury/ints/ops.int3
@@ -1422,6 +1985,14 @@ lib/mercury/ints/ops.mih
 lib/mercury/ints/ops.module_dep
 lib/mercury/ints/ops.opt
 lib/mercury/ints/ops.trans_opt
+lib/mercury/ints/pair.int
+lib/mercury/ints/pair.int2
+lib/mercury/ints/pair.int3
+lib/mercury/ints/pair.mh
+lib/mercury/ints/pair.mih
+lib/mercury/ints/pair.module_dep
+lib/mercury/ints/pair.opt
+lib/mercury/ints/pair.trans_opt
 lib/mercury/ints/parser.int
 lib/mercury/ints/parser.int2
 lib/mercury/ints/parser.int3
@@ -1518,6 +2089,22 @@ lib/mercury/ints/require.mih
 lib/mercury/ints/require.module_dep
 lib/mercury/ints/require.opt
 lib/mercury/ints/require.trans_opt
+lib/mercury/ints/robdd.int
+lib/mercury/ints/robdd.int2
+lib/mercury/ints/robdd.int3
+lib/mercury/ints/robdd.mh
+lib/mercury/ints/robdd.mih
+lib/mercury/ints/robdd.module_dep
+lib/mercury/ints/robdd.opt
+lib/mercury/ints/robdd.trans_opt
+lib/mercury/ints/rtree.int
+lib/mercury/ints/rtree.int2
+lib/mercury/ints/rtree.int3
+lib/mercury/ints/rtree.mh
+lib/mercury/ints/rtree.mih
+lib/mercury/ints/rtree.module_dep
+lib/mercury/ints/rtree.opt
+lib/mercury/ints/rtree.trans_opt
 lib/mercury/ints/rtti_implementation.int
 lib/mercury/ints/rtti_implementation.int2
 lib/mercury/ints/rtti_implementation.int3
@@ -1542,6 +2129,14 @@ lib/mercury/ints/set_bbbtree.mih
 lib/mercury/ints/set_bbbtree.module_dep
 lib/mercury/ints/set_bbbtree.opt
 lib/mercury/ints/set_bbbtree.trans_opt
+lib/mercury/ints/set_ctree234.int
+lib/mercury/ints/set_ctree234.int2
+lib/mercury/ints/set_ctree234.int3
+lib/mercury/ints/set_ctree234.mh
+lib/mercury/ints/set_ctree234.mih
+lib/mercury/ints/set_ctree234.module_dep
+lib/mercury/ints/set_ctree234.opt
+lib/mercury/ints/set_ctree234.trans_opt
 lib/mercury/ints/set_ordlist.int
 lib/mercury/ints/set_ordlist.int2
 lib/mercury/ints/set_ordlist.int3
@@ -1550,6 +2145,14 @@ lib/mercury/ints/set_ordlist.mih
 lib/mercury/ints/set_ordlist.module_dep
 lib/mercury/ints/set_ordlist.opt
 lib/mercury/ints/set_ordlist.trans_opt
+lib/mercury/ints/set_tree234.int
+lib/mercury/ints/set_tree234.int2
+lib/mercury/ints/set_tree234.int3
+lib/mercury/ints/set_tree234.mh
+lib/mercury/ints/set_tree234.mih
+lib/mercury/ints/set_tree234.module_dep
+lib/mercury/ints/set_tree234.opt
+lib/mercury/ints/set_tree234.trans_opt
 lib/mercury/ints/set_unordlist.int
 lib/mercury/ints/set_unordlist.int2
 lib/mercury/ints/set_unordlist.int3
@@ -1558,6 +2161,14 @@ lib/mercury/ints/set_unordlist.mih
 lib/mercury/ints/set_unordlist.module_dep
 lib/mercury/ints/set_unordlist.opt
 lib/mercury/ints/set_unordlist.trans_opt
+lib/mercury/ints/solutions.int
+lib/mercury/ints/solutions.int2
+lib/mercury/ints/solutions.int3
+lib/mercury/ints/solutions.mh
+lib/mercury/ints/solutions.mih
+lib/mercury/ints/solutions.module_dep
+lib/mercury/ints/solutions.opt
+lib/mercury/ints/solutions.trans_opt
 lib/mercury/ints/sparse_bitset.int
 lib/mercury/ints/sparse_bitset.int2
 lib/mercury/ints/sparse_bitset.int3
@@ -1598,6 +2209,86 @@ lib/mercury/ints/string.mih
 lib/mercury/ints/string.module_dep
 lib/mercury/ints/string.opt
 lib/mercury/ints/string.trans_opt
+lib/mercury/ints/svarray.int
+lib/mercury/ints/svarray.int2
+lib/mercury/ints/svarray.int3
+lib/mercury/ints/svarray.mh
+lib/mercury/ints/svarray.mih
+lib/mercury/ints/svarray.module_dep
+lib/mercury/ints/svarray.opt
+lib/mercury/ints/svarray.trans_opt
+lib/mercury/ints/svbag.int
+lib/mercury/ints/svbag.int2
+lib/mercury/ints/svbag.int3
+lib/mercury/ints/svbag.mh
+lib/mercury/ints/svbag.mih
+lib/mercury/ints/svbag.module_dep
+lib/mercury/ints/svbag.opt
+lib/mercury/ints/svbag.trans_opt
+lib/mercury/ints/svbimap.int
+lib/mercury/ints/svbimap.int2
+lib/mercury/ints/svbimap.int3
+lib/mercury/ints/svbimap.mh
+lib/mercury/ints/svbimap.mih
+lib/mercury/ints/svbimap.module_dep
+lib/mercury/ints/svbimap.opt
+lib/mercury/ints/svbimap.trans_opt
+lib/mercury/ints/sveqvclass.int
+lib/mercury/ints/sveqvclass.int2
+lib/mercury/ints/sveqvclass.int3
+lib/mercury/ints/sveqvclass.mh
+lib/mercury/ints/sveqvclass.mih
+lib/mercury/ints/sveqvclass.module_dep
+lib/mercury/ints/sveqvclass.opt
+lib/mercury/ints/sveqvclass.trans_opt
+lib/mercury/ints/svmap.int
+lib/mercury/ints/svmap.int2
+lib/mercury/ints/svmap.int3
+lib/mercury/ints/svmap.mh
+lib/mercury/ints/svmap.mih
+lib/mercury/ints/svmap.module_dep
+lib/mercury/ints/svmap.opt
+lib/mercury/ints/svmap.trans_opt
+lib/mercury/ints/svmulti_map.int
+lib/mercury/ints/svmulti_map.int2
+lib/mercury/ints/svmulti_map.int3
+lib/mercury/ints/svmulti_map.mh
+lib/mercury/ints/svmulti_map.mih
+lib/mercury/ints/svmulti_map.module_dep
+lib/mercury/ints/svmulti_map.opt
+lib/mercury/ints/svmulti_map.trans_opt
+lib/mercury/ints/svqueue.int
+lib/mercury/ints/svqueue.int2
+lib/mercury/ints/svqueue.int3
+lib/mercury/ints/svqueue.mh
+lib/mercury/ints/svqueue.mih
+lib/mercury/ints/svqueue.module_dep
+lib/mercury/ints/svqueue.opt
+lib/mercury/ints/svqueue.trans_opt
+lib/mercury/ints/svrelation.int
+lib/mercury/ints/svrelation.int2
+lib/mercury/ints/svrelation.int3
+lib/mercury/ints/svrelation.mh
+lib/mercury/ints/svrelation.mih
+lib/mercury/ints/svrelation.module_dep
+lib/mercury/ints/svrelation.opt
+lib/mercury/ints/svrelation.trans_opt
+lib/mercury/ints/svset.int
+lib/mercury/ints/svset.int2
+lib/mercury/ints/svset.int3
+lib/mercury/ints/svset.mh
+lib/mercury/ints/svset.mih
+lib/mercury/ints/svset.module_dep
+lib/mercury/ints/svset.opt
+lib/mercury/ints/svset.trans_opt
+lib/mercury/ints/svvarset.int
+lib/mercury/ints/svvarset.int2
+lib/mercury/ints/svvarset.int3
+lib/mercury/ints/svvarset.mh
+lib/mercury/ints/svvarset.mih
+lib/mercury/ints/svvarset.module_dep
+lib/mercury/ints/svvarset.opt
+lib/mercury/ints/svvarset.trans_opt
 lib/mercury/ints/table_builtin.int
 lib/mercury/ints/table_builtin.int2
 lib/mercury/ints/table_builtin.int3
@@ -1622,6 +2313,22 @@ lib/mercury/ints/term_io.mih
 lib/mercury/ints/term_io.module_dep
 lib/mercury/ints/term_io.opt
 lib/mercury/ints/term_io.trans_opt
+lib/mercury/ints/term_size_prof_builtin.int
+lib/mercury/ints/term_size_prof_builtin.int2
+lib/mercury/ints/term_size_prof_builtin.int3
+lib/mercury/ints/term_size_prof_builtin.mh
+lib/mercury/ints/term_size_prof_builtin.mih
+lib/mercury/ints/term_size_prof_builtin.module_dep
+lib/mercury/ints/term_size_prof_builtin.opt
+lib/mercury/ints/term_size_prof_builtin.trans_opt
+lib/mercury/ints/term_to_xml.int
+lib/mercury/ints/term_to_xml.int2
+lib/mercury/ints/term_to_xml.int3
+lib/mercury/ints/term_to_xml.mh
+lib/mercury/ints/term_to_xml.mih
+lib/mercury/ints/term_to_xml.module_dep
+lib/mercury/ints/term_to_xml.opt
+lib/mercury/ints/term_to_xml.trans_opt
 lib/mercury/ints/time.int
 lib/mercury/ints/time.int2
 lib/mercury/ints/time.int3
@@ -1646,6 +2353,22 @@ lib/mercury/ints/type_desc.mih
 lib/mercury/ints/type_desc.module_dep
 lib/mercury/ints/type_desc.opt
 lib/mercury/ints/type_desc.trans_opt
+lib/mercury/ints/unit.int
+lib/mercury/ints/unit.int2
+lib/mercury/ints/unit.int3
+lib/mercury/ints/unit.mh
+lib/mercury/ints/unit.mih
+lib/mercury/ints/unit.module_dep
+lib/mercury/ints/unit.opt
+lib/mercury/ints/unit.trans_opt
+lib/mercury/ints/univ.int
+lib/mercury/ints/univ.int2
+lib/mercury/ints/univ.int3
+lib/mercury/ints/univ.mh
+lib/mercury/ints/univ.mih
+lib/mercury/ints/univ.module_dep
+lib/mercury/ints/univ.opt
+lib/mercury/ints/univ.trans_opt
 lib/mercury/ints/varset.int
 lib/mercury/ints/varset.int2
 lib/mercury/ints/varset.int3
@@ -1654,178 +2377,290 @@ lib/mercury/ints/varset.mih
 lib/mercury/ints/varset.module_dep
 lib/mercury/ints/varset.opt
 lib/mercury/ints/varset.trans_opt
-lib/mercury/lib/${MACHINE_GNU_PLATFORM}/libgc.a
-lib/mercury/lib/${MACHINE_GNU_PLATFORM}/libgc_prof.a
-lib/mercury/lib/${MACHINE_GNU_PLATFORM}/libpar_gc.a
-lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_GNU_PLATFORM}/libmer_browser.a
-lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_GNU_PLATFORM}/libmer_rt.a
-lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_GNU_PLATFORM}/libmer_std.a
-lib/mercury/lib/asm_fast.gc.memprof/${MACHINE_GNU_PLATFORM}/libmer_trace.a
-lib/mercury/lib/asm_fast.gc.prof/${MACHINE_GNU_PLATFORM}/libmer_browser.a
-lib/mercury/lib/asm_fast.gc.prof/${MACHINE_GNU_PLATFORM}/libmer_rt.a
-lib/mercury/lib/asm_fast.gc.prof/${MACHINE_GNU_PLATFORM}/libmer_std.a
-lib/mercury/lib/asm_fast.gc.prof/${MACHINE_GNU_PLATFORM}/libmer_trace.a
-lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_GNU_PLATFORM}/libmer_browser.a
-lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_GNU_PLATFORM}/libmer_rt.a
-lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_GNU_PLATFORM}/libmer_std.a
-lib/mercury/lib/asm_fast.gc.tr.debug/${MACHINE_GNU_PLATFORM}/libmer_trace.a
-lib/mercury/lib/asm_fast.gc.tr/${MACHINE_GNU_PLATFORM}/libmer_browser.a
-lib/mercury/lib/asm_fast.gc.tr/${MACHINE_GNU_PLATFORM}/libmer_rt.a
-lib/mercury/lib/asm_fast.gc.tr/${MACHINE_GNU_PLATFORM}/libmer_std.a
-lib/mercury/lib/asm_fast.gc.tr/${MACHINE_GNU_PLATFORM}/libmer_trace.a
-lib/mercury/lib/asm_fast.gc/${MACHINE_GNU_PLATFORM}/libmer_browser.a
-lib/mercury/lib/asm_fast.gc/${MACHINE_GNU_PLATFORM}/libmer_rt.a
-lib/mercury/lib/asm_fast.gc/${MACHINE_GNU_PLATFORM}/libmer_std.a
-lib/mercury/lib/asm_fast.gc/${MACHINE_GNU_PLATFORM}/libmer_trace.a
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/Mercury/mihs
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/array.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/assoc_list.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/bag.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/benchmarking.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/bimap.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/bintree.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/bintree_set.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/bitmap.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/bool.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/bt_array.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/builtin.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/char.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/construct.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/counter.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/deconstruct.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/dir.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/enum.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/eqvclass.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/exception.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/float.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/gc.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/getopt.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/graph.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/group.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/hash_table.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/int.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/integer.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/io.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/lexer.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/library.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/list.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/map.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/math.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/mer_std.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/multi_map.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/ops.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/parser.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/pprint.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/pqueue.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/private_builtin.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/profiling_builtin.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/prolog.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/queue.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/random.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/rational.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/rbtree.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/relation.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/require.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/rtti_implementation.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/set.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/set_bbbtree.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/set_ordlist.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/set_unordlist.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/sparse_bitset.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/stack.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/std_util.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/store.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/string.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/table_builtin.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/term.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/term_io.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/time.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/tree234.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/type_desc.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/inc/varset.mih
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/libmer_browser.a
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/libmer_rt.a
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/libmer_std.a
-lib/mercury/lib/hlc.gc/${MACHINE_GNU_PLATFORM}/libmer_trace.a
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/Mercury/mihs
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/array.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/assoc_list.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/bag.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/benchmarking.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/bimap.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/bintree.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/bintree_set.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/bitmap.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/bool.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/bt_array.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/builtin.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/char.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/construct.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/counter.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/deconstruct.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/dir.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/enum.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/eqvclass.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/exception.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/float.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/gc.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/getopt.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/graph.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/group.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/hash_table.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/int.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/integer.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/io.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/lexer.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/library.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/list.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/map.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/math.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/mer_std.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/multi_map.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/ops.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/parser.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/pprint.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/pqueue.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/private_builtin.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/profiling_builtin.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/prolog.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/queue.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/random.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/rational.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/rbtree.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/relation.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/require.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/rtti_implementation.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/set.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/set_bbbtree.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/set_ordlist.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/set_unordlist.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/sparse_bitset.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/stack.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/std_util.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/store.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/string.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/table_builtin.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/term.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/term_io.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/time.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/tree234.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/type_desc.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/inc/varset.mih
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/libmer_browser.a
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/libmer_rt.a
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/libmer_std.a
-lib/mercury/lib/hlc.par.gc/${MACHINE_GNU_PLATFORM}/libmer_trace.a
+lib/mercury/ints/version_array.int
+lib/mercury/ints/version_array.int2
+lib/mercury/ints/version_array.int3
+lib/mercury/ints/version_array.mh
+lib/mercury/ints/version_array.mih
+lib/mercury/ints/version_array.module_dep
+lib/mercury/ints/version_array.opt
+lib/mercury/ints/version_array.trans_opt
+lib/mercury/ints/version_array2d.int
+lib/mercury/ints/version_array2d.int2
+lib/mercury/ints/version_array2d.int3
+lib/mercury/ints/version_array2d.mh
+lib/mercury/ints/version_array2d.mih
+lib/mercury/ints/version_array2d.module_dep
+lib/mercury/ints/version_array2d.opt
+lib/mercury/ints/version_array2d.trans_opt
+lib/mercury/ints/version_bitmap.int
+lib/mercury/ints/version_bitmap.int2
+lib/mercury/ints/version_bitmap.int3
+lib/mercury/ints/version_bitmap.mh
+lib/mercury/ints/version_bitmap.mih
+lib/mercury/ints/version_bitmap.module_dep
+lib/mercury/ints/version_bitmap.opt
+lib/mercury/ints/version_bitmap.trans_opt
+lib/mercury/ints/version_hash_table.int
+lib/mercury/ints/version_hash_table.int2
+lib/mercury/ints/version_hash_table.int3
+lib/mercury/ints/version_hash_table.mh
+lib/mercury/ints/version_hash_table.mih
+lib/mercury/ints/version_hash_table.module_dep
+lib/mercury/ints/version_hash_table.opt
+lib/mercury/ints/version_hash_table.trans_opt
+lib/mercury/ints/version_store.int
+lib/mercury/ints/version_store.int2
+lib/mercury/ints/version_store.int3
+lib/mercury/ints/version_store.mh
+lib/mercury/ints/version_store.mih
+lib/mercury/ints/version_store.module_dep
+lib/mercury/ints/version_store.opt
+lib/mercury/ints/version_store.trans_opt
+lib/mercury/ints/version_types.int
+lib/mercury/ints/version_types.int2
+lib/mercury/ints/version_types.int3
+lib/mercury/ints/version_types.mh
+lib/mercury/ints/version_types.mih
+lib/mercury/ints/version_types.module_dep
+lib/mercury/ints/version_types.opt
+lib/mercury/ints/version_types.trans_opt
+lib/mercury/lib/asm_fast.gc.decldebug/libmer_browser.a
+lib/mercury/lib/asm_fast.gc.decldebug/libmer_browser.so
+lib/mercury/lib/asm_fast.gc.decldebug/libmer_mdbcomp.a
+lib/mercury/lib/asm_fast.gc.decldebug/libmer_mdbcomp.so
+lib/mercury/lib/asm_fast.gc.decldebug/libmer_rt.a
+lib/mercury/lib/asm_fast.gc.decldebug/libmer_rt.so
+lib/mercury/lib/asm_fast.gc.decldebug/libmer_std.a
+lib/mercury/lib/asm_fast.gc.decldebug/libmer_std.so
+lib/mercury/lib/asm_fast.gc.decldebug/libmer_trace.a
+lib/mercury/lib/asm_fast.gc.decldebug/libmer_trace.so
+lib/mercury/lib/asm_fast.gc.memprof/libmer_browser.a
+lib/mercury/lib/asm_fast.gc.memprof/libmer_browser.so
+lib/mercury/lib/asm_fast.gc.memprof/libmer_mdbcomp.a
+lib/mercury/lib/asm_fast.gc.memprof/libmer_mdbcomp.so
+lib/mercury/lib/asm_fast.gc.memprof/libmer_rt.a
+lib/mercury/lib/asm_fast.gc.memprof/libmer_rt.so
+lib/mercury/lib/asm_fast.gc.memprof/libmer_std.a
+lib/mercury/lib/asm_fast.gc.memprof/libmer_std.so
+lib/mercury/lib/asm_fast.gc.memprof/libmer_trace.a
+lib/mercury/lib/asm_fast.gc.memprof/libmer_trace.so
+lib/mercury/lib/asm_fast.gc.prof/libmer_browser.a
+lib/mercury/lib/asm_fast.gc.prof/libmer_browser.so
+lib/mercury/lib/asm_fast.gc.prof/libmer_mdbcomp.a
+lib/mercury/lib/asm_fast.gc.prof/libmer_mdbcomp.so
+lib/mercury/lib/asm_fast.gc.prof/libmer_rt.a
+lib/mercury/lib/asm_fast.gc.prof/libmer_rt.so
+lib/mercury/lib/asm_fast.gc.prof/libmer_std.a
+lib/mercury/lib/asm_fast.gc.prof/libmer_std.so
+lib/mercury/lib/asm_fast.gc.prof/libmer_trace.a
+lib/mercury/lib/asm_fast.gc.prof/libmer_trace.so
+lib/mercury/lib/asm_fast.gc.tr.debug/libmer_browser.a
+lib/mercury/lib/asm_fast.gc.tr.debug/libmer_browser.so
+lib/mercury/lib/asm_fast.gc.tr.debug/libmer_mdbcomp.a
+lib/mercury/lib/asm_fast.gc.tr.debug/libmer_mdbcomp.so
+lib/mercury/lib/asm_fast.gc.tr.debug/libmer_rt.a
+lib/mercury/lib/asm_fast.gc.tr.debug/libmer_rt.so
+lib/mercury/lib/asm_fast.gc.tr.debug/libmer_std.a
+lib/mercury/lib/asm_fast.gc.tr.debug/libmer_std.so
+lib/mercury/lib/asm_fast.gc.tr.debug/libmer_trace.a
+lib/mercury/lib/asm_fast.gc.tr.debug/libmer_trace.so
+lib/mercury/lib/asm_fast.gc.tr/libmer_browser.a
+lib/mercury/lib/asm_fast.gc.tr/libmer_browser.so
+lib/mercury/lib/asm_fast.gc.tr/libmer_mdbcomp.a
+lib/mercury/lib/asm_fast.gc.tr/libmer_mdbcomp.so
+lib/mercury/lib/asm_fast.gc.tr/libmer_rt.a
+lib/mercury/lib/asm_fast.gc.tr/libmer_rt.so
+lib/mercury/lib/asm_fast.gc.tr/libmer_std.a
+lib/mercury/lib/asm_fast.gc.tr/libmer_std.so
+lib/mercury/lib/asm_fast.gc.tr/libmer_trace.a
+lib/mercury/lib/asm_fast.gc.tr/libmer_trace.so
+lib/mercury/lib/asm_fast.gc/libmer_browser.a
+lib/mercury/lib/asm_fast.gc/libmer_browser.so
+lib/mercury/lib/asm_fast.gc/libmer_mdbcomp.a
+lib/mercury/lib/asm_fast.gc/libmer_mdbcomp.so
+lib/mercury/lib/asm_fast.gc/libmer_rt.a
+lib/mercury/lib/asm_fast.gc/libmer_rt.so
+lib/mercury/lib/asm_fast.gc/libmer_std.a
+lib/mercury/lib/asm_fast.gc/libmer_std.so
+lib/mercury/lib/asm_fast.gc/libmer_trace.a
+lib/mercury/lib/asm_fast.gc/libmer_trace.so
+lib/mercury/lib/hlc.gc/inc/Mercury/mihs
+lib/mercury/lib/hlc.gc/inc/array.mih
+lib/mercury/lib/hlc.gc/inc/array2d.mih
+lib/mercury/lib/hlc.gc/inc/assoc_list.mih
+lib/mercury/lib/hlc.gc/inc/bag.mih
+lib/mercury/lib/hlc.gc/inc/benchmarking.mih
+lib/mercury/lib/hlc.gc/inc/bimap.mih
+lib/mercury/lib/hlc.gc/inc/bintree.mih
+lib/mercury/lib/hlc.gc/inc/bintree_set.mih
+lib/mercury/lib/hlc.gc/inc/bitmap.mih
+lib/mercury/lib/hlc.gc/inc/bool.mih
+lib/mercury/lib/hlc.gc/inc/bt_array.mih
+lib/mercury/lib/hlc.gc/inc/builtin.mih
+lib/mercury/lib/hlc.gc/inc/char.mih
+lib/mercury/lib/hlc.gc/inc/construct.mih
+lib/mercury/lib/hlc.gc/inc/cord.mih
+lib/mercury/lib/hlc.gc/inc/counter.mih
+lib/mercury/lib/hlc.gc/inc/deconstruct.mih
+lib/mercury/lib/hlc.gc/inc/dir.mih
+lib/mercury/lib/hlc.gc/inc/enum.mih
+lib/mercury/lib/hlc.gc/inc/eqvclass.mih
+lib/mercury/lib/hlc.gc/inc/exception.mih
+lib/mercury/lib/hlc.gc/inc/float.mih
+lib/mercury/lib/hlc.gc/inc/gc.mih
+lib/mercury/lib/hlc.gc/inc/getopt.mih
+lib/mercury/lib/hlc.gc/inc/getopt_io.mih
+lib/mercury/lib/hlc.gc/inc/graph.mih
+lib/mercury/lib/hlc.gc/inc/group.mih
+lib/mercury/lib/hlc.gc/inc/hash_table.mih
+lib/mercury/lib/hlc.gc/inc/injection.mih
+lib/mercury/lib/hlc.gc/inc/int.mih
+lib/mercury/lib/hlc.gc/inc/integer.mih
+lib/mercury/lib/hlc.gc/inc/io.mih
+lib/mercury/lib/hlc.gc/inc/lexer.mih
+lib/mercury/lib/hlc.gc/inc/library.mih
+lib/mercury/lib/hlc.gc/inc/list.mih
+lib/mercury/lib/hlc.gc/inc/map.mih
+lib/mercury/lib/hlc.gc/inc/math.mih
+lib/mercury/lib/hlc.gc/inc/maybe.mih
+lib/mercury/lib/hlc.gc/inc/mer_std.mih
+lib/mercury/lib/hlc.gc/inc/multi_map.mih
+lib/mercury/lib/hlc.gc/inc/mutvar.mih
+lib/mercury/lib/hlc.gc/inc/ops.mih
+lib/mercury/lib/hlc.gc/inc/pair.mih
+lib/mercury/lib/hlc.gc/inc/parser.mih
+lib/mercury/lib/hlc.gc/inc/pprint.mih
+lib/mercury/lib/hlc.gc/inc/pqueue.mih
+lib/mercury/lib/hlc.gc/inc/private_builtin.mih
+lib/mercury/lib/hlc.gc/inc/profiling_builtin.mih
+lib/mercury/lib/hlc.gc/inc/prolog.mih
+lib/mercury/lib/hlc.gc/inc/queue.mih
+lib/mercury/lib/hlc.gc/inc/random.mih
+lib/mercury/lib/hlc.gc/inc/rational.mih
+lib/mercury/lib/hlc.gc/inc/rbtree.mih
+lib/mercury/lib/hlc.gc/inc/relation.mih
+lib/mercury/lib/hlc.gc/inc/require.mih
+lib/mercury/lib/hlc.gc/inc/robdd.mih
+lib/mercury/lib/hlc.gc/inc/rtree.mih
+lib/mercury/lib/hlc.gc/inc/rtti_implementation.mih
+lib/mercury/lib/hlc.gc/inc/set.mih
+lib/mercury/lib/hlc.gc/inc/set_bbbtree.mih
+lib/mercury/lib/hlc.gc/inc/set_ctree234.mih
+lib/mercury/lib/hlc.gc/inc/set_ordlist.mih
+lib/mercury/lib/hlc.gc/inc/set_tree234.mih
+lib/mercury/lib/hlc.gc/inc/set_unordlist.mih
+lib/mercury/lib/hlc.gc/inc/solutions.mih
+lib/mercury/lib/hlc.gc/inc/sparse_bitset.mih
+lib/mercury/lib/hlc.gc/inc/stack.mih
+lib/mercury/lib/hlc.gc/inc/std_util.mih
+lib/mercury/lib/hlc.gc/inc/store.mih
+lib/mercury/lib/hlc.gc/inc/string.mih
+lib/mercury/lib/hlc.gc/inc/svarray.mih
+lib/mercury/lib/hlc.gc/inc/svbag.mih
+lib/mercury/lib/hlc.gc/inc/svbimap.mih
+lib/mercury/lib/hlc.gc/inc/sveqvclass.mih
+lib/mercury/lib/hlc.gc/inc/svmap.mih
+lib/mercury/lib/hlc.gc/inc/svmulti_map.mih
+lib/mercury/lib/hlc.gc/inc/svqueue.mih
+lib/mercury/lib/hlc.gc/inc/svrelation.mih
+lib/mercury/lib/hlc.gc/inc/svset.mih
+lib/mercury/lib/hlc.gc/inc/svvarset.mih
+lib/mercury/lib/hlc.gc/inc/table_builtin.mih
+lib/mercury/lib/hlc.gc/inc/term.mih
+lib/mercury/lib/hlc.gc/inc/term_io.mih
+lib/mercury/lib/hlc.gc/inc/term_size_prof_builtin.mih
+lib/mercury/lib/hlc.gc/inc/term_to_xml.mih
+lib/mercury/lib/hlc.gc/inc/time.mih
+lib/mercury/lib/hlc.gc/inc/tree234.mih
+lib/mercury/lib/hlc.gc/inc/type_desc.mih
+lib/mercury/lib/hlc.gc/inc/unit.mih
+lib/mercury/lib/hlc.gc/inc/univ.mih
+lib/mercury/lib/hlc.gc/inc/varset.mih
+lib/mercury/lib/hlc.gc/inc/version_array.mih
+lib/mercury/lib/hlc.gc/inc/version_array2d.mih
+lib/mercury/lib/hlc.gc/inc/version_bitmap.mih
+lib/mercury/lib/hlc.gc/inc/version_hash_table.mih
+lib/mercury/lib/hlc.gc/inc/version_store.mih
+lib/mercury/lib/hlc.gc/inc/version_types.mih
+lib/mercury/lib/hlc.gc/libmer_browser.a
+lib/mercury/lib/hlc.gc/libmer_browser.so
+lib/mercury/lib/hlc.gc/libmer_mdbcomp.a
+lib/mercury/lib/hlc.gc/libmer_mdbcomp.so
+lib/mercury/lib/hlc.gc/libmer_rt.a
+lib/mercury/lib/hlc.gc/libmer_rt.so
+lib/mercury/lib/hlc.gc/libmer_std.a
+lib/mercury/lib/hlc.gc/libmer_std.so
+lib/mercury/lib/hlc.gc/libmer_trace.a
+lib/mercury/lib/hlc.gc/libmer_trace.so
+lib/mercury/lib/libgc.a
+lib/mercury/lib/libgc.so
+lib/mercury/lib/libgc_prof.a
+lib/mercury/lib/libgc_prof.so
 lib/mercury/mdb/mdb_doc
 lib/mercury/mdb/mdbrc
+lib/mercury/mdb/xul_tree.xsl
 lib/mercury/mmake/Mmake.rules
 lib/mercury/mmake/Mmake.vars
 lib/mercury/modules/mer_browser.init
+lib/mercury/modules/mer_mdbcomp.init
 lib/mercury/modules/mer_rt.init
 lib/mercury/modules/mer_std.init
+lib/mercury/reconf/VERSION
+lib/mercury/reconf/aclocal.m4
+lib/mercury/reconf/config.guess
+lib/mercury/reconf/config.sub
+lib/mercury/reconf/configure
+lib/mercury/reconf/configure.in
+lib/mercury/reconf/install-sh
+lib/mercury/reconf/runtime/mercury_conf.h.in
+lib/mercury/reconf/scripts/Mercury.config.bootstrap.in
+lib/mercury/reconf/scripts/Mercury.config.in
+lib/mercury/reconf/scripts/Mmake.vars.in
+lib/mercury/reconf/scripts/c2init
+lib/mercury/reconf/scripts/c2init.in
+lib/mercury/reconf/scripts/canonical_grade
+lib/mercury/reconf/scripts/canonical_grade.in
+lib/mercury/reconf/scripts/canonical_grade.sh-subr
+lib/mercury/reconf/scripts/final_grade_options.sh-subr
+lib/mercury/reconf/scripts/init_grade_options.sh-subr
+lib/mercury/reconf/scripts/mdb
+lib/mercury/reconf/scripts/mdb.in
+lib/mercury/reconf/scripts/mdbrc.in
+lib/mercury/reconf/scripts/mdprof
+lib/mercury/reconf/scripts/mdprof.in
+lib/mercury/reconf/scripts/mercury.bat
+lib/mercury/reconf/scripts/mercury.bat.in
+lib/mercury/reconf/scripts/mercury_cleanup_install
+lib/mercury/reconf/scripts/mercury_config
+lib/mercury/reconf/scripts/mercury_config.in
+lib/mercury/reconf/scripts/mercury_update_interface
+lib/mercury/reconf/scripts/mercury_update_interface.in
+lib/mercury/reconf/scripts/mgnuc
+lib/mercury/reconf/scripts/mgnuc.in
+lib/mercury/reconf/scripts/mgnuc_file_opts.sh-subr
+lib/mercury/reconf/scripts/mkfifo_using_mknod
+lib/mercury/reconf/scripts/mkfifo_using_mknod.in
+lib/mercury/reconf/scripts/ml
+lib/mercury/reconf/scripts/ml.in
+lib/mercury/reconf/scripts/mmake
+lib/mercury/reconf/scripts/mmake.in
+lib/mercury/reconf/scripts/mmc
+lib/mercury/reconf/scripts/mmc.in
+lib/mercury/reconf/scripts/mprof
+lib/mercury/reconf/scripts/mprof.in
+lib/mercury/reconf/scripts/mprof_merge_runs
+lib/mercury/reconf/scripts/mtags
+lib/mercury/reconf/scripts/mtc
+lib/mercury/reconf/scripts/parse_grade_options.sh-subr
+lib/mercury/reconf/scripts/parse_ml_options.sh-subr
+lib/mercury/reconf/scripts/parse_ml_options.sh-subr.in
+lib/mercury/reconf/scripts/prepare_tmp_dir_fixed_part
+lib/mercury/reconf/scripts/prepare_tmp_dir_fixed_part.in
+lib/mercury/reconf/scripts/vpath_find
 man/man1/c2init.1
 man/man1/mdb.1
+man/man1/mercury_config.1
 man/man1/mgnuc.1
 man/man1/ml.1
 man/man1/mmake.1
@@ -1833,25 +2668,19 @@ man/man1/mmc.1
 man/man1/mprof.1
 man/man1/mprof_merge_runs.1
 man/man1/mtags.1
-share/doc/html/mercury/faq.html
-share/doc/html/mercury/faq_toc.html
-share/doc/html/mercury/library.html
-share/doc/html/mercury/library_toc.html
 share/doc/html/mercury/mercury.html
-share/doc/html/mercury/reference_manual.html
-share/doc/html/mercury/reference_manual_foot.html
-share/doc/html/mercury/reference_manual_toc.html
-share/doc/html/mercury/transition_guide.html
-share/doc/html/mercury/transition_guide_toc.html
-share/doc/html/mercury/user_guide.html
-share/doc/html/mercury/user_guide_foot.html
-share/doc/html/mercury/user_guide_toc.html
+share/doc/html/mercury/mercury_faq.html
+share/doc/html/mercury/mercury_library.html
+share/doc/html/mercury/mercury_ref.html
+share/doc/html/mercury/mercury_trans_guide.html
+share/doc/html/mercury/mercury_user_guide.html
 share/doc/mercury/faq.dvi
 share/doc/mercury/library.dvi
 share/doc/mercury/reference_manual.dvi
 share/doc/mercury/transition_guide.dvi
 share/doc/mercury/user_guide.dvi
 share/emacs/site-lisp/mercury/gud.el
+share/examples/mercury/.nocopyright
 share/examples/mercury/Mmakefile
 share/examples/mercury/README
 share/examples/mercury/c_interface/README
@@ -1873,7 +2702,7 @@ share/examples/mercury/c_interface/mercury_calls_c/c_main.h
 share/examples/mercury/c_interface/mercury_calls_c/c_main_int.m
 share/examples/mercury/c_interface/mercury_calls_c/mercury_main.m
 share/examples/mercury/c_interface/mercury_calls_cplusplus/Mmakefile
-share/examples/mercury/c_interface/mercury_calls_cplusplus/cpp_main.c
+share/examples/mercury/c_interface/mercury_calls_cplusplus/cpp_main.cc
 share/examples/mercury/c_interface/mercury_calls_cplusplus/cpp_main.h
 share/examples/mercury/c_interface/mercury_calls_cplusplus/cpp_main_int.m
 share/examples/mercury/c_interface/mercury_calls_cplusplus/mercury_main.m
@@ -1939,6 +2768,7 @@ share/examples/mercury/rot13/rot13_juergen.m
 share/examples/mercury/rot13/rot13_ralph.m
 share/examples/mercury/rot13/rot13_verbose.m
 share/examples/mercury/solutions/all_solutions.m
+share/examples/mercury/solutions/n_solutions.m
 share/examples/mercury/solutions/one_solution.m
 share/examples/mercury/solutions/some_solutions.m
 share/examples/mercury/sort.m
diff --git a/lang/mercury/distinfo b/lang/mercury/distinfo
index af0b15d9399..c0e3206f53b 100644
--- a/lang/mercury/distinfo
+++ b/lang/mercury/distinfo
@@ -1,20 +1,15 @@
-$NetBSD: distinfo,v 1.9 2006/10/22 20:29:49 rillig Exp $
+$NetBSD: distinfo,v 1.10 2010/07/20 12:29:20 asau Exp $
 
-SHA1 (mercury-compiler-0.11.0.tar.gz) = 17feadfa8e8783738fc18428c6ab59b61c1e8a73
-RMD160 (mercury-compiler-0.11.0.tar.gz) = a29edbca8253e921fa5f7c17f605f71ec0a65b56
-Size (mercury-compiler-0.11.0.tar.gz) = 15598754 bytes
-SHA1 (patch-aa) = 4cfe2e7cc82d98f7338e8e3e4b753f6bdec0472f
-SHA1 (patch-ab) = b253e9a8da66e44b94d621a8b212d4229e269e8f
+SHA1 (mercury-compiler-0.13.1.tar.gz) = 919eb45ba34c503fc2e7391225e52a5cfbb80616
+RMD160 (mercury-compiler-0.13.1.tar.gz) = a0a80cd2ac7393cf084b79d40230bd1efe795c5f
+Size (mercury-compiler-0.13.1.tar.gz) = 15938824 bytes
+SHA1 (patch-ab) = 5245328e629fea2395507e51d38faaa9e961a25e
 SHA1 (patch-ac) = 94a59bded8b57a4e919dd029690629b552dfd681
 SHA1 (patch-ad) = a76030a9c15d160c46d2003aba5b74e6b7bed6e2
-SHA1 (patch-ae) = 0d9105492d30e915da33d1679ce65ab615866875
-SHA1 (patch-af) = 2ed2b8d098c01ad1b79a8308885ba0af9b5bf05f
-SHA1 (patch-ag) = cb846e04ad686ebafbd1826235f9c5cbea619eed
-SHA1 (patch-ah) = 460ff322fda6ad3dcde3de459a15cdb2a35d3946
-SHA1 (patch-ai) = 4f1df99df946118a0c2eb4a5e2481036d5c44177
-SHA1 (patch-aj) = fb0df25aeb55a1c466fa0def40b7096269ba8d6c
-SHA1 (patch-ak) = 20223ebfa573659d2217b6177bf2e2b523eb248d
-SHA1 (patch-al) = 5eb7f071049b163807f7a0c833eeecd941e7cbfb
-SHA1 (patch-am) = d0d3211c8d3e55beaba5a73b39f6bb3853e1602d
-SHA1 (patch-an) = d581d673d677f88fc4a48319df3a6458e598499b
-SHA1 (patch-ao) = c9b57f296e98cc860cdbcb0332abe2e979c2248b
+SHA1 (patch-an) = 65bfb05147fe2f3663b35e494b8e8bf7fc6906e2
+SHA1 (patch-ao) = c994597a95edc8376c4916333e7ad371752bbd2e
+SHA1 (patch-ap) = fbbb66c0557e8ceff49a8289d97b521d92dbf022
+SHA1 (patch-aq) = fcf7b99650d9f288cbc4200c2bc48934f7198845
+SHA1 (patch-ar) = d81ce88cc5ed51b1122c251719dd69415402ec1c
+SHA1 (patch-as) = da64e85f5a1722497cd4fb954243680a39300f61
+SHA1 (patch-at) = 02dcd6cbe2e2bff6c86f03d49fa9a6cfb821804b
diff --git a/lang/mercury/patches/patch-aa b/lang/mercury/patches/patch-aa
deleted file mode 100644
index 9ad561d8289..00000000000
--- a/lang/mercury/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/05/02 17:48:29 jtb Exp $
-
---- Mmake.workspace.orig
-+++ Mmake.workspace
-@@ -110,7 +110,7 @@
- #
- # Work out the C include directories.
- #
--C_INCL_DIRS =	-I$(BOEHM_GC_DIR) -I$(BOEHM_GC_DIR)/include -I$(MPS_GC_DIR)
-+C_INCL_DIRS =	-I$(BOEHM_GC_DIR) -I$(BOEHM_GC_DIR)/include -I$(MPS_GC_DIR) -I$(READLINE_PREFIX)/include
- ifneq ($(LINK_BOEHM_GC_ONLY),yes)
- C_INCL_DIRS +=	-I$(RUNTIME_DIR)
- ifneq ($(LINK_RUNTIME_ONLY),yes)
diff --git a/lang/mercury/patches/patch-ab b/lang/mercury/patches/patch-ab
index 92590bfbb4b..2b831f65550 100644
--- a/lang/mercury/patches/patch-ab
+++ b/lang/mercury/patches/patch-ab
@@ -1,17 +1,19 @@
-$NetBSD: patch-ab,v 1.2 2003/05/02 17:48:29 jtb Exp $
+$NetBSD: patch-ab,v 1.3 2010/07/20 12:29:20 asau Exp $
 
---- scripts/Mmake.vars.in.orig
-+++ scripts/Mmake.vars.in
-@@ -692,13 +692,13 @@
- INSTALL_LIBDIR		= $(INSTALL_PREFIX)/lib/mercury
+--- scripts/Mmake.vars.in.orig	2006-11-03 08:42:28.000000000 +0300
++++ scripts/Mmake.vars.in	2010-01-11 14:10:26.000000000 +0300
+@@ -721,14 +721,14 @@
  FINAL_INSTALL_LIBDIR	= $(FINAL_INSTALL_PREFIX)/lib/mercury
+ INSTALL_JAVA_LIBRARY_DIR= $(INSTALL_PREFIX)/lib/mercury/lib/java
  INSTALL_INFO_DIR	= $(INSTALL_PREFIX)/info
 -INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
 -INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/lib/mercury/doc
 -INSTALL_PS_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
+-INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/lib/mercury/doc
 +INSTALL_DVI_DIR		= $(INSTALL_PREFIX)/share/doc/mercury
 +INSTALL_TEXT_DIR	= $(INSTALL_PREFIX)/share/doc/mercury
 +INSTALL_PS_DIR		= $(INSTALL_PREFIX)/share/doc/mercury
++INSTALL_PDF_DIR		= $(INSTALL_PREFIX)/share/doc/mercury
  INSTALL_MAN_DIR		= $(INSTALL_PREFIX)/man
 -INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/lib/mercury/html
 +INSTALL_HTML_DIR	= $(INSTALL_PREFIX)/share/doc/html/mercury
diff --git a/lang/mercury/patches/patch-ae b/lang/mercury/patches/patch-ae
deleted file mode 100644
index de1882e12ab..00000000000
--- a/lang/mercury/patches/patch-ae
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/07/05 21:16:38 seb Exp $
-
---- doc/mercury_ref.info.orig	2002-12-23 18:32:55.000000000 +0000
-+++ doc/mercury_ref.info
-@@ -1,6 +1,11 @@
- This is mercury_ref.info, produced by makeinfo version 4.1 from
- reference_manual.texi_pp.
- 
-+INFO-DIR-SECTION The Mercury Programming Language
-+START-INFO-DIR-ENTRY
-+* Mercury Language: (mercury_ref).  The Mercury Language Reference Manual.
-+END-INFO-DIR-ENTRY
-+
-    This file documents the Mercury programming language, version 0.11.0.
- 
-    Copyright (C) 1995-2002 The University of Melbourne.
diff --git a/lang/mercury/patches/patch-af b/lang/mercury/patches/patch-af
deleted file mode 100644
index e6c0e34f19a..00000000000
--- a/lang/mercury/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.4 2003/07/05 21:16:38 seb Exp $
-
---- doc/mercury_trans_guide.info.orig	2002-12-23 18:32:56.000000000 +0000
-+++ doc/mercury_trans_guide.info
-@@ -1,6 +1,12 @@
- This is mercury_trans_guide.info, produced by makeinfo version 4.1 from
- transition_guide.texi_pp.
- 
-+INFO-DIR-SECTION The Mercury Programming Language
-+START-INFO-DIR-ENTRY
-+* Mercury Transition Guide: (mercury_trans_guide). The Prolog to Mercury
-+                                                   Transition Guide.
-+END-INFO-DIR-ENTRY
-+
-    This file is an aid for people porting Prolog programs to Mercury.
- 
-    Copyright (C) 1995-2002 The University of Melbourne.
diff --git a/lang/mercury/patches/patch-ag b/lang/mercury/patches/patch-ag
deleted file mode 100644
index 9a9fcd4ab66..00000000000
--- a/lang/mercury/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2003/07/05 21:16:38 seb Exp $
-
---- doc/mercury_faq.info.orig	2002-12-23 18:32:56.000000000 +0000
-+++ doc/mercury_faq.info
-@@ -1,6 +1,11 @@
- This is mercury_faq.info, produced by makeinfo version 4.1 from
- faq.texi_pp.
- 
-+INFO-DIR-SECTION The Mercury Programming Language
-+START-INFO-DIR-ENTRY
-+* Mercury FAQ: (mercury_faq). The Mercury Frequently Asked Questions list.
-+END-INFO-DIR-ENTRY
-+
-    This file is the Mercury Frequently Asked Questions List, version
- 0.11.0.  It contains a list of frequently asked questions about
- Mercury, with answers.
diff --git a/lang/mercury/patches/patch-ah b/lang/mercury/patches/patch-ah
deleted file mode 100644
index 68171172289..00000000000
--- a/lang/mercury/patches/patch-ah
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ah,v 1.3 2003/07/05 21:16:38 seb Exp $
-
---- doc/mercury_library.info.orig	2002-12-23 18:32:56.000000000 +0000
-+++ doc/mercury_library.info
-@@ -1,6 +1,11 @@
- This is mercury_library.info, produced by makeinfo version 4.1 from
- library.texi_pp.
- 
-+INFO-DIR-SECTION The Mercury Programming Language
-+START-INFO-DIR-ENTRY
-+* Mercury Library: (mercury_library).  The Mercury Library Reference Manual.
-+END-INFO-DIR-ENTRY
-+
-    This file documents the Mercury standard library, version 0.11.0.
- 
-    Copyright (C) 1995-1997,1999-2002 The University of Melbourne.
diff --git a/lang/mercury/patches/patch-ai b/lang/mercury/patches/patch-ai
deleted file mode 100644
index 718a701d470..00000000000
--- a/lang/mercury/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.4 2004/02/14 03:04:31 kristerw Exp $
-
---- scripts/mgnuc.in.orig	Fri Feb 13 16:49:12 2004
-+++ scripts/mgnuc.in	Wed Oct 30 17:35:37 2002
-@@ -51,7 +51,7 @@
- # -Wenum-clash 		is for C++ only
- # -Wunused		causes various spurious warnings
- 
--	OPT_OPTS="-O2 -fomit-frame-pointer"
-+	OPT_OPTS="-O2 -fomit-frame-pointer -fno-strict-aliasing"
- 	DEBUG_OPT="-g"
- 	COMPILER=gcc
- 	;;
diff --git a/lang/mercury/patches/patch-aj b/lang/mercury/patches/patch-aj
deleted file mode 100644
index b6244596f2f..00000000000
--- a/lang/mercury/patches/patch-aj
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aj,v 1.3 2004/02/14 03:04:31 kristerw Exp $
-
---- runtime/mercury_memory_zones.c.orig	Fri Feb 13 16:18:20 2004
-+++ runtime/mercury_memory_zones.c	Fri Feb 13 16:22:11 2004
-@@ -30,6 +30,7 @@
- 
- #include <stdio.h>
- #include <string.h>
-+#include <signal.h>
- 
- #ifdef MR_HAVE_SYS_SIGINFO_H
-   #include <sys/siginfo.h>
diff --git a/lang/mercury/patches/patch-ak b/lang/mercury/patches/patch-ak
deleted file mode 100644
index 77be9ac8bb5..00000000000
--- a/lang/mercury/patches/patch-ak
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2004/02/14 03:04:31 kristerw Exp $
-
---- library/table_builtin.m.orig	Fri Feb 13 18:47:59 2004
-+++ library/table_builtin.m	Fri Feb 13 18:48:23 2004
-@@ -537,7 +537,7 @@
- 
- #ifdef	MR_DEBUG_RETRY
- 			if (MR_io_tabling_debug) {
--				printf("" in range\n"");
-+				printf("" in range\\n"");
- 			}
- #endif
- 
-@@ -546,7 +546,7 @@
- 
- #ifdef	MR_DEBUG_RETRY
- 			if (MR_io_tabling_debug) {
--				printf("" not in range\n"");
-+				printf("" not in range\\n"");
- 			}
- #endif
- 			SUCCESS_INDICATOR = MR_FALSE;
diff --git a/lang/mercury/patches/patch-al b/lang/mercury/patches/patch-al
deleted file mode 100644
index 7aeeaa7b1db..00000000000
--- a/lang/mercury/patches/patch-al
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-al,v 1.3 2004/02/14 03:04:31 kristerw Exp $
-
---- library/table_builtin.c.orig	Fri Feb 13 16:29:53 2004
-+++ library/table_builtin.c	Fri Feb 13 16:31:20 2004
-@@ -652,8 +652,7 @@
- 
- #ifdef	MR_DEBUG_RETRY
- 			if (MR_io_tabling_debug) {
--				printf(" in range
--");
-+				printf(" in range\n");
- 			}
- #endif
- 
-@@ -662,8 +661,7 @@
- 
- #ifdef	MR_DEBUG_RETRY
- 			if (MR_io_tabling_debug) {
--				printf(" not in range
--");
-+				printf(" not in range\n");
- 			}
- #endif
- 			SUCCESS_INDICATOR = MR_FALSE;
diff --git a/lang/mercury/patches/patch-am b/lang/mercury/patches/patch-am
deleted file mode 100644
index b9aa382030e..00000000000
--- a/lang/mercury/patches/patch-am
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-am,v 1.1 2004/03/07 00:19:29 seb Exp $
-
---- doc/mercury_user_guide.info.orig	2002-12-23 18:32:55.000000000 +0000
-+++ doc/mercury_user_guide.info
-@@ -1,6 +1,12 @@
- This is mercury_user_guide.info, produced by makeinfo version 4.1 from
- user_guide.texi_pp.
- 
-+INFO-DIR-SECTION The Mercury Programming Language
-+START-INFO-DIR-ENTRY
-+* Mercury User Guide: (mercury_user_guide).  The Mercury compilation
-+                                             environment.
-+END-INFO-DIR-ENTRY
-+
-    This file documents the Mercury implementation, version 0.11.0.
- 
-    Copyright (C) 1995-2002 The University of Melbourne.
diff --git a/lang/mercury/patches/patch-an b/lang/mercury/patches/patch-an
index 3e6eee0f601..63db5cf9e27 100644
--- a/lang/mercury/patches/patch-an
+++ b/lang/mercury/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.1 2006/10/22 20:29:49 rillig Exp $
+$NetBSD: patch-an,v 1.2 2010/07/20 12:29:21 asau Exp $
 
---- tools/backupdir.orig	2000-02-24 23:37:28.000000000 +0100
-+++ tools/backupdir	2006-10-22 22:27:51.000000000 +0200
-@@ -25,7 +25,7 @@ do
+--- tools/backupdir.orig	2000-02-25 01:37:28.000000000 +0300
++++ tools/backupdir	2010-01-11 14:21:42.000000000 +0300
+@@ -25,7 +25,7 @@
  	    revisions=$pwd/$subdir-$date.revisions.gz
  
  	    # If there is no backup, make one
diff --git a/lang/mercury/patches/patch-ao b/lang/mercury/patches/patch-ao
index cdd21e63da2..f662e242c31 100644
--- a/lang/mercury/patches/patch-ao
+++ b/lang/mercury/patches/patch-ao
@@ -1,8 +1,8 @@
-$NetBSD: patch-ao,v 1.1 2006/10/22 20:29:49 rillig Exp $
+$NetBSD: patch-ao,v 1.2 2010/07/20 12:29:21 asau Exp $
 
---- tools/cvdr.orig	2001-04-18 19:32:24.000000000 +0200
-+++ tools/cvdr	2006-10-22 22:28:06.000000000 +0200
-@@ -62,7 +62,7 @@ done
+--- tools/cvdr.orig	2001-04-18 21:32:24.000000000 +0400
++++ tools/cvdr	2010-01-11 14:20:48.000000000 +0300
+@@ -62,7 +62,7 @@
  	# CVS/Repository.  Most recent versions of CVS/Repository
  	# don't include the repository anyway, and so if it isn't set we
  	# ignore it.
diff --git a/lang/mercury/patches/patch-ap b/lang/mercury/patches/patch-ap
new file mode 100644
index 00000000000..90e0196ce09
--- /dev/null
+++ b/lang/mercury/patches/patch-ap
@@ -0,0 +1,13 @@
+$NetBSD: patch-ap,v 1.1 2010/07/20 12:29:21 asau Exp $
+
+--- tools/binary.orig	2006-03-30 06:46:08.000000000 +0400
++++ tools/binary	2010-01-11 14:28:01.000000000 +0300
+@@ -477,7 +477,7 @@
+ 
+             if "$negative"
+             then
+-                if test "$step_status" == 0
++                if test "$step_status" = 0
+                 then
+                     testeddir=$testsubdir
+                     found=true
diff --git a/lang/mercury/patches/patch-aq b/lang/mercury/patches/patch-aq
new file mode 100644
index 00000000000..f6f4e63f72d
--- /dev/null
+++ b/lang/mercury/patches/patch-aq
@@ -0,0 +1,26 @@
+$NetBSD: patch-aq,v 1.1 2010/07/20 12:29:21 asau Exp $
+
+--- tools/dd_speedtest.orig	2005-08-09 11:14:02.000000000 +0400
++++ tools/dd_speedtest	2010-01-11 14:29:06.000000000 +0300
+@@ -49,7 +49,7 @@
+ done
+ shift `expr "$OPTIND" - 1`
+ 
+-if test "$cmd" == ""; then
++if test "$cmd" = ""; then
+ 	echo $usage
+ 	exit 1
+ fi
+@@ -61,10 +61,10 @@
+ count=1
+ while test $count -le $total_runs
+ do
+-	if test $count == 1; then
++	if test $count = 1; then
+ 		run_name="FIRST"
+ 	else
+-		if test $count == $total_runs; then
++		if test $count = $total_runs; then
+ 			run_name="FINAL"
+ 		else
+ 			during_cnt=`expr $count - 1`
diff --git a/lang/mercury/patches/patch-ar b/lang/mercury/patches/patch-ar
new file mode 100644
index 00000000000..a9b70b1625b
--- /dev/null
+++ b/lang/mercury/patches/patch-ar
@@ -0,0 +1,13 @@
+$NetBSD: patch-ar,v 1.1 2010/07/20 12:29:21 asau Exp $
+
+Problems on FreeBSD 6.
+
+--- tools/make_spec_ho_call.orig	2005-09-12 07:03:08.000000000 +0400
++++ tools/make_spec_ho_call	2010-01-11 15:33:33.000000000 +0300
+@@ -126,5 +126,5 @@
+     echo "MR_define_extern_entry(mercury__do_call_closure_$variant);" >> mercury_ho_call_declares.i
+     echo "    MR_init_entry_an(mercury__do_call_closure_$variant);" >> mercury_ho_call_inits.i
+ 
+-    spec_explicit_arg=`expr $spec_explicit_arg + 1`
++    spec_explicit_arg=`expr -- $spec_explicit_arg + 1`
+ done
diff --git a/lang/mercury/patches/patch-as b/lang/mercury/patches/patch-as
new file mode 100644
index 00000000000..76fd4bedbd4
--- /dev/null
+++ b/lang/mercury/patches/patch-as
@@ -0,0 +1,13 @@
+$NetBSD: patch-as,v 1.1 2010/07/20 12:29:21 asau Exp $
+
+Problems on FreeBSD 6.
+
+--- tools/make_spec_method_call.orig	2005-09-12 07:03:08.000000000 +0400
++++ tools/make_spec_method_call	2010-01-11 15:35:47.000000000 +0300
+@@ -134,5 +134,5 @@
+     echo "MR_define_extern_entry(mercury__do_call_class_method_$variant);" >> mercury_method_call_declares.i
+     echo "    MR_init_entry_an(mercury__do_call_class_method_$variant);" >> mercury_method_call_inits.i
+ 
+-    spec_explicit_arg=`expr $spec_explicit_arg + 1`
++    spec_explicit_arg=`expr -- $spec_explicit_arg + 1`
+ done
diff --git a/lang/mercury/patches/patch-at b/lang/mercury/patches/patch-at
new file mode 100644
index 00000000000..7d16b874ed8
--- /dev/null
+++ b/lang/mercury/patches/patch-at
@@ -0,0 +1,15 @@
+$NetBSD: patch-at,v 1.1 2010/07/20 12:29:21 asau Exp $
+
+Support shared libraries.
+
+--- configure.orig	2010-07-20 13:44:12.000000000 +0400
++++ configure	2010-07-20 15:05:18.000000000 +0400
+@@ -9774,7 +9774,7 @@
+ 		EXT_FOR_SHARED_LIB=so
+ 		EXT_FOR_LINK_WITH_PIC_OBJECTS=o
+ 		;;
+-	i*86-*-freebsd*)
++	i*86-*-freebsd*|*-netbsd*)
+ 		# From Cornelis van der Laan <nils@ims.uni-stuttgart.de>
+ 		echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6