[m-rev.] diff: upgrade to gc6.2alpha4

[Peter Ross]

On Wed, May 07, 2003 at 10:56:40PM +1000, Fergus Henderson wrote:
> On 06-May-2003, Peter Ross <pro at missioncriticalit.com> wrote:
> > The update is now complete.  There were no significant merging issues,
> > only repository issues, in the merge.  The diff is quite large and can
> > be seen at ~petdr/zzreview.gc62 if anyone is interested.
> 
> What I'd ideally like to see is the interdiff between
> (a) the diff between the main branch and the gc branch before you started
> and
> (b) the diff between the main branch and the gc branch after the merge.
> 
I tried to construct this diff, but have been unable to.

However I do remember all the conflicts I had to resolve.

In Makefile and Makefile.dj I had to merge in the addition of 
$(srcdir)/include/gc_config_macros.h to the rule for building the object
files.

Im Makefile.am I had to resolve a conflict around the lines

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 gc_cpp.cc

EXTRA_DIST += alpha_mach_dep.S mips_sgi_mach_dep.S sparc_mach_dep.S

where EXTRA_libgc_la_SOURCES changed its indentation.

Finally I had to fix include/gc.h, to replace all the backwards
compatability macros with #include "gc_config_macros.h", which is where
the macros now reside.

That was it.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------