trivial diff: fix ordering bug in runtime/mercury_conf_param.h

Zoltan Somogyi zs at cs.mu.OZ.AU
Fri Oct 2 19:00:16 AEST 1998


runtime/mercury_conf_param.h:
	Fix a bug in DJ's last change: do not test the value of the
	macro MR_STATIC_CODE_ADDRESSES before it has had a chance
	to be defined. This fix allows stack dumps and uplevel prints
	to work again.

Zoltan.

Index: mercury_conf_param.h
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/mercury_conf_param.h,v
retrieving revision 1.10
diff -u -u -r1.10 mercury_conf_param.h
--- mercury_conf_param.h	1998/09/15 09:55:22	1.10
+++ mercury_conf_param.h	1998/10/02 08:52:27
@@ -204,9 +204,23 @@
 ** Configuration parameters whose values are determined by the settings
 ** of other configuration parameters.  These parameters should not be
 ** set on the command line.
+**
+** You must make sure that you don't test the value of any of these parameters
+** before its conditional definition.
 */
 
 /*
+** Static code addresses are available unless using gcc non-local gotos,
+** without assembler labels.
+*/
+#ifdef MR_STATIC_CODE_ADDRESSES
+  #error "MR_STATIC_CODE_ADDRESSES should not be defined on the command line"
+#endif
+#if !defined(USE_GCC_NONLOCAL_GOTOS) || defined(USE_ASM_LABELS)
+  #define MR_STATIC_CODE_ADDRESSES
+#endif
+
+/*
 ** MR_USE_STACK_LAYOUTS -- stack layouts are in use, generate stack
 **                         layout structures.
 */
@@ -228,17 +242,6 @@
 #endif
 #if defined(MR_STACK_TRACE) || defined(NATIVE_GC) || defined(MR_DEBUG_GOTOS) || defined(MR_STACK_TRACE_THIS_MODULE)
   #define MR_INSERT_LABELS
-#endif
-
-/*
-** Static code addresses are available unless using gcc non-local gotos,
-** without assembler labels.
-*/
-#ifdef MR_STATIC_CODE_ADDRESSES
-  #error "MR_STATIC_CODE_ADDRESSES should not be defined on the command line"
-#endif
-#if !defined(USE_GCC_NONLOCAL_GOTOS) || defined(USE_ASM_LABELS)
-  #define MR_STATIC_CODE_ADDRESSES
 #endif
 
 /*



More information about the developers mailing list