Update to Mercury 13.05.1 Beta

NEWS for Mercury 13.05.1
------------------------

Changes to the Mercury standard library:

* We have added the function bimap.count/1.


NEWS for Mercury 13.05
----------------------

Changes to the Mercury standard library:

* We have swapped the argument order of the predicates set.singleton_set/2,
  set_bbbtree.singleton_set/2, set_ordlist.singleton_set/2 and
  set_unordlist.singleton_set/2 so that it conforms with the order in the
  other set modules.

* All the modules that operate on sets now have two new predicates.
  One is insert_new: if the item is not already in the set, it inserts
  the item, otherwise it fails. The other is all_true: it succeeds if
  and only if all elements in the set pass a test.

* The map and varset modules each have a new predicate that deletes
  a sorted list of items from a map or varset, and can do so faster than
  usual by exploiting the order.

* The map, bimap and tree234 modules each have a new predicate that does
  a search, and if the search is unsuccessful, does an insertion during
  the *same* traversal.

* The argument order of the following predicates has been changed so as to
  make them more conducive to the use of state variable notation:
  pqueue.insert/4, pqueue.remove/4, stack.push/3, stack.push_list/3,
  stack.pop/3 and stack.det_pop/3.

* We have added versions of the operations in the math module that omit the
  domain checks.

* We have added new predicates to the parsing_utils module:
  input_string/3, get_skip_whitespace_pred/2 and next_char_no_progress/4.

* The lexer module returns base 10 integer literals in the string
  representation, if the integer is too large for an `int'.

* We have add the following new predicates to the list module:
  list.all_true_corresponding/3, list.all_false_corresponding/3 and
  list.same_length3/3.

* We have added the type maybe.maybe_error/2 which is polymorphic in the
  error type.

* We have added predicates to the calendar module for folding over the days
  in a given range of dates: foldl_days/5, foldl2_days/7 and foldl3_days/9.

* We have added two functions to both the hash_table and version_hash_table
  modules: copy/1 and from_assoc_list/4.

Changes to the Mercury compiler:

* Generation of 64-bit code on Windows using the MinGW64 port of GCC
  is now supported, i.e. the x86_64-w64-mingw32 architecture is now
  supported.

* We have improved compilation times for very large programs.  In
  particular, compilation times for predicates containing the following
  have been improved:
      - large ground terms
      - large disjunctions
      - large numbers of higher order constructs and/or code that uses
        large hierarchies of type classes

* We have implemented a type representation optimisation, where a functor
  with exactly one argument can be represented by a tagged pointer to the
  argument value, which itself does not require the tag bits.

* In C grades, consecutive enumeration arguments in discriminated
  union types can now be packed into a single word.

* Double-precision `float' constructor arguments are now stored in
  unboxed form in high-level C grades.

* Double-precision `float' constructor arguments are now stored in
  unboxed form on 32-bit architectures in the low-level C grades.
  This was previously so for 64-bit architectures.

* Double-precision float arguments can now be passed via dedicated Mercury
  abstract machine registers to avoid boxing, in low-level C grades on
  32-bit architectures. Float variables can occupy two words on the
  Mercury stack to avoid boxing.

* The option `--warn-non-tail-recursion' no longer requires
  `--high-level-code'.

* A new option, `--sign-assembly', provides supports for signing
  assemblies generated by the C# backend with a strong name.

* A new option, `--cstack-reserve-size', allows the size of the C
  stack for executables to be changed on Microsoft Windows systems.

Changes to the Mercury debugger:

* We have added new capabilities to the "level", "retry" and "finish" mdb
  commands. If these commands are given the argument "clentry", they will
  operate on the ancestor of the current call that represents entry to the
  clique of mutually recursive procedures that the current call belongs to.
  If they are given the argument "clparent", they will operate on the parent
  of that call.

* The mdb command "stack" can now find and mark cliques of mutually recursive
  calls on the stack, and can (and by default, will) impose a limit on the
  number of lines it prints for each clique.

Changes to the extras distribution:

* We have added a binding to the GLFW library.


NEWS for Mercury 11.07.2, 3 August 2012
---------------------------------------

This is a bug-fix release: it fixes the following:

* The name of the C# compiler in newer versions of Mono is now recognised.

* The configure script now distinguishes between the MS C# compiler and the
  Chicken Scheme compiler.

* Thread local storage now works on Mac OS X when using clang as the C
  compiler.

* Various build issues on Solaris 10 have been resolved.

* The --erlang option now sets all the relevant grade components correctly.

* The binary input and output streams are now set to binary translation
  mode when using the MSVC CRT.

* The standard library's lexer module now correctly tokenizes binary, octal
  and hexadecimal integer literals.

* Some bugs in the UTF-8 routines used by the C grades have been fixed.
  Also, the performance of these routines has been improved.

* The exit status is now correctly set when --warn-non-tail-recursion
  is being used.

Changes to the Mercury standard library:

* We have added additional modes to map.foldr/4, map.foldr/6 and the
  list.foldl<N>_corresponding3 predicates.

* The predicates parsing_utils.float_literal/3 and
  parsing_utils.float_literal_as_string/4 now accept an optional plus sign in
  the exponent.

* The obsolete predicates string.remove_suffix_det/2 and string.index_det/2
  have been removed.

* The predicate time.times/4 is now implemented for the csharp grade.

* The version_hash_table module is now supported in the csharp and java
  grades.

* The unsafe versions of the predicates in the array2d module are now more
  efficient.

Changes to the Mercury compiler:

* The compiler now outputs #line directives in C# code it generates.


NEWS for Mercury 11.07.1, 2 March 2012
--------------------------------------

This is a bug-fix release.  It fixes a problem that was preventing the standard
library from building in the csharp grade on Cygwin and also adds support for
using GCC in C99 (or GNU99) mode with Mercury.  In addition, there are a number
of minor changes to the standard library.

Changes to the Mercury standard library:

* We have added the predicate map.keys_and_values/3.

* We have added the predicates set.is_singleton/2, set_bbbtree.is_singleton/2,
  set_ctree234.is_singleton/2 and set_unordlist.is_singleton/2.

* We have added the function list.foldl_corresponding/4.

5 files changed, 501 insertions, 311 deletions

diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 2d910c754df..d9d0ab63106 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.43 2013/05/31 12:41:11 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2013/06/11 19:34:14 asau Exp $
 
-DISTNAME=		mercury-compiler-11.07
-PKGNAME=		mercury-11.07
-PKGREVISION=		2
+DISTNAME=		mercury-srcdist-13.05.1-beta-2013-05-28
+PKGNAME=		mercury-13.05.1beta
 CATEGORIES=		lang
-MASTER_SITES=		ftp://ftp.mercury.cs.mu.oz.au/pub/mercury/ \
+MASTER_SITES=		http://dl.mercurylang.org/release/ \
+			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
-HOMEPAGE=		http://www.cs.mu.oz.au/research/mercury/
+HOMEPAGE=		http://www.mercurylang.org/
 COMMENT=		Modern logic/functional programming language
 
 GNU_CONFIGURE=		yes
@@ -34,6 +34,7 @@ BUILD_MAKE_FLAGS+=	INSTALL_MAN_DIR=${INSTALL_PREFIX:Q}/${PKGMANDIR:Q}
 BUILD_MAKE_FLAGS+=	MERCURY_COMPILER=${INSTALL_PREFIX:Q}/bin/mercury_compile
 #BUILD_MAKE_FLAGS+=	PARALLEL=$(MAKE_JOBS:D-j$(MAKE_JOBS))
 
+CHECK_PORTABILITY_SKIP+=	boehm_gc/configure
 CHECK_INTERPRETER_SKIP+=	lib/mercury/reconf/scripts/mtags.in
 
 post-patch:
diff --git a/lang/mercury/PLIST b/lang/mercury/PLIST
index ea70e410b39..872da039adc 100644
--- a/lang/mercury/PLIST
+++ b/lang/mercury/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2012/01/30 05:40:02 asau Exp $
+@comment $NetBSD: PLIST,v 1.13 2013/06/11 19:34:14 asau Exp $
 bin/c2init
 bin/canonical_grade
 bin/info_to_mdb
@@ -9,8 +9,9 @@ bin/mdemangle
 bin/mdice
 bin/mdprof
 bin/mdprof_cgi
+bin/mdprof_create_feedback
 bin/mdprof_dump
-bin/mdprof_feedback
+bin/mdprof_report_feedback
 bin/mdprof_test
 bin/mercury.bat
 bin/mercury_compile
@@ -18,6 +19,7 @@ bin/mercury_config
 bin/mercury_profile
 bin/mercury_update_interface
 bin/mfiltercc
+bin/mfilterjavac
 bin/mgnuc
 bin/mkfifo_using_mknod
 bin/mkinit
@@ -70,6 +72,7 @@ lib/mercury/inc/eqvclass.mh
 lib/mercury/inc/erlang_builtin.mh
 lib/mercury/inc/erlang_rtti_implementation.mh
 lib/mercury/inc/exception.mh
+lib/mercury/inc/fat_sparse_bitset.mh
 lib/mercury/inc/float.mh
 lib/mercury/inc/gc.h
 lib/mercury/inc/gc.mh
@@ -136,6 +139,7 @@ lib/mercury/inc/mdbcomp.mh
 lib/mercury/inc/mdbcomp.prim_data.mh
 lib/mercury/inc/mdbcomp.program_representation.mh
 lib/mercury/inc/mdbcomp.rtti_access.mh
+lib/mercury/inc/mdbcomp.shared_utilities.mh
 lib/mercury/inc/mdbcomp.slice_and_dice.mh
 lib/mercury/inc/mdbcomp.trace_counts.mh
 lib/mercury/inc/mer_browser.mh
@@ -326,24 +330,16 @@ lib/mercury/inc/stream.mh
 lib/mercury/inc/stream.string_writer.mh
 lib/mercury/inc/string.builder.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/svlist.mh
-lib/mercury/inc/svmap.mh
-lib/mercury/inc/svmulti_map.mh
 lib/mercury/inc/svpqueue.mh
-lib/mercury/inc/svqueue.mh
-lib/mercury/inc/svset.mh
 lib/mercury/inc/svstack.mh
-lib/mercury/inc/svvarset.mh
 lib/mercury/inc/table_builtin.mh
 lib/mercury/inc/table_statistics.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/test_bitset.mh
 lib/mercury/inc/thread.channel.mh
 lib/mercury/inc/thread.mh
 lib/mercury/inc/thread.mvar.mh
@@ -440,6 +436,8 @@ lib/mercury/ints/asm_fast.gc.debug/erlang_rtti_implementation.opt
 lib/mercury/ints/asm_fast.gc.debug/erlang_rtti_implementation.trans_opt
 lib/mercury/ints/asm_fast.gc.debug/exception.opt
 lib/mercury/ints/asm_fast.gc.debug/exception.trans_opt
+lib/mercury/ints/asm_fast.gc.debug/fat_sparse_bitset.opt
+lib/mercury/ints/asm_fast.gc.debug/fat_sparse_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.debug/float.opt
 lib/mercury/ints/asm_fast.gc.debug/float.trans_opt
 lib/mercury/ints/asm_fast.gc.debug/gc.opt
@@ -550,30 +548,12 @@ lib/mercury/ints/asm_fast.gc.debug/string.builder.opt
 lib/mercury/ints/asm_fast.gc.debug/string.builder.trans_opt
 lib/mercury/ints/asm_fast.gc.debug/string.opt
 lib/mercury/ints/asm_fast.gc.debug/string.trans_opt
-lib/mercury/ints/asm_fast.gc.debug/svarray.opt
-lib/mercury/ints/asm_fast.gc.debug/svarray.trans_opt
-lib/mercury/ints/asm_fast.gc.debug/svbag.opt
-lib/mercury/ints/asm_fast.gc.debug/svbag.trans_opt
-lib/mercury/ints/asm_fast.gc.debug/svbimap.opt
-lib/mercury/ints/asm_fast.gc.debug/svbimap.trans_opt
-lib/mercury/ints/asm_fast.gc.debug/sveqvclass.opt
-lib/mercury/ints/asm_fast.gc.debug/sveqvclass.trans_opt
 lib/mercury/ints/asm_fast.gc.debug/svlist.opt
 lib/mercury/ints/asm_fast.gc.debug/svlist.trans_opt
-lib/mercury/ints/asm_fast.gc.debug/svmap.opt
-lib/mercury/ints/asm_fast.gc.debug/svmap.trans_opt
-lib/mercury/ints/asm_fast.gc.debug/svmulti_map.opt
-lib/mercury/ints/asm_fast.gc.debug/svmulti_map.trans_opt
 lib/mercury/ints/asm_fast.gc.debug/svpqueue.opt
 lib/mercury/ints/asm_fast.gc.debug/svpqueue.trans_opt
-lib/mercury/ints/asm_fast.gc.debug/svqueue.opt
-lib/mercury/ints/asm_fast.gc.debug/svqueue.trans_opt
-lib/mercury/ints/asm_fast.gc.debug/svset.opt
-lib/mercury/ints/asm_fast.gc.debug/svset.trans_opt
 lib/mercury/ints/asm_fast.gc.debug/svstack.opt
 lib/mercury/ints/asm_fast.gc.debug/svstack.trans_opt
-lib/mercury/ints/asm_fast.gc.debug/svvarset.opt
-lib/mercury/ints/asm_fast.gc.debug/svvarset.trans_opt
 lib/mercury/ints/asm_fast.gc.debug/table_builtin.opt
 lib/mercury/ints/asm_fast.gc.debug/table_builtin.trans_opt
 lib/mercury/ints/asm_fast.gc.debug/table_statistics.opt
@@ -586,6 +566,8 @@ lib/mercury/ints/asm_fast.gc.debug/term_size_prof_builtin.opt
 lib/mercury/ints/asm_fast.gc.debug/term_size_prof_builtin.trans_opt
 lib/mercury/ints/asm_fast.gc.debug/term_to_xml.opt
 lib/mercury/ints/asm_fast.gc.debug/term_to_xml.trans_opt
+lib/mercury/ints/asm_fast.gc.debug/test_bitset.opt
+lib/mercury/ints/asm_fast.gc.debug/test_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.debug/thread.channel.opt
 lib/mercury/ints/asm_fast.gc.debug/thread.channel.trans_opt
 lib/mercury/ints/asm_fast.gc.debug/thread.mvar.opt
@@ -674,6 +656,8 @@ lib/mercury/ints/asm_fast.gc.decldebug/erlang_rtti_implementation.opt
 lib/mercury/ints/asm_fast.gc.decldebug/erlang_rtti_implementation.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/fat_sparse_bitset.opt
+lib/mercury/ints/asm_fast.gc.decldebug/fat_sparse_bitset.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
@@ -784,30 +768,12 @@ lib/mercury/ints/asm_fast.gc.decldebug/string.builder.opt
 lib/mercury/ints/asm_fast.gc.decldebug/string.builder.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/svlist.opt
 lib/mercury/ints/asm_fast.gc.decldebug/svlist.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/svpqueue.opt
 lib/mercury/ints/asm_fast.gc.decldebug/svpqueue.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/svset.opt
-lib/mercury/ints/asm_fast.gc.decldebug/svset.trans_opt
 lib/mercury/ints/asm_fast.gc.decldebug/svstack.opt
 lib/mercury/ints/asm_fast.gc.decldebug/svstack.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/table_statistics.opt
@@ -820,6 +786,8 @@ 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/test_bitset.opt
+lib/mercury/ints/asm_fast.gc.decldebug/test_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.decldebug/thread.channel.opt
 lib/mercury/ints/asm_fast.gc.decldebug/thread.channel.trans_opt
 lib/mercury/ints/asm_fast.gc.decldebug/thread.mvar.opt
@@ -908,6 +876,8 @@ lib/mercury/ints/asm_fast.gc.memprof/erlang_rtti_implementation.opt
 lib/mercury/ints/asm_fast.gc.memprof/erlang_rtti_implementation.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/exception.opt
 lib/mercury/ints/asm_fast.gc.memprof/exception.trans_opt
+lib/mercury/ints/asm_fast.gc.memprof/fat_sparse_bitset.opt
+lib/mercury/ints/asm_fast.gc.memprof/fat_sparse_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/float.opt
 lib/mercury/ints/asm_fast.gc.memprof/float.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/gc.opt
@@ -1018,30 +988,12 @@ lib/mercury/ints/asm_fast.gc.memprof/string.builder.opt
 lib/mercury/ints/asm_fast.gc.memprof/string.builder.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/svlist.opt
 lib/mercury/ints/asm_fast.gc.memprof/svlist.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/svpqueue.opt
 lib/mercury/ints/asm_fast.gc.memprof/svpqueue.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/svset.opt
-lib/mercury/ints/asm_fast.gc.memprof/svset.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/svstack.opt
 lib/mercury/ints/asm_fast.gc.memprof/svstack.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/table_statistics.opt
@@ -1054,6 +1006,8 @@ 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/test_bitset.opt
+lib/mercury/ints/asm_fast.gc.memprof/test_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/thread.channel.opt
 lib/mercury/ints/asm_fast.gc.memprof/thread.channel.trans_opt
 lib/mercury/ints/asm_fast.gc.memprof/thread.mvar.opt
@@ -1142,6 +1096,8 @@ lib/mercury/ints/asm_fast.gc.prof/erlang_rtti_implementation.opt
 lib/mercury/ints/asm_fast.gc.prof/erlang_rtti_implementation.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/exception.opt
 lib/mercury/ints/asm_fast.gc.prof/exception.trans_opt
+lib/mercury/ints/asm_fast.gc.prof/fat_sparse_bitset.opt
+lib/mercury/ints/asm_fast.gc.prof/fat_sparse_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/float.opt
 lib/mercury/ints/asm_fast.gc.prof/float.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/gc.opt
@@ -1252,30 +1208,12 @@ lib/mercury/ints/asm_fast.gc.prof/string.builder.opt
 lib/mercury/ints/asm_fast.gc.prof/string.builder.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/svlist.opt
 lib/mercury/ints/asm_fast.gc.prof/svlist.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/svpqueue.opt
 lib/mercury/ints/asm_fast.gc.prof/svpqueue.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/svset.opt
-lib/mercury/ints/asm_fast.gc.prof/svset.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/svstack.opt
 lib/mercury/ints/asm_fast.gc.prof/svstack.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/table_statistics.opt
@@ -1288,6 +1226,8 @@ 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/test_bitset.opt
+lib/mercury/ints/asm_fast.gc.prof/test_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/thread.channel.opt
 lib/mercury/ints/asm_fast.gc.prof/thread.channel.trans_opt
 lib/mercury/ints/asm_fast.gc.prof/thread.mvar.opt
@@ -1376,6 +1316,8 @@ lib/mercury/ints/asm_fast.gc.profdeep/erlang_rtti_implementation.opt
 lib/mercury/ints/asm_fast.gc.profdeep/erlang_rtti_implementation.trans_opt
 lib/mercury/ints/asm_fast.gc.profdeep/exception.opt
 lib/mercury/ints/asm_fast.gc.profdeep/exception.trans_opt
+lib/mercury/ints/asm_fast.gc.profdeep/fat_sparse_bitset.opt
+lib/mercury/ints/asm_fast.gc.profdeep/fat_sparse_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.profdeep/float.opt
 lib/mercury/ints/asm_fast.gc.profdeep/float.trans_opt
 lib/mercury/ints/asm_fast.gc.profdeep/gc.opt
@@ -1486,30 +1428,12 @@ lib/mercury/ints/asm_fast.gc.profdeep/string.builder.opt
 lib/mercury/ints/asm_fast.gc.profdeep/string.builder.trans_opt
 lib/mercury/ints/asm_fast.gc.profdeep/string.opt
 lib/mercury/ints/asm_fast.gc.profdeep/string.trans_opt
-lib/mercury/ints/asm_fast.gc.profdeep/svarray.opt
-lib/mercury/ints/asm_fast.gc.profdeep/svarray.trans_opt
-lib/mercury/ints/asm_fast.gc.profdeep/svbag.opt
-lib/mercury/ints/asm_fast.gc.profdeep/svbag.trans_opt
-lib/mercury/ints/asm_fast.gc.profdeep/svbimap.opt
-lib/mercury/ints/asm_fast.gc.profdeep/svbimap.trans_opt
-lib/mercury/ints/asm_fast.gc.profdeep/sveqvclass.opt
-lib/mercury/ints/asm_fast.gc.profdeep/sveqvclass.trans_opt
 lib/mercury/ints/asm_fast.gc.profdeep/svlist.opt
 lib/mercury/ints/asm_fast.gc.profdeep/svlist.trans_opt
-lib/mercury/ints/asm_fast.gc.profdeep/svmap.opt
-lib/mercury/ints/asm_fast.gc.profdeep/svmap.trans_opt
-lib/mercury/ints/asm_fast.gc.profdeep/svmulti_map.opt
-lib/mercury/ints/asm_fast.gc.profdeep/svmulti_map.trans_opt
 lib/mercury/ints/asm_fast.gc.profdeep/svpqueue.opt
 lib/mercury/ints/asm_fast.gc.profdeep/svpqueue.trans_opt
-lib/mercury/ints/asm_fast.gc.profdeep/svqueue.opt
-lib/mercury/ints/asm_fast.gc.profdeep/svqueue.trans_opt
-lib/mercury/ints/asm_fast.gc.profdeep/svset.opt
-lib/mercury/ints/asm_fast.gc.profdeep/svset.trans_opt
 lib/mercury/ints/asm_fast.gc.profdeep/svstack.opt
 lib/mercury/ints/asm_fast.gc.profdeep/svstack.trans_opt
-lib/mercury/ints/asm_fast.gc.profdeep/svvarset.opt
-lib/mercury/ints/asm_fast.gc.profdeep/svvarset.trans_opt
 lib/mercury/ints/asm_fast.gc.profdeep/table_builtin.opt
 lib/mercury/ints/asm_fast.gc.profdeep/table_builtin.trans_opt
 lib/mercury/ints/asm_fast.gc.profdeep/table_statistics.opt
@@ -1522,6 +1446,8 @@ lib/mercury/ints/asm_fast.gc.profdeep/term_size_prof_builtin.opt
 lib/mercury/ints/asm_fast.gc.profdeep/term_size_prof_builtin.trans_opt
 lib/mercury/ints/asm_fast.gc.profdeep/term_to_xml.opt
 lib/mercury/ints/asm_fast.gc.profdeep/term_to_xml.trans_opt
+lib/mercury/ints/asm_fast.gc.profdeep/test_bitset.opt
+lib/mercury/ints/asm_fast.gc.profdeep/test_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.profdeep/thread.channel.opt
 lib/mercury/ints/asm_fast.gc.profdeep/thread.channel.trans_opt
 lib/mercury/ints/asm_fast.gc.profdeep/thread.mvar.opt
@@ -1610,6 +1536,8 @@ lib/mercury/ints/asm_fast.gc.trseg.debug/erlang_rtti_implementation.opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/erlang_rtti_implementation.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/exception.opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/exception.trans_opt
+lib/mercury/ints/asm_fast.gc.trseg.debug/fat_sparse_bitset.opt
+lib/mercury/ints/asm_fast.gc.trseg.debug/fat_sparse_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/float.opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/float.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/gc.opt
@@ -1720,30 +1648,12 @@ lib/mercury/ints/asm_fast.gc.trseg.debug/string.builder.opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/string.builder.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/string.opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/string.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svarray.opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svarray.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svbag.opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svbag.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svbimap.opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svbimap.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/sveqvclass.opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/sveqvclass.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/svlist.opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/svlist.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svmap.opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svmap.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svmulti_map.opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svmulti_map.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/svpqueue.opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/svpqueue.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svqueue.opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svqueue.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svset.opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svset.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/svstack.opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/svstack.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svvarset.opt
-lib/mercury/ints/asm_fast.gc.trseg.debug/svvarset.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/table_builtin.opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/table_builtin.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/table_statistics.opt
@@ -1756,6 +1666,8 @@ lib/mercury/ints/asm_fast.gc.trseg.debug/term_size_prof_builtin.opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/term_size_prof_builtin.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/term_to_xml.opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/term_to_xml.trans_opt
+lib/mercury/ints/asm_fast.gc.trseg.debug/test_bitset.opt
+lib/mercury/ints/asm_fast.gc.trseg.debug/test_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/thread.channel.opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/thread.channel.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg.debug/thread.mvar.opt
@@ -1844,6 +1756,8 @@ lib/mercury/ints/asm_fast.gc.trseg/erlang_rtti_implementation.opt
 lib/mercury/ints/asm_fast.gc.trseg/erlang_rtti_implementation.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg/exception.opt
 lib/mercury/ints/asm_fast.gc.trseg/exception.trans_opt
+lib/mercury/ints/asm_fast.gc.trseg/fat_sparse_bitset.opt
+lib/mercury/ints/asm_fast.gc.trseg/fat_sparse_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg/float.opt
 lib/mercury/ints/asm_fast.gc.trseg/float.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg/gc.opt
@@ -1954,30 +1868,12 @@ lib/mercury/ints/asm_fast.gc.trseg/string.builder.opt
 lib/mercury/ints/asm_fast.gc.trseg/string.builder.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg/string.opt
 lib/mercury/ints/asm_fast.gc.trseg/string.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg/svarray.opt
-lib/mercury/ints/asm_fast.gc.trseg/svarray.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg/svbag.opt
-lib/mercury/ints/asm_fast.gc.trseg/svbag.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg/svbimap.opt
-lib/mercury/ints/asm_fast.gc.trseg/svbimap.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg/sveqvclass.opt
-lib/mercury/ints/asm_fast.gc.trseg/sveqvclass.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg/svlist.opt
 lib/mercury/ints/asm_fast.gc.trseg/svlist.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg/svmap.opt
-lib/mercury/ints/asm_fast.gc.trseg/svmap.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg/svmulti_map.opt
-lib/mercury/ints/asm_fast.gc.trseg/svmulti_map.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg/svpqueue.opt
 lib/mercury/ints/asm_fast.gc.trseg/svpqueue.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg/svqueue.opt
-lib/mercury/ints/asm_fast.gc.trseg/svqueue.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg/svset.opt
-lib/mercury/ints/asm_fast.gc.trseg/svset.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg/svstack.opt
 lib/mercury/ints/asm_fast.gc.trseg/svstack.trans_opt
-lib/mercury/ints/asm_fast.gc.trseg/svvarset.opt
-lib/mercury/ints/asm_fast.gc.trseg/svvarset.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg/table_builtin.opt
 lib/mercury/ints/asm_fast.gc.trseg/table_builtin.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg/table_statistics.opt
@@ -1990,6 +1886,8 @@ lib/mercury/ints/asm_fast.gc.trseg/term_size_prof_builtin.opt
 lib/mercury/ints/asm_fast.gc.trseg/term_size_prof_builtin.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg/term_to_xml.opt
 lib/mercury/ints/asm_fast.gc.trseg/term_to_xml.trans_opt
+lib/mercury/ints/asm_fast.gc.trseg/test_bitset.opt
+lib/mercury/ints/asm_fast.gc.trseg/test_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg/thread.channel.opt
 lib/mercury/ints/asm_fast.gc.trseg/thread.channel.trans_opt
 lib/mercury/ints/asm_fast.gc.trseg/thread.mvar.opt
@@ -2078,6 +1976,8 @@ lib/mercury/ints/asm_fast.gc/erlang_rtti_implementation.opt
 lib/mercury/ints/asm_fast.gc/erlang_rtti_implementation.trans_opt
 lib/mercury/ints/asm_fast.gc/exception.opt
 lib/mercury/ints/asm_fast.gc/exception.trans_opt
+lib/mercury/ints/asm_fast.gc/fat_sparse_bitset.opt
+lib/mercury/ints/asm_fast.gc/fat_sparse_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc/float.opt
 lib/mercury/ints/asm_fast.gc/float.trans_opt
 lib/mercury/ints/asm_fast.gc/gc.opt
@@ -2188,30 +2088,12 @@ lib/mercury/ints/asm_fast.gc/string.builder.opt
 lib/mercury/ints/asm_fast.gc/string.builder.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/svlist.opt
 lib/mercury/ints/asm_fast.gc/svlist.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/svpqueue.opt
 lib/mercury/ints/asm_fast.gc/svpqueue.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/svset.opt
-lib/mercury/ints/asm_fast.gc/svset.trans_opt
 lib/mercury/ints/asm_fast.gc/svstack.opt
 lib/mercury/ints/asm_fast.gc/svstack.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/table_statistics.opt
@@ -2224,6 +2106,8 @@ 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/test_bitset.opt
+lib/mercury/ints/asm_fast.gc/test_bitset.trans_opt
 lib/mercury/ints/asm_fast.gc/thread.channel.opt
 lib/mercury/ints/asm_fast.gc/thread.channel.trans_opt
 lib/mercury/ints/asm_fast.gc/thread.mvar.opt
@@ -2457,6 +2341,14 @@ lib/mercury/ints/exception.mih
 lib/mercury/ints/exception.module_dep
 lib/mercury/ints/exception.opt
 lib/mercury/ints/exception.trans_opt
+lib/mercury/ints/fat_sparse_bitset.int
+lib/mercury/ints/fat_sparse_bitset.int2
+lib/mercury/ints/fat_sparse_bitset.int3
+lib/mercury/ints/fat_sparse_bitset.mh
+lib/mercury/ints/fat_sparse_bitset.mih
+lib/mercury/ints/fat_sparse_bitset.module_dep
+lib/mercury/ints/fat_sparse_bitset.opt
+lib/mercury/ints/fat_sparse_bitset.trans_opt
 lib/mercury/ints/float.int
 lib/mercury/ints/float.int2
 lib/mercury/ints/float.int3
@@ -2497,6 +2389,226 @@ lib/mercury/ints/hash_table.mih
 lib/mercury/ints/hash_table.module_dep
 lib/mercury/ints/hash_table.opt
 lib/mercury/ints/hash_table.trans_opt
+lib/mercury/ints/hlc.gc.pregen/Mercury/opts
+lib/mercury/ints/hlc.gc.pregen/Mercury/trans_opts
+lib/mercury/ints/hlc.gc.pregen/array.opt
+lib/mercury/ints/hlc.gc.pregen/array.trans_opt
+lib/mercury/ints/hlc.gc.pregen/array2d.opt
+lib/mercury/ints/hlc.gc.pregen/array2d.trans_opt
+lib/mercury/ints/hlc.gc.pregen/assoc_list.opt
+lib/mercury/ints/hlc.gc.pregen/assoc_list.trans_opt
+lib/mercury/ints/hlc.gc.pregen/backjump.opt
+lib/mercury/ints/hlc.gc.pregen/backjump.trans_opt
+lib/mercury/ints/hlc.gc.pregen/bag.opt
+lib/mercury/ints/hlc.gc.pregen/bag.trans_opt
+lib/mercury/ints/hlc.gc.pregen/benchmarking.opt
+lib/mercury/ints/hlc.gc.pregen/benchmarking.trans_opt
+lib/mercury/ints/hlc.gc.pregen/bimap.opt
+lib/mercury/ints/hlc.gc.pregen/bimap.trans_opt
+lib/mercury/ints/hlc.gc.pregen/bit_buffer.opt
+lib/mercury/ints/hlc.gc.pregen/bit_buffer.read.opt
+lib/mercury/ints/hlc.gc.pregen/bit_buffer.read.trans_opt
+lib/mercury/ints/hlc.gc.pregen/bit_buffer.trans_opt
+lib/mercury/ints/hlc.gc.pregen/bit_buffer.write.opt
+lib/mercury/ints/hlc.gc.pregen/bit_buffer.write.trans_opt
+lib/mercury/ints/hlc.gc.pregen/bitmap.opt
+lib/mercury/ints/hlc.gc.pregen/bitmap.trans_opt
+lib/mercury/ints/hlc.gc.pregen/bool.opt
+lib/mercury/ints/hlc.gc.pregen/bool.trans_opt
+lib/mercury/ints/hlc.gc.pregen/bt_array.opt
+lib/mercury/ints/hlc.gc.pregen/bt_array.trans_opt
+lib/mercury/ints/hlc.gc.pregen/builtin.opt
+lib/mercury/ints/hlc.gc.pregen/builtin.trans_opt
+lib/mercury/ints/hlc.gc.pregen/calendar.opt
+lib/mercury/ints/hlc.gc.pregen/calendar.trans_opt
+lib/mercury/ints/hlc.gc.pregen/char.opt
+lib/mercury/ints/hlc.gc.pregen/char.trans_opt
+lib/mercury/ints/hlc.gc.pregen/construct.opt
+lib/mercury/ints/hlc.gc.pregen/construct.trans_opt
+lib/mercury/ints/hlc.gc.pregen/cord.opt
+lib/mercury/ints/hlc.gc.pregen/cord.trans_opt
+lib/mercury/ints/hlc.gc.pregen/counter.opt
+lib/mercury/ints/hlc.gc.pregen/counter.trans_opt
+lib/mercury/ints/hlc.gc.pregen/deconstruct.opt
+lib/mercury/ints/hlc.gc.pregen/deconstruct.trans_opt
+lib/mercury/ints/hlc.gc.pregen/digraph.opt
+lib/mercury/ints/hlc.gc.pregen/digraph.trans_opt
+lib/mercury/ints/hlc.gc.pregen/dir.opt
+lib/mercury/ints/hlc.gc.pregen/dir.trans_opt
+lib/mercury/ints/hlc.gc.pregen/enum.opt
+lib/mercury/ints/hlc.gc.pregen/enum.trans_opt
+lib/mercury/ints/hlc.gc.pregen/eqvclass.opt
+lib/mercury/ints/hlc.gc.pregen/eqvclass.trans_opt
+lib/mercury/ints/hlc.gc.pregen/erlang_builtin.opt
+lib/mercury/ints/hlc.gc.pregen/erlang_builtin.trans_opt
+lib/mercury/ints/hlc.gc.pregen/erlang_rtti_implementation.opt
+lib/mercury/ints/hlc.gc.pregen/erlang_rtti_implementation.trans_opt
+lib/mercury/ints/hlc.gc.pregen/exception.opt
+lib/mercury/ints/hlc.gc.pregen/exception.trans_opt
+lib/mercury/ints/hlc.gc.pregen/fat_sparse_bitset.opt
+lib/mercury/ints/hlc.gc.pregen/fat_sparse_bitset.trans_opt
+lib/mercury/ints/hlc.gc.pregen/float.opt
+lib/mercury/ints/hlc.gc.pregen/float.trans_opt
+lib/mercury/ints/hlc.gc.pregen/gc.opt
+lib/mercury/ints/hlc.gc.pregen/gc.trans_opt
+lib/mercury/ints/hlc.gc.pregen/getopt.opt
+lib/mercury/ints/hlc.gc.pregen/getopt.trans_opt
+lib/mercury/ints/hlc.gc.pregen/getopt_io.opt
+lib/mercury/ints/hlc.gc.pregen/getopt_io.trans_opt
+lib/mercury/ints/hlc.gc.pregen/hash_table.opt
+lib/mercury/ints/hlc.gc.pregen/hash_table.trans_opt
+lib/mercury/ints/hlc.gc.pregen/injection.opt
+lib/mercury/ints/hlc.gc.pregen/injection.trans_opt
+lib/mercury/ints/hlc.gc.pregen/int.opt
+lib/mercury/ints/hlc.gc.pregen/int.trans_opt
+lib/mercury/ints/hlc.gc.pregen/integer.opt
+lib/mercury/ints/hlc.gc.pregen/integer.trans_opt
+lib/mercury/ints/hlc.gc.pregen/io.opt
+lib/mercury/ints/hlc.gc.pregen/io.trans_opt
+lib/mercury/ints/hlc.gc.pregen/lazy.opt
+lib/mercury/ints/hlc.gc.pregen/lazy.trans_opt
+lib/mercury/ints/hlc.gc.pregen/lexer.opt
+lib/mercury/ints/hlc.gc.pregen/lexer.trans_opt
+lib/mercury/ints/hlc.gc.pregen/library.opt
+lib/mercury/ints/hlc.gc.pregen/library.trans_opt
+lib/mercury/ints/hlc.gc.pregen/list.opt
+lib/mercury/ints/hlc.gc.pregen/list.trans_opt
+lib/mercury/ints/hlc.gc.pregen/map.opt
+lib/mercury/ints/hlc.gc.pregen/map.trans_opt
+lib/mercury/ints/hlc.gc.pregen/math.opt
+lib/mercury/ints/hlc.gc.pregen/math.trans_opt
+lib/mercury/ints/hlc.gc.pregen/maybe.opt
+lib/mercury/ints/hlc.gc.pregen/maybe.trans_opt
+lib/mercury/ints/hlc.gc.pregen/mer_std.opt
+lib/mercury/ints/hlc.gc.pregen/mer_std.trans_opt
+lib/mercury/ints/hlc.gc.pregen/multi_map.opt
+lib/mercury/ints/hlc.gc.pregen/multi_map.trans_opt
+lib/mercury/ints/hlc.gc.pregen/mutvar.opt
+lib/mercury/ints/hlc.gc.pregen/mutvar.trans_opt
+lib/mercury/ints/hlc.gc.pregen/ops.opt
+lib/mercury/ints/hlc.gc.pregen/ops.trans_opt
+lib/mercury/ints/hlc.gc.pregen/pair.opt
+lib/mercury/ints/hlc.gc.pregen/pair.trans_opt
+lib/mercury/ints/hlc.gc.pregen/par_builtin.opt
+lib/mercury/ints/hlc.gc.pregen/par_builtin.trans_opt
+lib/mercury/ints/hlc.gc.pregen/parser.opt
+lib/mercury/ints/hlc.gc.pregen/parser.trans_opt
+lib/mercury/ints/hlc.gc.pregen/parsing_utils.opt
+lib/mercury/ints/hlc.gc.pregen/parsing_utils.trans_opt
+lib/mercury/ints/hlc.gc.pregen/pprint.opt
+lib/mercury/ints/hlc.gc.pregen/pprint.trans_opt
+lib/mercury/ints/hlc.gc.pregen/pqueue.opt
+lib/mercury/ints/hlc.gc.pregen/pqueue.trans_opt
+lib/mercury/ints/hlc.gc.pregen/pretty_printer.opt
+lib/mercury/ints/hlc.gc.pregen/pretty_printer.trans_opt
+lib/mercury/ints/hlc.gc.pregen/private_builtin.opt
+lib/mercury/ints/hlc.gc.pregen/private_builtin.trans_opt
+lib/mercury/ints/hlc.gc.pregen/profiling_builtin.opt
+lib/mercury/ints/hlc.gc.pregen/profiling_builtin.trans_opt
+lib/mercury/ints/hlc.gc.pregen/prolog.opt
+lib/mercury/ints/hlc.gc.pregen/prolog.trans_opt
+lib/mercury/ints/hlc.gc.pregen/queue.opt
+lib/mercury/ints/hlc.gc.pregen/queue.trans_opt
+lib/mercury/ints/hlc.gc.pregen/random.opt
+lib/mercury/ints/hlc.gc.pregen/random.trans_opt
+lib/mercury/ints/hlc.gc.pregen/rational.opt
+lib/mercury/ints/hlc.gc.pregen/rational.trans_opt
+lib/mercury/ints/hlc.gc.pregen/rbtree.opt
+lib/mercury/ints/hlc.gc.pregen/rbtree.trans_opt
+lib/mercury/ints/hlc.gc.pregen/region_builtin.opt
+lib/mercury/ints/hlc.gc.pregen/region_builtin.trans_opt
+lib/mercury/ints/hlc.gc.pregen/require.opt
+lib/mercury/ints/hlc.gc.pregen/require.trans_opt
+lib/mercury/ints/hlc.gc.pregen/robdd.opt
+lib/mercury/ints/hlc.gc.pregen/robdd.trans_opt
+lib/mercury/ints/hlc.gc.pregen/rtree.opt
+lib/mercury/ints/hlc.gc.pregen/rtree.trans_opt
+lib/mercury/ints/hlc.gc.pregen/rtti_implementation.opt
+lib/mercury/ints/hlc.gc.pregen/rtti_implementation.trans_opt
+lib/mercury/ints/hlc.gc.pregen/set.opt
+lib/mercury/ints/hlc.gc.pregen/set.trans_opt
+lib/mercury/ints/hlc.gc.pregen/set_bbbtree.opt
+lib/mercury/ints/hlc.gc.pregen/set_bbbtree.trans_opt
+lib/mercury/ints/hlc.gc.pregen/set_ctree234.opt
+lib/mercury/ints/hlc.gc.pregen/set_ctree234.trans_opt
+lib/mercury/ints/hlc.gc.pregen/set_ordlist.opt
+lib/mercury/ints/hlc.gc.pregen/set_ordlist.trans_opt
+lib/mercury/ints/hlc.gc.pregen/set_tree234.opt
+lib/mercury/ints/hlc.gc.pregen/set_tree234.trans_opt
+lib/mercury/ints/hlc.gc.pregen/set_unordlist.opt
+lib/mercury/ints/hlc.gc.pregen/set_unordlist.trans_opt
+lib/mercury/ints/hlc.gc.pregen/solutions.opt
+lib/mercury/ints/hlc.gc.pregen/solutions.trans_opt
+lib/mercury/ints/hlc.gc.pregen/sparse_bitset.opt
+lib/mercury/ints/hlc.gc.pregen/sparse_bitset.trans_opt
+lib/mercury/ints/hlc.gc.pregen/stack.opt
+lib/mercury/ints/hlc.gc.pregen/stack.trans_opt
+lib/mercury/ints/hlc.gc.pregen/std_util.opt
+lib/mercury/ints/hlc.gc.pregen/std_util.trans_opt
+lib/mercury/ints/hlc.gc.pregen/stm_builtin.opt
+lib/mercury/ints/hlc.gc.pregen/stm_builtin.trans_opt
+lib/mercury/ints/hlc.gc.pregen/store.opt
+lib/mercury/ints/hlc.gc.pregen/store.trans_opt
+lib/mercury/ints/hlc.gc.pregen/stream.opt
+lib/mercury/ints/hlc.gc.pregen/stream.string_writer.opt
+lib/mercury/ints/hlc.gc.pregen/stream.string_writer.trans_opt
+lib/mercury/ints/hlc.gc.pregen/stream.trans_opt
+lib/mercury/ints/hlc.gc.pregen/string.builder.opt
+lib/mercury/ints/hlc.gc.pregen/string.builder.trans_opt
+lib/mercury/ints/hlc.gc.pregen/string.opt
+lib/mercury/ints/hlc.gc.pregen/string.trans_opt
+lib/mercury/ints/hlc.gc.pregen/svlist.opt
+lib/mercury/ints/hlc.gc.pregen/svlist.trans_opt
+lib/mercury/ints/hlc.gc.pregen/svpqueue.opt
+lib/mercury/ints/hlc.gc.pregen/svpqueue.trans_opt
+lib/mercury/ints/hlc.gc.pregen/svstack.opt
+lib/mercury/ints/hlc.gc.pregen/svstack.trans_opt
+lib/mercury/ints/hlc.gc.pregen/table_builtin.opt
+lib/mercury/ints/hlc.gc.pregen/table_builtin.trans_opt
+lib/mercury/ints/hlc.gc.pregen/table_statistics.opt
+lib/mercury/ints/hlc.gc.pregen/table_statistics.trans_opt
+lib/mercury/ints/hlc.gc.pregen/term.opt
+lib/mercury/ints/hlc.gc.pregen/term.trans_opt
+lib/mercury/ints/hlc.gc.pregen/term_io.opt
+lib/mercury/ints/hlc.gc.pregen/term_io.trans_opt
+lib/mercury/ints/hlc.gc.pregen/term_size_prof_builtin.opt
+lib/mercury/ints/hlc.gc.pregen/term_size_prof_builtin.trans_opt
+lib/mercury/ints/hlc.gc.pregen/term_to_xml.opt
+lib/mercury/ints/hlc.gc.pregen/term_to_xml.trans_opt
+lib/mercury/ints/hlc.gc.pregen/test_bitset.opt
+lib/mercury/ints/hlc.gc.pregen/test_bitset.trans_opt
+lib/mercury/ints/hlc.gc.pregen/thread.channel.opt
+lib/mercury/ints/hlc.gc.pregen/thread.channel.trans_opt
+lib/mercury/ints/hlc.gc.pregen/thread.mvar.opt
+lib/mercury/ints/hlc.gc.pregen/thread.mvar.trans_opt
+lib/mercury/ints/hlc.gc.pregen/thread.opt
+lib/mercury/ints/hlc.gc.pregen/thread.semaphore.opt
+lib/mercury/ints/hlc.gc.pregen/thread.semaphore.trans_opt
+lib/mercury/ints/hlc.gc.pregen/thread.trans_opt
+lib/mercury/ints/hlc.gc.pregen/time.opt
+lib/mercury/ints/hlc.gc.pregen/time.trans_opt
+lib/mercury/ints/hlc.gc.pregen/tree234.opt
+lib/mercury/ints/hlc.gc.pregen/tree234.trans_opt
+lib/mercury/ints/hlc.gc.pregen/tree_bitset.opt
+lib/mercury/ints/hlc.gc.pregen/tree_bitset.trans_opt
+lib/mercury/ints/hlc.gc.pregen/type_desc.opt
+lib/mercury/ints/hlc.gc.pregen/type_desc.trans_opt
+lib/mercury/ints/hlc.gc.pregen/unit.opt
+lib/mercury/ints/hlc.gc.pregen/unit.trans_opt
+lib/mercury/ints/hlc.gc.pregen/univ.opt
+lib/mercury/ints/hlc.gc.pregen/univ.trans_opt
+lib/mercury/ints/hlc.gc.pregen/varset.opt
+lib/mercury/ints/hlc.gc.pregen/varset.trans_opt
+lib/mercury/ints/hlc.gc.pregen/version_array.opt
+lib/mercury/ints/hlc.gc.pregen/version_array.trans_opt
+lib/mercury/ints/hlc.gc.pregen/version_array2d.opt
+lib/mercury/ints/hlc.gc.pregen/version_array2d.trans_opt
+lib/mercury/ints/hlc.gc.pregen/version_bitmap.opt
+lib/mercury/ints/hlc.gc.pregen/version_bitmap.trans_opt
+lib/mercury/ints/hlc.gc.pregen/version_hash_table.opt
+lib/mercury/ints/hlc.gc.pregen/version_hash_table.trans_opt
+lib/mercury/ints/hlc.gc.pregen/version_store.opt
+lib/mercury/ints/hlc.gc.pregen/version_store.trans_opt
 lib/mercury/ints/hlc.gc.trseg/Mercury/opts
 lib/mercury/ints/hlc.gc.trseg/Mercury/trans_opts
 lib/mercury/ints/hlc.gc.trseg/array.opt
@@ -2553,6 +2665,8 @@ lib/mercury/ints/hlc.gc.trseg/erlang_rtti_implementation.opt
 lib/mercury/ints/hlc.gc.trseg/erlang_rtti_implementation.trans_opt
 lib/mercury/ints/hlc.gc.trseg/exception.opt
 lib/mercury/ints/hlc.gc.trseg/exception.trans_opt
+lib/mercury/ints/hlc.gc.trseg/fat_sparse_bitset.opt
+lib/mercury/ints/hlc.gc.trseg/fat_sparse_bitset.trans_opt
 lib/mercury/ints/hlc.gc.trseg/float.opt
 lib/mercury/ints/hlc.gc.trseg/float.trans_opt
 lib/mercury/ints/hlc.gc.trseg/gc.opt
@@ -2663,30 +2777,12 @@ lib/mercury/ints/hlc.gc.trseg/string.builder.opt
 lib/mercury/ints/hlc.gc.trseg/string.builder.trans_opt
 lib/mercury/ints/hlc.gc.trseg/string.opt
 lib/mercury/ints/hlc.gc.trseg/string.trans_opt
-lib/mercury/ints/hlc.gc.trseg/svarray.opt
-lib/mercury/ints/hlc.gc.trseg/svarray.trans_opt
-lib/mercury/ints/hlc.gc.trseg/svbag.opt
-lib/mercury/ints/hlc.gc.trseg/svbag.trans_opt
-lib/mercury/ints/hlc.gc.trseg/svbimap.opt
-lib/mercury/ints/hlc.gc.trseg/svbimap.trans_opt
-lib/mercury/ints/hlc.gc.trseg/sveqvclass.opt
-lib/mercury/ints/hlc.gc.trseg/sveqvclass.trans_opt
 lib/mercury/ints/hlc.gc.trseg/svlist.opt
 lib/mercury/ints/hlc.gc.trseg/svlist.trans_opt
-lib/mercury/ints/hlc.gc.trseg/svmap.opt
-lib/mercury/ints/hlc.gc.trseg/svmap.trans_opt
-lib/mercury/ints/hlc.gc.trseg/svmulti_map.opt
-lib/mercury/ints/hlc.gc.trseg/svmulti_map.trans_opt
 lib/mercury/ints/hlc.gc.trseg/svpqueue.opt
 lib/mercury/ints/hlc.gc.trseg/svpqueue.trans_opt
-lib/mercury/ints/hlc.gc.trseg/svqueue.opt
-lib/mercury/ints/hlc.gc.trseg/svqueue.trans_opt
-lib/mercury/ints/hlc.gc.trseg/svset.opt
-lib/mercury/ints/hlc.gc.trseg/svset.trans_opt
 lib/mercury/ints/hlc.gc.trseg/svstack.opt
 lib/mercury/ints/hlc.gc.trseg/svstack.trans_opt
-lib/mercury/ints/hlc.gc.trseg/svvarset.opt
-lib/mercury/ints/hlc.gc.trseg/svvarset.trans_opt
 lib/mercury/ints/hlc.gc.trseg/table_builtin.opt
 lib/mercury/ints/hlc.gc.trseg/table_builtin.trans_opt
 lib/mercury/ints/hlc.gc.trseg/table_statistics.opt
@@ -2699,6 +2795,8 @@ lib/mercury/ints/hlc.gc.trseg/term_size_prof_builtin.opt
 lib/mercury/ints/hlc.gc.trseg/term_size_prof_builtin.trans_opt
 lib/mercury/ints/hlc.gc.trseg/term_to_xml.opt
 lib/mercury/ints/hlc.gc.trseg/term_to_xml.trans_opt
+lib/mercury/ints/hlc.gc.trseg/test_bitset.opt
+lib/mercury/ints/hlc.gc.trseg/test_bitset.trans_opt
 lib/mercury/ints/hlc.gc.trseg/thread.channel.opt
 lib/mercury/ints/hlc.gc.trseg/thread.channel.trans_opt
 lib/mercury/ints/hlc.gc.trseg/thread.mvar.opt
@@ -2787,6 +2885,8 @@ lib/mercury/ints/hlc.gc/erlang_rtti_implementation.opt
 lib/mercury/ints/hlc.gc/erlang_rtti_implementation.trans_opt
 lib/mercury/ints/hlc.gc/exception.opt
 lib/mercury/ints/hlc.gc/exception.trans_opt
+lib/mercury/ints/hlc.gc/fat_sparse_bitset.opt
+lib/mercury/ints/hlc.gc/fat_sparse_bitset.trans_opt
 lib/mercury/ints/hlc.gc/float.opt
 lib/mercury/ints/hlc.gc/float.trans_opt
 lib/mercury/ints/hlc.gc/gc.opt
@@ -2897,30 +2997,12 @@ lib/mercury/ints/hlc.gc/string.builder.opt
 lib/mercury/ints/hlc.gc/string.builder.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/svlist.opt
 lib/mercury/ints/hlc.gc/svlist.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/svpqueue.opt
 lib/mercury/ints/hlc.gc/svpqueue.trans_opt
-lib/mercury/ints/hlc.gc/svqueue.opt
-lib/mercury/ints/hlc.gc/svqueue.trans_opt
-lib/mercury/ints/hlc.gc/svset.opt
-lib/mercury/ints/hlc.gc/svset.trans_opt
 lib/mercury/ints/hlc.gc/svstack.opt
 lib/mercury/ints/hlc.gc/svstack.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/table_statistics.opt
@@ -2933,6 +3015,8 @@ 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/test_bitset.opt
+lib/mercury/ints/hlc.gc/test_bitset.trans_opt
 lib/mercury/ints/hlc.gc/thread.channel.opt
 lib/mercury/ints/hlc.gc/thread.channel.trans_opt
 lib/mercury/ints/hlc.gc/thread.mvar.opt
@@ -3251,6 +3335,12 @@ lib/mercury/ints/mdbcomp.rtti_access.int3
 lib/mercury/ints/mdbcomp.rtti_access.mh
 lib/mercury/ints/mdbcomp.rtti_access.mih
 lib/mercury/ints/mdbcomp.rtti_access.module_dep
+lib/mercury/ints/mdbcomp.shared_utilities.int
+lib/mercury/ints/mdbcomp.shared_utilities.int2
+lib/mercury/ints/mdbcomp.shared_utilities.int3
+lib/mercury/ints/mdbcomp.shared_utilities.mh
+lib/mercury/ints/mdbcomp.shared_utilities.mih
+lib/mercury/ints/mdbcomp.shared_utilities.module_dep
 lib/mercury/ints/mdbcomp.slice_and_dice.int
 lib/mercury/ints/mdbcomp.slice_and_dice.int2
 lib/mercury/ints/mdbcomp.slice_and_dice.int3
@@ -3601,38 +3691,6 @@ 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/svlist.int
 lib/mercury/ints/svlist.int2
 lib/mercury/ints/svlist.int3
@@ -3641,22 +3699,6 @@ lib/mercury/ints/svlist.mih
 lib/mercury/ints/svlist.module_dep
 lib/mercury/ints/svlist.opt
 lib/mercury/ints/svlist.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/svpqueue.int
 lib/mercury/ints/svpqueue.int2
 lib/mercury/ints/svpqueue.int3
@@ -3665,22 +3707,6 @@ lib/mercury/ints/svpqueue.mih
 lib/mercury/ints/svpqueue.module_dep
 lib/mercury/ints/svpqueue.opt
 lib/mercury/ints/svpqueue.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/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/svstack.int
 lib/mercury/ints/svstack.int2
 lib/mercury/ints/svstack.int3
@@ -3689,14 +3715,6 @@ lib/mercury/ints/svstack.mih
 lib/mercury/ints/svstack.module_dep
 lib/mercury/ints/svstack.opt
 lib/mercury/ints/svstack.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
@@ -3745,6 +3763,14 @@ 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/test_bitset.int
+lib/mercury/ints/test_bitset.int2
+lib/mercury/ints/test_bitset.int3
+lib/mercury/ints/test_bitset.mh
+lib/mercury/ints/test_bitset.mih
+lib/mercury/ints/test_bitset.module_dep
+lib/mercury/ints/test_bitset.opt
+lib/mercury/ints/test_bitset.trans_opt
 lib/mercury/ints/thread.channel.int
 lib/mercury/ints/thread.channel.int2
 lib/mercury/ints/thread.channel.int3
@@ -3986,6 +4012,170 @@ 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.pregen/inc/Mercury/mihs
+lib/mercury/lib/hlc.gc.pregen/inc/array.mih
+lib/mercury/lib/hlc.gc.pregen/inc/array2d.mih
+lib/mercury/lib/hlc.gc.pregen/inc/assoc_list.mih
+lib/mercury/lib/hlc.gc.pregen/inc/backjump.mih
+lib/mercury/lib/hlc.gc.pregen/inc/bag.mih
+lib/mercury/lib/hlc.gc.pregen/inc/benchmarking.mih
+lib/mercury/lib/hlc.gc.pregen/inc/bimap.mih
+lib/mercury/lib/hlc.gc.pregen/inc/bit_buffer.mih
+lib/mercury/lib/hlc.gc.pregen/inc/bit_buffer.read.mih
+lib/mercury/lib/hlc.gc.pregen/inc/bit_buffer.write.mih
+lib/mercury/lib/hlc.gc.pregen/inc/bitmap.mih
+lib/mercury/lib/hlc.gc.pregen/inc/bool.mih
+lib/mercury/lib/hlc.gc.pregen/inc/bt_array.mih
+lib/mercury/lib/hlc.gc.pregen/inc/builtin.mih
+lib/mercury/lib/hlc.gc.pregen/inc/calendar.mih
+lib/mercury/lib/hlc.gc.pregen/inc/char.mih
+lib/mercury/lib/hlc.gc.pregen/inc/construct.mih
+lib/mercury/lib/hlc.gc.pregen/inc/cord.mih
+lib/mercury/lib/hlc.gc.pregen/inc/counter.mih
+lib/mercury/lib/hlc.gc.pregen/inc/deconstruct.mih
+lib/mercury/lib/hlc.gc.pregen/inc/digraph.mih
+lib/mercury/lib/hlc.gc.pregen/inc/dir.mih
+lib/mercury/lib/hlc.gc.pregen/inc/enum.mih
+lib/mercury/lib/hlc.gc.pregen/inc/eqvclass.mih
+lib/mercury/lib/hlc.gc.pregen/inc/erlang_builtin.mih
+lib/mercury/lib/hlc.gc.pregen/inc/erlang_rtti_implementation.mih
+lib/mercury/lib/hlc.gc.pregen/inc/exception.mih
+lib/mercury/lib/hlc.gc.pregen/inc/fat_sparse_bitset.mih
+lib/mercury/lib/hlc.gc.pregen/inc/float.mih
+lib/mercury/lib/hlc.gc.pregen/inc/gc.mih
+lib/mercury/lib/hlc.gc.pregen/inc/getopt.mih
+lib/mercury/lib/hlc.gc.pregen/inc/getopt_io.mih
+lib/mercury/lib/hlc.gc.pregen/inc/hash_table.mih
+lib/mercury/lib/hlc.gc.pregen/inc/injection.mih
+lib/mercury/lib/hlc.gc.pregen/inc/int.mih
+lib/mercury/lib/hlc.gc.pregen/inc/integer.mih
+lib/mercury/lib/hlc.gc.pregen/inc/io.mih
+lib/mercury/lib/hlc.gc.pregen/inc/lazy.mih
+lib/mercury/lib/hlc.gc.pregen/inc/lexer.mih
+lib/mercury/lib/hlc.gc.pregen/inc/library.mih
+lib/mercury/lib/hlc.gc.pregen/inc/list.mih
+lib/mercury/lib/hlc.gc.pregen/inc/map.mih
+lib/mercury/lib/hlc.gc.pregen/inc/math.mih
+lib/mercury/lib/hlc.gc.pregen/inc/maybe.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.browse.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.browser_info.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.browser_term.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.collect_lib.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.cterm.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.debugger_interface.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.declarative_analyser.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.declarative_debugger.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.declarative_edt.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.declarative_execution.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.declarative_oracle.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.declarative_tree.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.declarative_user.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.diff.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.dl.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.frame.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.help.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.interactive_query.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.io_action.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.listing.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.name_mangle.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.parse.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.sized_pretty.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.term_rep.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdb.util.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdbcomp.feedback.automatic_parallelism.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdbcomp.feedback.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdbcomp.goal_path.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdbcomp.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdbcomp.prim_data.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdbcomp.program_representation.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdbcomp.rtti_access.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdbcomp.shared_utilities.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdbcomp.slice_and_dice.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mdbcomp.trace_counts.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mer_browser.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mer_mdbcomp.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mer_ssdb.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mer_std.mih
+lib/mercury/lib/hlc.gc.pregen/inc/multi_map.mih
+lib/mercury/lib/hlc.gc.pregen/inc/mutvar.mih
+lib/mercury/lib/hlc.gc.pregen/inc/ops.mih
+lib/mercury/lib/hlc.gc.pregen/inc/pair.mih
+lib/mercury/lib/hlc.gc.pregen/inc/par_builtin.mih
+lib/mercury/lib/hlc.gc.pregen/inc/parser.mih
+lib/mercury/lib/hlc.gc.pregen/inc/parsing_utils.mih
+lib/mercury/lib/hlc.gc.pregen/inc/pprint.mih
+lib/mercury/lib/hlc.gc.pregen/inc/pqueue.mih
+lib/mercury/lib/hlc.gc.pregen/inc/pretty_printer.mih
+lib/mercury/lib/hlc.gc.pregen/inc/private_builtin.mih
+lib/mercury/lib/hlc.gc.pregen/inc/profiling_builtin.mih
+lib/mercury/lib/hlc.gc.pregen/inc/prolog.mih
+lib/mercury/lib/hlc.gc.pregen/inc/queue.mih
+lib/mercury/lib/hlc.gc.pregen/inc/random.mih
+lib/mercury/lib/hlc.gc.pregen/inc/rational.mih
+lib/mercury/lib/hlc.gc.pregen/inc/rbtree.mih
+lib/mercury/lib/hlc.gc.pregen/inc/region_builtin.mih
+lib/mercury/lib/hlc.gc.pregen/inc/require.mih
+lib/mercury/lib/hlc.gc.pregen/inc/robdd.mih
+lib/mercury/lib/hlc.gc.pregen/inc/rtree.mih
+lib/mercury/lib/hlc.gc.pregen/inc/rtti_implementation.mih
+lib/mercury/lib/hlc.gc.pregen/inc/set.mih
+lib/mercury/lib/hlc.gc.pregen/inc/set_bbbtree.mih
+lib/mercury/lib/hlc.gc.pregen/inc/set_ctree234.mih
+lib/mercury/lib/hlc.gc.pregen/inc/set_ordlist.mih
+lib/mercury/lib/hlc.gc.pregen/inc/set_tree234.mih
+lib/mercury/lib/hlc.gc.pregen/inc/set_unordlist.mih
+lib/mercury/lib/hlc.gc.pregen/inc/solutions.mih
+lib/mercury/lib/hlc.gc.pregen/inc/sparse_bitset.mih
+lib/mercury/lib/hlc.gc.pregen/inc/ssdb.mih
+lib/mercury/lib/hlc.gc.pregen/inc/stack.mih
+lib/mercury/lib/hlc.gc.pregen/inc/std_util.mih
+lib/mercury/lib/hlc.gc.pregen/inc/stm_builtin.mih
+lib/mercury/lib/hlc.gc.pregen/inc/store.mih
+lib/mercury/lib/hlc.gc.pregen/inc/stream.mih
+lib/mercury/lib/hlc.gc.pregen/inc/stream.string_writer.mih
+lib/mercury/lib/hlc.gc.pregen/inc/string.builder.mih
+lib/mercury/lib/hlc.gc.pregen/inc/string.mih
+lib/mercury/lib/hlc.gc.pregen/inc/svlist.mih
+lib/mercury/lib/hlc.gc.pregen/inc/svpqueue.mih
+lib/mercury/lib/hlc.gc.pregen/inc/svstack.mih
+lib/mercury/lib/hlc.gc.pregen/inc/table_builtin.mih
+lib/mercury/lib/hlc.gc.pregen/inc/table_statistics.mih
+lib/mercury/lib/hlc.gc.pregen/inc/term.mih
+lib/mercury/lib/hlc.gc.pregen/inc/term_io.mih
+lib/mercury/lib/hlc.gc.pregen/inc/term_size_prof_builtin.mih
+lib/mercury/lib/hlc.gc.pregen/inc/term_to_xml.mih
+lib/mercury/lib/hlc.gc.pregen/inc/test_bitset.mih
+lib/mercury/lib/hlc.gc.pregen/inc/thread.channel.mih
+lib/mercury/lib/hlc.gc.pregen/inc/thread.mih
+lib/mercury/lib/hlc.gc.pregen/inc/thread.mvar.mih
+lib/mercury/lib/hlc.gc.pregen/inc/thread.semaphore.mih
+lib/mercury/lib/hlc.gc.pregen/inc/time.mih
+lib/mercury/lib/hlc.gc.pregen/inc/tree234.mih
+lib/mercury/lib/hlc.gc.pregen/inc/tree_bitset.mih
+lib/mercury/lib/hlc.gc.pregen/inc/type_desc.mih
+lib/mercury/lib/hlc.gc.pregen/inc/unit.mih
+lib/mercury/lib/hlc.gc.pregen/inc/univ.mih
+lib/mercury/lib/hlc.gc.pregen/inc/varset.mih
+lib/mercury/lib/hlc.gc.pregen/inc/version_array.mih
+lib/mercury/lib/hlc.gc.pregen/inc/version_array2d.mih
+lib/mercury/lib/hlc.gc.pregen/inc/version_bitmap.mih
+lib/mercury/lib/hlc.gc.pregen/inc/version_hash_table.mih
+lib/mercury/lib/hlc.gc.pregen/inc/version_store.mih
+lib/mercury/lib/hlc.gc.pregen/libmer_browser.a
+lib/mercury/lib/hlc.gc.pregen/libmer_browser.so
+lib/mercury/lib/hlc.gc.pregen/libmer_eventspec.a
+lib/mercury/lib/hlc.gc.pregen/libmer_eventspec.so
+lib/mercury/lib/hlc.gc.pregen/libmer_mdbcomp.a
+lib/mercury/lib/hlc.gc.pregen/libmer_mdbcomp.so
+lib/mercury/lib/hlc.gc.pregen/libmer_rt.a
+lib/mercury/lib/hlc.gc.pregen/libmer_rt.so
+lib/mercury/lib/hlc.gc.pregen/libmer_ssdb.a
+lib/mercury/lib/hlc.gc.pregen/libmer_ssdb.so
+lib/mercury/lib/hlc.gc.pregen/libmer_std.a
+lib/mercury/lib/hlc.gc.pregen/libmer_std.so
+lib/mercury/lib/hlc.gc.pregen/libmer_trace.a
+lib/mercury/lib/hlc.gc.pregen/libmer_trace.so
 lib/mercury/lib/hlc.gc.trseg/inc/Mercury/mihs
 lib/mercury/lib/hlc.gc.trseg/inc/array.mih
 lib/mercury/lib/hlc.gc.trseg/inc/array2d.mih
@@ -4014,6 +4204,7 @@ lib/mercury/lib/hlc.gc.trseg/inc/eqvclass.mih
 lib/mercury/lib/hlc.gc.trseg/inc/erlang_builtin.mih
 lib/mercury/lib/hlc.gc.trseg/inc/erlang_rtti_implementation.mih
 lib/mercury/lib/hlc.gc.trseg/inc/exception.mih
+lib/mercury/lib/hlc.gc.trseg/inc/fat_sparse_bitset.mih
 lib/mercury/lib/hlc.gc.trseg/inc/float.mih
 lib/mercury/lib/hlc.gc.trseg/inc/gc.mih
 lib/mercury/lib/hlc.gc.trseg/inc/getopt.mih
@@ -4063,6 +4254,7 @@ lib/mercury/lib/hlc.gc.trseg/inc/mdbcomp.mih
 lib/mercury/lib/hlc.gc.trseg/inc/mdbcomp.prim_data.mih
 lib/mercury/lib/hlc.gc.trseg/inc/mdbcomp.program_representation.mih
 lib/mercury/lib/hlc.gc.trseg/inc/mdbcomp.rtti_access.mih
+lib/mercury/lib/hlc.gc.trseg/inc/mdbcomp.shared_utilities.mih
 lib/mercury/lib/hlc.gc.trseg/inc/mdbcomp.slice_and_dice.mih
 lib/mercury/lib/hlc.gc.trseg/inc/mdbcomp.trace_counts.mih
 lib/mercury/lib/hlc.gc.trseg/inc/mer_browser.mih
@@ -4108,24 +4300,16 @@ lib/mercury/lib/hlc.gc.trseg/inc/stream.mih
 lib/mercury/lib/hlc.gc.trseg/inc/stream.string_writer.mih
 lib/mercury/lib/hlc.gc.trseg/inc/string.builder.mih
 lib/mercury/lib/hlc.gc.trseg/inc/string.mih
-lib/mercury/lib/hlc.gc.trseg/inc/svarray.mih
-lib/mercury/lib/hlc.gc.trseg/inc/svbag.mih
-lib/mercury/lib/hlc.gc.trseg/inc/svbimap.mih
-lib/mercury/lib/hlc.gc.trseg/inc/sveqvclass.mih
 lib/mercury/lib/hlc.gc.trseg/inc/svlist.mih
-lib/mercury/lib/hlc.gc.trseg/inc/svmap.mih
-lib/mercury/lib/hlc.gc.trseg/inc/svmulti_map.mih
 lib/mercury/lib/hlc.gc.trseg/inc/svpqueue.mih
-lib/mercury/lib/hlc.gc.trseg/inc/svqueue.mih
-lib/mercury/lib/hlc.gc.trseg/inc/svset.mih
 lib/mercury/lib/hlc.gc.trseg/inc/svstack.mih
-lib/mercury/lib/hlc.gc.trseg/inc/svvarset.mih
 lib/mercury/lib/hlc.gc.trseg/inc/table_builtin.mih
 lib/mercury/lib/hlc.gc.trseg/inc/table_statistics.mih
 lib/mercury/lib/hlc.gc.trseg/inc/term.mih
 lib/mercury/lib/hlc.gc.trseg/inc/term_io.mih
 lib/mercury/lib/hlc.gc.trseg/inc/term_size_prof_builtin.mih
 lib/mercury/lib/hlc.gc.trseg/inc/term_to_xml.mih
+lib/mercury/lib/hlc.gc.trseg/inc/test_bitset.mih
 lib/mercury/lib/hlc.gc.trseg/inc/thread.channel.mih
 lib/mercury/lib/hlc.gc.trseg/inc/thread.mih
 lib/mercury/lib/hlc.gc.trseg/inc/thread.mvar.mih
@@ -4184,6 +4368,7 @@ lib/mercury/lib/hlc.gc/inc/eqvclass.mih
 lib/mercury/lib/hlc.gc/inc/erlang_builtin.mih
 lib/mercury/lib/hlc.gc/inc/erlang_rtti_implementation.mih
 lib/mercury/lib/hlc.gc/inc/exception.mih
+lib/mercury/lib/hlc.gc/inc/fat_sparse_bitset.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
@@ -4233,6 +4418,7 @@ lib/mercury/lib/hlc.gc/inc/mdbcomp.mih
 lib/mercury/lib/hlc.gc/inc/mdbcomp.prim_data.mih
 lib/mercury/lib/hlc.gc/inc/mdbcomp.program_representation.mih
 lib/mercury/lib/hlc.gc/inc/mdbcomp.rtti_access.mih
+lib/mercury/lib/hlc.gc/inc/mdbcomp.shared_utilities.mih
 lib/mercury/lib/hlc.gc/inc/mdbcomp.slice_and_dice.mih
 lib/mercury/lib/hlc.gc/inc/mdbcomp.trace_counts.mih
 lib/mercury/lib/hlc.gc/inc/mer_browser.mih
@@ -4278,24 +4464,16 @@ lib/mercury/lib/hlc.gc/inc/stream.mih
 lib/mercury/lib/hlc.gc/inc/stream.string_writer.mih
 lib/mercury/lib/hlc.gc/inc/string.builder.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/svlist.mih
-lib/mercury/lib/hlc.gc/inc/svmap.mih
-lib/mercury/lib/hlc.gc/inc/svmulti_map.mih
 lib/mercury/lib/hlc.gc/inc/svpqueue.mih
-lib/mercury/lib/hlc.gc/inc/svqueue.mih
-lib/mercury/lib/hlc.gc/inc/svset.mih
 lib/mercury/lib/hlc.gc/inc/svstack.mih
-lib/mercury/lib/hlc.gc/inc/svvarset.mih
 lib/mercury/lib/hlc.gc/inc/table_builtin.mih
 lib/mercury/lib/hlc.gc/inc/table_statistics.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/test_bitset.mih
 lib/mercury/lib/hlc.gc/inc/thread.channel.mih
 lib/mercury/lib/hlc.gc/inc/thread.mih
 lib/mercury/lib/hlc.gc/inc/thread.mvar.mih
@@ -4378,6 +4556,11 @@ lib/mercury/modules/asm_fast.gc/mer_mdbcomp.init
 lib/mercury/modules/asm_fast.gc/mer_rt.init
 lib/mercury/modules/asm_fast.gc/mer_ssdb.init
 lib/mercury/modules/asm_fast.gc/mer_std.init
+lib/mercury/modules/hlc.gc.pregen/mer_browser.init
+lib/mercury/modules/hlc.gc.pregen/mer_mdbcomp.init
+lib/mercury/modules/hlc.gc.pregen/mer_rt.init
+lib/mercury/modules/hlc.gc.pregen/mer_ssdb.init
+lib/mercury/modules/hlc.gc.pregen/mer_std.init
 lib/mercury/modules/hlc.gc.trseg/mer_browser.init
 lib/mercury/modules/hlc.gc.trseg/mer_mdbcomp.init
 lib/mercury/modules/hlc.gc.trseg/mer_rt.init
@@ -4393,7 +4576,7 @@ 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/configure.ac
 lib/mercury/reconf/install-sh
 lib/mercury/reconf/runtime/mercury_conf.h.in
 lib/mercury/reconf/scripts/Mercury.config.bootstrap.in
@@ -4467,6 +4650,11 @@ 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/COPYING
+share/examples/mercury/COPYING.LIB
+share/examples/mercury/INSTALL
+share/examples/mercury/INSTALL_CVS
+share/examples/mercury/Mmake.common
 share/examples/mercury/Mmakefile
 share/examples/mercury/README
 share/examples/mercury/appengine/Makefile
@@ -4595,6 +4783,7 @@ share/examples/mercury/solutions/one_solution.m
 share/examples/mercury/solutions/some_solutions.m
 share/examples/mercury/solver_types/.nocopyright
 share/examples/mercury/solver_types/Makefile
+share/examples/mercury/solver_types/Mercury.options
 share/examples/mercury/solver_types/README
 share/examples/mercury/solver_types/eqneq.m
 share/examples/mercury/solver_types/sudoku.m
diff --git a/lang/mercury/distinfo b/lang/mercury/distinfo
index a2e95acff7e..0d49c9acc83 100644
--- a/lang/mercury/distinfo
+++ b/lang/mercury/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.11 2012/01/30 05:40:02 asau Exp $
+$NetBSD: distinfo,v 1.12 2013/06/11 19:34:14 asau Exp $
 
-SHA1 (mercury-compiler-11.07.tar.gz) = d27541f5fcd5ec6b8ca2fc39f72ed74c833f243a
-RMD160 (mercury-compiler-11.07.tar.gz) = 1573be5c26415c6fac96f85ff9558db736890b83
-Size (mercury-compiler-11.07.tar.gz) = 25298643 bytes
+SHA1 (mercury-srcdist-13.05.1-beta-2013-05-28.tar.gz) = bdbf25a0696a950192f4e918ba80b0e8534a9bbe
+RMD160 (mercury-srcdist-13.05.1-beta-2013-05-28.tar.gz) = d292413e85a0841844bb349907bf6f11d186f808
+Size (mercury-srcdist-13.05.1-beta-2013-05-28.tar.gz) = 54568933 bytes
 SHA1 (patch-ab) = ac76d414cd5d6ed0b429c706d982dfbb9a643508
 SHA1 (patch-ac) = 94a59bded8b57a4e919dd029690629b552dfd681
-SHA1 (patch-ad) = a76030a9c15d160c46d2003aba5b74e6b7bed6e2
+SHA1 (patch-ad) = 94d5029000b8d2e2f424aff957d8c72d2c7aa1fe
 SHA1 (patch-an) = 65bfb05147fe2f3663b35e494b8e8bf7fc6906e2
 SHA1 (patch-ao) = c994597a95edc8376c4916333e7ad371752bbd2e
 SHA1 (patch-ap) = 1779d182c543322c0083a6cca354a73fda4f7cb5
 SHA1 (patch-aq) = fcf7b99650d9f288cbc4200c2bc48934f7198845
-SHA1 (patch-at) = 54944e30e7a99faa90ff3b8f642abf11bf3559bc
+SHA1 (patch-at) = 9ec4846319d823a55cd944cc7436b9770d512be5
diff --git a/lang/mercury/patches/patch-ad b/lang/mercury/patches/patch-ad
index b628844eba3..670a5d8b80a 100644
--- a/lang/mercury/patches/patch-ad
+++ b/lang/mercury/patches/patch-ad
@@ -1,26 +1,26 @@
-$NetBSD: patch-ad,v 1.3 2004/02/14 03:04:31 kristerw Exp $
+$NetBSD: patch-ad,v 1.4 2013/06/11 19:34:14 asau Exp $
 
---- doc/Mmakefile.orig	Fri Nov 29 08:06:19 2002
-+++ doc/Mmakefile	Fri Feb 13 23:26:07 2004
-@@ -177,7 +177,7 @@
+--- doc/Mmakefile.orig	2013-05-28 04:00:38.000000000 +0000
++++ doc/Mmakefile
+@@ -239,7 +239,7 @@ mdb_command_test.inp: generate_mdb_comma
  # Note that some modules are just implementation details of the library,
  # so they are not documented.
  
--library-menu.texi_pp: $(LIBRARY_DIR)/*.m
-+library-menu.texi_pp:
+-library-menu.texi_pp: ../VERSION $(LIBRARY_DIR)/*.m
++library-menu.texi_pp: ../VERSION
  	{ 								\
  	echo "";							\
  	for filename in $(LIBRARY_DIR)/*.m; do				\
-@@ -199,7 +199,7 @@
+@@ -293,7 +293,7 @@ library-menu.texi_pp: ../VERSION $(LIBRA
  	done;								\
  	} > library-menu.texi_pp
  
--library-chapters.texi_pp: $(LIBRARY_DIR)/[a-z]*.m
-+library-chapters.texi_pp:
+-library-chapters.texi_pp: ../VERSION $(LIBRARY_DIR)/[a-z]*.m
++library-chapters.texi_pp: ../VERSION
  	for filename in $(LIBRARY_DIR)/[a-z]*.m; do 			\
  		case $$filename in					\
- 			$(LIBRARY_DIR)/mer_std.m)			\
-@@ -271,7 +271,7 @@
+ 			$(LIBRARY_DIR)/backjump.m)			\
+@@ -398,7 +398,7 @@ install_dirs:
  
  .PHONY: install_info
  install_info: $(INFOPAGES) install_dirs
diff --git a/lang/mercury/patches/patch-at b/lang/mercury/patches/patch-at
index c9573a2265f..87e3144134b 100644
--- a/lang/mercury/patches/patch-at
+++ b/lang/mercury/patches/patch-at
@@ -1,15 +1,15 @@
-$NetBSD: patch-at,v 1.2 2012/01/30 05:40:02 asau Exp $
+$NetBSD: patch-at,v 1.3 2013/06/11 19:34:14 asau Exp $
 
 Support shared libraries.
 
---- configure.orig	2010-07-18 12:40:26.000000000 +0400
-+++ configure	2010-07-20 22:56:53.000000000 +0400
-@@ -11869,7 +11869,7 @@
+--- configure.orig	2013-05-28 05:23:38.000000000 +0000
++++ configure
+@@ -11250,7 +11250,7 @@ $as_echo "yes" >&6; }
          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; }
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }