[m-rev.] trivial diff: fix GC Makefile bugs for dec-osf-alpha*

Fergus Henderson fjh at cs.mu.OZ.AU
Fri Jul 26 15:15:15 AEST 2002


Estimated hours taken: 0.5

boehm_gc/Makefile.am:
boehm_gc/Makefile:
boehm_gc/Makefile.direct:
	Fix bugs in gc6.1alpha5, which broke the build on dec-alpha-osf*.

Workspace: /home/mercury0/public/test_mercury/test_dirs/murlibobo/build.latest.gcc/mercury
Index: boehm_gc/Makefile
===================================================================
RCS file: /home/mercury1/repository/mercury/boehm_gc/Makefile,v
retrieving revision 1.52
diff -u -d -r1.52 Makefile
--- boehm_gc/Makefile	2002/07/25 09:02:44	1.52
+++ boehm_gc/Makefile	2002/07/26 05:05:51
@@ -530,7 +530,7 @@
 	./if_mach MIPS RISCOS $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
 	./if_mach MIPS ULTRIX $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
 	./if_mach POWERPC MACOSX $(AS) -o mach_dep.o $(srcdir)/powerpc_macosx_mach_dep.s
-	./if_mach ALPHA "" $(CC) -c -o mach_dep.o $(srcdir)/alpha_mach_dep.S
+	./if_mach ALPHA LINUX $(CC) -c -o mach_dep.o $(srcdir)/alpha_mach_dep.S
 	./if_mach SPARC SUNOS5 $(CC) -c -o mach_dep.o $(srcdir)/sparc_mach_dep.S
 	./if_mach SPARC SUNOS4 $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
 	./if_mach SPARC OPENBSD $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
Index: boehm_gc/Makefile.am
===================================================================
RCS file: /home/mercury1/repository/mercury/boehm_gc/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -d -r1.1.1.1 Makefile.am
--- boehm_gc/Makefile.am	2002/07/25 05:27:34	1.1.1.1
+++ boehm_gc/Makefile.am	2002/07/26 04:57:26
@@ -35,7 +35,7 @@
 libgc_la_DEPENDENCIES = @addobjs@
 libgc_la_LDFLAGS = -version-info 1:1:0
 
-EXTRA_libgc_la_SOURCES = alpha_mach_dep.s \
+EXTRA_libgc_la_SOURCES = alpha_mach_dep.S \
 mips_sgi_mach_dep.S mips_ultrix_mach_dep.s powerpc_macosx_mach_dep.s \
 rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \
 sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s
Index: boehm_gc/Makefile.direct
===================================================================
RCS file: /home/mercury1/repository/mercury/boehm_gc/Makefile.direct,v
retrieving revision 1.2
diff -u -d -r1.2 Makefile.direct
--- boehm_gc/Makefile.direct	2002/07/25 09:02:45	1.2
+++ boehm_gc/Makefile.direct	2002/07/26 05:07:31
@@ -535,7 +535,7 @@
 	./if_mach MIPS RISCOS $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
 	./if_mach MIPS ULTRIX $(AS) -o mach_dep.o $(srcdir)/mips_ultrix_mach_dep.s
 	./if_mach POWERPC MACOSX $(AS) -o mach_dep.o $(srcdir)/powerpc_macosx_mach_dep.s
-	./if_mach ALPHA "" $(CC) -c -o mach_dep.o $(srcdir)/alpha_mach_dep.S
+	./if_mach ALPHA LINUX $(CC) -c -o mach_dep.o $(srcdir)/alpha_mach_dep.S
 	./if_mach SPARC SUNOS5 $(CC) -c -o mach_dep.o $(srcdir)/sparc_mach_dep.S
 	./if_mach SPARC SUNOS4 $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s
 	./if_mach SPARC OPENBSD $(AS) -o mach_dep.o $(srcdir)/sparc_sunos4_mach_dep.s

-- 
Fergus Henderson <fjh at cs.mu.oz.au>  |  "I have always known that the pursuit
The University of Melbourne         |  of excellence is a lethal habit"
WWW: <http://www.cs.mu.oz.au/~fjh>  |     -- the last words of T. S. Garp.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------



More information about the reviews mailing list