diff: static code and stack layouts

[David Glen JEFFERY]

Hi Tyse,

This is a one liner... does it look right to you?


Estimated hours taken: 1.5

Fix a bug that was stopping the compiler from compiling in jump grade.

runtime/mercury_conf_param.h:
	Only enable MR_USE_STACK_LAYOUTS if static code addresses are 
	available. Otherwise the initisation code tries to insert static
	addresses into the stack layouts for the special procedures in the
	runtime.

Index: mercury_conf_param.h
===================================================================
RCS file: /home/staff/zs/imp/mercury/runtime/mercury_conf_param.h,v
retrieving revision 1.9
diff -u -t -r1.9 mercury_conf_param.h
--- 1.9	1998/07/25 13:15:37
+++ mercury_conf_param.h	1998/09/15 09:33:21
@@ -213,7 +213,7 @@
 #ifdef MR_USE_STACK_LAYOUTS
   #error "MR_USE_STACK_LAYOUTS should not be defined on the command line"
 #endif
-#if defined(MR_STACK_TRACE) || defined(NATIVE_GC) || defined(MR_STACK_TRACE_THIS_MODULE)
+#if (defined(MR_STACK_TRACE) || defined(NATIVE_GC) || defined(MR_STACK_TRACE_THIS_MODULE)) && defined(MR_STATIC_CODE_ADDRESSES)
   #define MR_USE_STACK_LAYOUTS
 #endif
 


dgj
-- 
David Jeffery (dgj at cs.mu.oz.au) |  Marge: Did you just call everyone "chicken"?
PhD student,                    |  Homer: Noooo.  I swear on this Bible!
Department of Computer Science  |  Marge: That's not a Bible; that's a book of
University of Melbourne         |         carpet samples!
Australia                       |  Homer: Ooooh... Fuzzy.