[m-rev.] diff: upgrade to boehm gc 7.2

[Peter Ross]

On Wed, Jul 18, 2012 at 05:55:11PM +1000, Julien Fischer wrote:
> 
> 
> On Mon, 16 Jul 2012, Peter Ross wrote:
> 
> >Please find attached the interesting bits (ie those bits where I had to resolve
> >a non-obvious conflict) of the diff to upgrade to version 7.2 of the boehm gc
> >collector.
> >
> >The full diff can be found at uranus:~petdr/DIFF.GC72
> >
> >This change successfully bootchecked in the asm_fast.gc and hlc.gc grades.
> >I also installed the resulting compiler in the asm_fast.gc and hlc.gc grades
> >and then built some test programs in those grades, on my local machine.
> >
> >So far this has only been tested extensively on linux.
> >
> >Julien, can you test on Mac OS X and Windows?
> >
> >I will do the test on Solaris 10.
> 
> One thing I have noticed is that it looks like
> scripts/prepare_install_dir.in is trying to copy over things from the
> boehm_gc directory that no longer exist, e.g.
> boehm_gc/configure_atomic_ops.sh.
> 

===================================================================


Estimated hours taken: 0.5
Branches: main

scripts/prepare_install_dir.in:
	No longer copy configure_atomic_ops.sh as this file no longer exists.
	Also remove the .o and .a files from libatomic_ops/src directory,
	like we do for libatomic_ops-[0-9]*.

Index: scripts/prepare_install_dir.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/prepare_install_dir.in,v
retrieving revision 1.5
diff -u -r1.5 prepare_install_dir.in
--- scripts/prepare_install_dir.in	19 Dec 2010 13:44:35 -0000	1.5
+++ scripts/prepare_install_dir.in	18 Jul 2012 08:59:31 -0000
@@ -53,13 +53,14 @@
 cp boehm_gc/cord/*.[ch] ${installdir}/boehm_gc/cord
 cp boehm_gc/include/*.[ch] ${installdir}/boehm_gc/include
 cp boehm_gc/include/private/*.[ch] ${installdir}/boehm_gc/include/private
-cp boehm_gc/configure_atomic_ops.sh ${installdir}/boehm_gc
 cp boehm_gc/build_atomic_ops.sh* ${installdir}/boehm_gc
 cp -Rp boehm_gc/libatomic_ops-*[0-9] ${installdir}/boehm_gc
 cp -Rp boehm_gc/libatomic_ops ${installdir}/boehm_gc
 cp -Rp boehm_gc/extra ${installdir}/boehm_gc
 rm -fr ${installdir}/boehm_gc/libatomic_ops-*[0-9]/src/*.o
 rm -fr ${installdir}/boehm_gc/libatomic_ops-*[0-9]/src/*.a
+rm -fr ${installdir}/boehm_gc/libatomic_ops/src/*.o
+rm -fr ${installdir}/boehm_gc/libatomic_ops/src/*.a
 mkdir ${installdir}/runtime
 mkdir ${installdir}/runtime/machdeps
 cp runtime/Mmake* ${installdir}/runtime

--------------------------------------------------------------------------
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
--------------------------------------------------------------------------