[m-dev.] for review: fix problems with .par and libgc

Fergus Henderson fjh at cs.mu.OZ.AU
Thu Aug 17 15:29:50 AEST 2000


On 17-Aug-2000, Fergus Henderson <fjh at cs.mu.OZ.AU> wrote:
> library/Mmakefile:
> compiler/Mmakefile:
> profiler/Mmakefile:
> browser/Mmakefile:
> trace/Mmakefile:
> runtime/Mmakefile:
> 	XXX These still need to be fixed.

OK, here's the diff for these files.  This is not an ideal fix, since
there is a bit of code duplication, but it will do for now.

Estimated hours taken: 0.5

runtime/Mmakefile:
trace/Mmakefile:
browser/Mmakefile:
bytecode/Mmakefile:
library/Mmakefile:
compiler/Mmakefile:
profiler/Mmakefile:
	Change the code for computing which version of the GC library
	to link in so that it also takes the `.par' grade component
	into account, rather than just the `.prof' grade component.

Workspace: /home/pgrad/fjh/ws/hg
Index: browser/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/browser/Mmakefile,v
retrieving revision 1.11
diff -u -d -r1.11 Mmakefile
--- browser/Mmakefile	2000/06/08 13:06:42	1.11
+++ browser/Mmakefile	2000/08/17 05:19:42
@@ -56,8 +56,10 @@
 LDFLAGS	=	-L$(LIBRARY_DIR) -L$(RUNTIME_DIR) -L$(BOEHM_GC_DIR)
 LDLIBS	=	-l$(STD_LIB_NAME) -l$(RT_LIB_NAME) \
 		` case "$(GRADE)" in 					\
-		    *.gc*.prof*) echo "-lgc_prof" ;;			\
-		    *.gc*)	 echo "-lgc" ;;				\
+		    *.par*.gc*.prof*)	echo "-lpar_gc_prof" ;;		\
+		    *.par*.gc*)		echo "-lpar_gc" ;;		\
+		    *.gc*.prof*)	echo "-lgc_prof" ;;		\
+		    *.gc*)		echo "-lgc" ;;			\
 		  esac							\
 		`
 
Index: bytecode/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/bytecode/Mmakefile,v
retrieving revision 1.13
diff -u -d -r1.13 Mmakefile
--- bytecode/Mmakefile	1999/09/16 04:46:24	1.13
+++ bytecode/Mmakefile	2000/08/17 05:20:31
@@ -39,8 +39,10 @@
 
 LIBS		= -lmer ` \
                   case "$(GRADE)" in \
-                        *.gc.prof*) echo "-lgc_prof" ;; \
-                        *.gc) echo "-lgc" ;; \
+		    *.par*.gc*.prof*)	echo "-lpar_gc_prof" ;;		\
+		    *.par*.gc*)		echo "-lpar_gc" ;;		\
+		    *.gc*.prof*)	echo "-lgc_prof" ;;		\
+		    *.gc*)		echo "-lgc" ;;			\
                   esac \
                   `
 
Index: compiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/compiler/Mmakefile,v
retrieving revision 1.28
diff -u -d -r1.28 Mmakefile
--- compiler/Mmakefile	2000/07/27 04:42:27	1.28
+++ compiler/Mmakefile	2000/08/17 05:24:19
@@ -45,6 +45,9 @@
 		$(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A \
 		$(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A ` \
 		    case $(GRADE) in \
+			*.par*.gc*.prof*) \
+				echo $(BOEHM_GC_DIR)/libpar_gc_prof.$A ;; \
+			*.par*.gc*)	echo $(BOEHM_GC_DIR)/libpar_gc.$A ;; \
 			*.gc*.prof*)	echo $(BOEHM_GC_DIR)/libgc_prof.$A ;; \
 			*.gc*)		echo $(BOEHM_GC_DIR)/libgc.$A ;; \
 		    esac \
Index: library/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/library/Mmakefile,v
retrieving revision 1.52
diff -u -d -r1.52 Mmakefile
--- library/Mmakefile	2000/06/22 08:50:23	1.52
+++ library/Mmakefile	2000/08/17 05:20:48
@@ -80,8 +80,10 @@
 ALL_LDFLAGS =	$(LDFLAGS) $(EXTRA_LDFLAGS)
 LDLIBS	=	-l$(RT_LIB_NAME) \
 		` case "$(GRADE)" in 					\
-		    *.gc*.prof*) echo "-lgc_prof" ;;			\
-		    *.gc*)	 echo "-lgc" ;;				\
+		    *.par*.gc*.prof*)	echo "-lpar_gc_prof" ;;		\
+		    *.par*.gc*)		echo "-lpar_gc" ;;		\
+		    *.gc*.prof*)	echo "-lgc_prof" ;;		\
+		    *.gc*)		echo "-lgc" ;;			\
 		  esac							\
 		`
 ALL_LDLIBS =	$(LDLIBS) $(EXTRA_LDLIBS)
Index: profiler/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/profiler/Mmakefile,v
retrieving revision 1.15
diff -u -d -r1.15 Mmakefile
--- profiler/Mmakefile	2000/06/14 14:50:48	1.15
+++ profiler/Mmakefile	2000/08/17 05:25:21
@@ -45,8 +45,11 @@
 		$(LIBRARY_DIR)/lib$(STD_LIB_NAME).$A \
 		$(RUNTIME_DIR)/lib$(RT_LIB_NAME).$A ` \
 		    case $(GRADE) in \
-			*.gc*.prof*)    echo $(BOEHM_GC_DIR)/libgc_prof.$A ;; \
-			*.gc*)          echo $(BOEHM_GC_DIR)/libgc.$A ;; \
+			*.par*.gc*.prof*) \
+				echo $(BOEHM_GC_DIR)/libpar_gc_prof.$A ;; \
+			*.par*.gc*)	echo $(BOEHM_GC_DIR)/libpar_gc.$A ;; \
+			*.gc*.prof*)	echo $(BOEHM_GC_DIR)/libgc_prof.$A ;; \
+			*.gc*)		echo $(BOEHM_GC_DIR)/libgc.$A ;; \
 		    esac \
 		` -lm
 MSL	=	MERCURY_SP_LIB_DIR=$(LIBRARY_DIR) $(SCRIPTS_DIR)/msl
Index: runtime/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/runtime/Mmakefile,v
retrieving revision 1.61
diff -u -d -r1.61 Mmakefile
--- runtime/Mmakefile	2000/08/11 16:50:18	1.61
+++ runtime/Mmakefile	2000/08/17 05:19:15
@@ -157,8 +157,10 @@
 LDFLAGS		= -L$(BOEHM_GC_DIR)
 LDLIBS		= \
 		` case "$(GRADE)" in 					\
-		    *.gc*.prof*) echo "-lgc_prof" ;;			\
-		    *.gc*)	echo "-lgc" ;;				\
+		    *.par*.gc*.prof*)	echo "-lpar_gc_prof" ;;		\
+		    *.par*.gc*)		echo "-lpar_gc" ;;		\
+		    *.gc*.prof*)	echo "-lgc_prof" ;;		\
+		    *.gc*)		echo "-lgc" ;;			\
 		  esac							\
 		`
 THREADLIBS	= \
Index: trace/Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/trace/Mmakefile,v
retrieving revision 1.17
diff -u -d -r1.17 Mmakefile
--- trace/Mmakefile	2000/07/18 05:53:14	1.17
+++ trace/Mmakefile	2000/08/17 05:21:40
@@ -80,6 +80,8 @@
 			-L$(RUNTIME_DIR) -L$(BOEHM_GC_DIR)
 LDLIBS		= -l$(BROWSER_LIB_NAME) -l$(STD_LIB_NAME) -l$(RT_LIB_NAME) \
 		` case "$(GRADE)" in 					\
+		    *.par*.gc*.prof*)	echo "-lpar_gc_prof" ;;		\
+		    *.par*.gc*)		echo "-lpar_gc" ;;		\
 		    *.gc*.prof*)	echo "-lgc_prof" ;;		\
 		    *.gc*)		echo "-lgc" ;;			\
 		  esac							\
-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>  |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3        |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------



More information about the developers mailing list