[m-rev.] diff: more MR_ prefixes

[Simon Taylor]

Estimated hours taken: 0.25
Branches: main

scripts/mgnuc.in:
compiler/mercury_compile.m:
	Add MR_ prefixes to symbols defined on the gcc command line.

Index: compiler/mercury_compile.m
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/mercury_compile.m,v
retrieving revision 1.233
diff -u -u -r1.233 mercury_compile.m
--- compiler/mercury_compile.m	13 Feb 2002 09:56:23 -0000	1.233
+++ compiler/mercury_compile.m	19 Feb 2002 09:56:17 -0000
@@ -3547,7 +3547,7 @@
 	 	(func(C_INCL) = ["-I", C_INCL, " "]), C_Incl_Dirs))) },
 	globals__io_lookup_bool_option(split_c_files, Split_C_Files),
 	{ Split_C_Files = yes ->
-		SplitOpt = "-DSPLIT_C_FILES "
+		SplitOpt = "-DMR_SPLIT_C_FILES "
 	;
 		SplitOpt = ""
 	},
@@ -3574,14 +3574,14 @@
 	( { GCC_Regs = yes } ->
 		globals__io_lookup_string_option(cflags_for_regs,
 			CFLAGS_FOR_REGS),
-		{ RegOpt = "-DUSE_GCC_GLOBAL_REGISTERS " }
+		{ RegOpt = "-DMR_USE_GCC_GLOBAL_REGISTERS " }
 	;
 		{ CFLAGS_FOR_REGS = "" },
 		{ RegOpt = "" }
 	),
 	globals__io_lookup_bool_option(gcc_non_local_gotos, GCC_Gotos),
 	( { GCC_Gotos = yes } ->
-		{ GotoOpt = "-DUSE_GCC_NONLOCAL_GOTOS " },
+		{ GotoOpt = "-DMR_USE_GCC_NONLOCAL_GOTOS " },
 		globals__io_lookup_string_option(cflags_for_gotos,
 			CFLAGS_FOR_GOTOS)
 	;
@@ -3590,7 +3590,7 @@
 	),
 	globals__io_lookup_bool_option(asm_labels, ASM_Labels),
 	{ ASM_Labels = yes ->
-		AsmOpt = "-DUSE_ASM_LABELS "
+		AsmOpt = "-DMR_USE_ASM_LABELS "
 	;
 		AsmOpt = ""
 	},
@@ -3603,9 +3603,9 @@
 	),
 	globals__io_get_gc_method(GC_Method),
 	{ GC_Method = conservative ->
-		GC_Opt = "-DCONSERVATIVE_GC "
+		GC_Opt = "-DMR_CONSERVATIVE_GC "
 	; GC_Method = accurate ->
-		GC_Opt = "-DNATIVE_GC "
+		GC_Opt = "-DMR_NATIVE_GC "
 	;
 		GC_Opt = ""
 	},
@@ -3635,20 +3635,20 @@
 	},
 	globals__io_lookup_bool_option(pic_reg, PIC_Reg),
 	{ PIC_Reg = yes ->
-		PIC_Reg_Opt = "-DPIC_REG "
+		PIC_Reg_Opt = "-DMR_PIC_REG "
 	;
 		PIC_Reg_Opt = ""
 	},
 	globals__io_get_tags_method(Tags_Method),
 	{ Tags_Method = high ->
-		TagsOpt = "-DHIGHTAGS "
+		TagsOpt = "-DMR_HIGHTAGS "
 	;
 		TagsOpt = ""
 	},
 	globals__io_lookup_int_option(num_tag_bits, NumTagBits),
 	{ string__int_to_string(NumTagBits, NumTagBitsString) },
 	{ string__append_list(
-		["-DTAGBITS=", NumTagBitsString, " "], NumTagBitsOpt) },
+		["-DMR_TAGBITS=", NumTagBitsString, " "], NumTagBitsOpt) },
 	globals__io_lookup_bool_option(require_tracing, RequireTracing),
 	{ RequireTracing = yes ->
 		RequireTracingOpt = "-DMR_REQUIRE_TRACING "
@@ -3694,7 +3694,7 @@
 	},
 	globals__io_lookup_bool_option(type_layout, TypeLayoutOption),
 	{ TypeLayoutOption = no ->
-		TypeLayoutOpt = "-DNO_TYPE_LAYOUT "
+		TypeLayoutOpt = "-DMR_NO_TYPE_LAYOUT "
 	;
 		TypeLayoutOpt = ""
 	},
@@ -3712,7 +3712,7 @@
 	},
 	globals__io_lookup_bool_option(inline_alloc, InlineAlloc),
 	{ InlineAlloc = yes ->
-		InlineAllocOpt = "-DINLINE_ALLOC -DSILENT "
+		InlineAllocOpt = "-DMR_INLINE_ALLOC -DSILENT "
 	;
 		InlineAllocOpt = ""
 	},
Index: scripts/mgnuc.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/mgnuc.in,v
retrieving revision 1.84
diff -u -u -r1.84 mgnuc.in
--- scripts/mgnuc.in	5 Sep 2001 16:52:54 -0000	1.84
+++ scripts/mgnuc.in	19 Feb 2002 09:50:48 -0000
@@ -158,12 +158,12 @@
 		;;
 
 	--split-c-files)
-		SPLIT_OPTS=-DSPLIT_C_FILES ;;
+		SPLIT_OPTS=-DMR_SPLIT_C_FILES ;;
 	--no-split-c-files)
 		SPLIT_OPTS= ;;
 
 	--inline-alloc)
-		INLINE_ALLOC_OPTS="-DINLINE_ALLOC -DSILENT" ;;
+		INLINE_ALLOC_OPTS="-DMR_INLINE_ALLOC -DSILENT" ;;
 	--no-inline-alloc)
 		INLINE_ALLOC_OPTS="" ;;
 
@@ -254,17 +254,17 @@
 esac
 
 case $asm_labels in
-	true)		ASM_OPTS="-DUSE_ASM_LABELS" ;;
+	true)		ASM_OPTS="-DMR_USE_ASM_LABELS" ;;
 	false)		ASM_OPTS="" ;;
 esac
 
 case $non_local_gotos in
-	true)		GOTO_OPTS="-DUSE_GCC_NONLOCAL_GOTOS" ;;
+	true)		GOTO_OPTS="-DMR_USE_GCC_NONLOCAL_GOTOS" ;;
 	false)		GOTO_OPTS="" ;;
 esac
 
 case $global_regs in
-	true)		REG_OPTS="-DUSE_GCC_GLOBAL_REGISTERS" ;;
+	true)		REG_OPTS="-DMR_USE_GCC_GLOBAL_REGISTERS" ;;
 	false)		REG_OPTS="" ;;
 esac
 
@@ -283,8 +283,8 @@
 esac
 
 case $gc_method in
-	accurate)	GC_OPTS="-DNATIVE_GC" ;;
-	conservative)	GC_OPTS="-DCONSERVATIVE_GC" ;;
+	accurate)	GC_OPTS="-DMR_NATIVE_GC" ;;
+	conservative)	GC_OPTS="-DMR_CONSERVATIVE_GC" ;;
 	none)		GC_OPTS="" ;;
 esac
 
@@ -336,7 +336,7 @@
 esac
 
 case $pic_reg in
-	true)		PICREG_OPTS="-DPIC_REG" ;;
+	true)		PICREG_OPTS="-DMR_PIC_REG" ;;
 	false)		PICREG_OPTS="" ;;
 esac
 
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------