[m-rev.] diff: fix handling of TAGBITS

[Simon Taylor]

Estimated hours taken: 0.2

runtime/mercury_conf_param.h:
	Fix an omission in my last change. TAGBITS is defined on
	the gcc command line by mercury_compile (but not by mgnuc),
	so we need to define MR_TAGBITS to have the value of
	TAGBITS here.

runtime/mercury_conf_bootstrap.h:
	Define TAGBITS if it is not already defined.

runtime/mercury_bootstrap.h:
	Remove the old backwards compatibility definition of
	TAGBITS, which would not be correct in the case where
	TAGBITS is defined on the command line.

Index: mercury_bootstrap.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_bootstrap.h,v
retrieving revision 1.25
diff -u -u -r1.25 mercury_bootstrap.h
--- mercury_bootstrap.h	20 Feb 2002 05:26:50 -0000	1.25
+++ mercury_bootstrap.h	20 Feb 2002 05:33:31 -0000
@@ -437,7 +437,6 @@
 
 /* stuff from mercury_tags.h */
 
-#define	TAGBITS			MR_TAGBITS
 #define	WORDBITS		MR_WORDBITS
 
 #define	mktag(t)		MR_mktag(t)
Index: mercury_conf_bootstrap.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf_bootstrap.h,v
retrieving revision 1.3
diff -u -u -r1.3 mercury_conf_bootstrap.h
--- mercury_conf_bootstrap.h	18 Feb 2002 07:01:13 -0000	1.3
+++ mercury_conf_bootstrap.h	20 Feb 2002 10:25:39 -0000
@@ -235,6 +235,9 @@
 #ifdef MR_HIGHTAGS
   #define HIGHTAGS 1
 #endif
+#ifndef TAGBITS
+  #define TAGBITS MR_TAGBITS
+#endif
 
 /*
 ** Other stuff.
Index: mercury_conf_param.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf_param.h,v
retrieving revision 1.53
diff -u -u -r1.53 mercury_conf_param.h
--- mercury_conf_param.h	18 Feb 2002 07:01:13 -0000	1.53
+++ mercury_conf_param.h	20 Feb 2002 10:22:29 -0000
@@ -56,6 +56,7 @@
 ** MR_INLINE_ALLOC
 ** MR_PIC_REG
 ** MR_HIGHTAGS
+** MR_TAGBITS
 **	See the documentation for
 **		--high-level-code
 **		--high-level-data
@@ -74,6 +75,7 @@
 **		--inline-alloc
 **		--pic-reg
 **		--tags
+**		--num-tag-bits
 **	(respectively) in the mmc help message or the Mercury User's Guide.
 **
 ** MR_PIC
@@ -174,6 +176,13 @@
 #ifdef HIGHTAGS
   #define MR_HIGHTAGS 1
   #undef HIGHTAGS
+#endif
+#ifdef TAGBITS
+  #define MR_TAGBITS TAGBITS
+  /*
+  ** We can't #undef TAGBITS here because it is used in the
+  ** value of MR_TAGBITS.
+  */
 #endif
 
 /*
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------