[m-rev.] diff: fix mmc --make and .ll_debug grades

[Julien Fischer]

Estimated hours taken: 0.2
Branches: main

Fix compilation in .ll_debug grades with mmc --make.
The MR_GRADE macro was not being computed correctly be cause the
C compiler was not being invoked with -DMR_LL_DEBUG.

compiler/compile_target_code.m:
 	Fix a typo: s/MR_LOW_LEVEL_DEBUG/MR_LL_DEBUG/

compiler/handle_options.m:
 	The grade component .ll_debug also needs to imply
 	that --low-level-debug is enabled.

runtime/mercury_grade.h:
 	Fix a typo: s/mercury_grades.h/mercury_grade.h/

Julien.

Index: compiler/compile_target_code.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/compile_target_code.m,v
retrieving revision 1.97
diff -u -r1.97 compile_target_code.m
--- compiler/compile_target_code.m	1 Nov 2006 02:31:04 -0000	1.97
+++ compiler/compile_target_code.m	17 Nov 2006 04:22:01 -0000
@@ -613,7 +613,7 @@
      globals.io_lookup_bool_option(low_level_debug, LL_Debug, !IO),
      (
          LL_Debug = yes,
-        LL_DebugOpt = "-DMR_LOW_LEVEL_DEBUG "
+        LL_DebugOpt = "-DMR_LL_DEBUG "
      ;
          LL_Debug = no,
          LL_DebugOpt = ""
Index: compiler/handle_options.m
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/compiler/handle_options.m,v
retrieving revision 1.280
diff -u -r1.280 handle_options.m
--- compiler/handle_options.m	3 Nov 2006 08:31:07 -0000	1.280
+++ compiler/handle_options.m	17 Nov 2006 05:17:52 -0000
@@ -2302,7 +2302,7 @@

      % Low (target) level debugging components.
  grade_component_table("ll_debug", comp_lowlevel,
-    [target_debug - bool(yes)], no, yes).
+    [low_level_debug - bool(yes), target_debug - bool(yes)], no, yes).

      % Stack extension components.
  grade_component_table("exts", comp_stack_extend,
Index: runtime/mercury_grade.h
===================================================================
RCS file: /home/mercury/mercury1/repository/mercury/runtime/mercury_grade.h,v
retrieving revision 1.68
diff -u -r1.68 mercury_grade.h
--- runtime/mercury_grade.h	14 Nov 2006 00:22:34 -0000	1.68
+++ runtime/mercury_grade.h	17 Nov 2006 04:22:28 -0000
@@ -5,7 +5,7 @@
  */

  /*
-** mercury_grades.h - defines the MR_GRADE macro.
+** mercury_grade.h - defines the MR_GRADE macro.
  **
  ** This is used to get the linker to ensure that different object files
  ** were compiled with consistent grades.

--------------------------------------------------------------------------
mercury-reviews mailing list
Post messages to:       mercury-reviews at csse.unimelb.edu.au
Administrative Queries: owner-mercury-reviews at csse.unimelb.edu.au
Subscriptions:          mercury-reviews-request at csse.unimelb.edu.au
--------------------------------------------------------------------------