[m-rev.] diff: Remove files for creating debian packages from the Mercury source tree:w.

Paul Bone pbone at csse.unimelb.edu.au
Mon May 3 11:08:45 AEST 2010


Branches: main, 10.04-beta

Removed Debian packaging files from Mercury source repository.  The various
files used to build Debian packages should not be contained in the 'upstream'
program, unless that program is intended for use _only_ on Debian systems.  The
rationale behind this is:
    The packaging and upstream code should be able to be changed independently.
    For example, it should be easy to fix a packing bug for an older version of
    the Mercury without having to worry about branching or tagging in the
    Mercury repository.

    People who aren't necessarily Mercury committers should be able to modify
    the packaging files.

debian/changelog:
debian/control:
debian/copyright:
debian/mercury-doc.docs:
debian/mercury-doc.info:
debian/mercury.dirs:
debian/mercury.install:
debian/mercury.manpages:
debian/rules:
debian/patches/000-make-manpage.diff:
debian/patches/004-boehm-gcconfig-h.diff:
debian/patches/005-boehm-osdep-c.diff:
    As above.

Index: debian/changelog
===================================================================
RCS file: debian/changelog
diff -N debian/changelog
--- debian/changelog	2 Sep 2005 05:28:41 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,75 +0,0 @@
-mercury (0.11.0.rotd.20050831-1) unstable; urgency=low
-
-  * New upstream ROTD.
-  * Added --host=`gcc -dumpmachine` to configure arguments so 32-bit chroot 
-    builds work on 64-bit machines.
-
- -- Peter Hawkins <hawkinsp at cs.mu.OZ.AU>  Thu,  1 Sep 2005 04:41:05 +0000
-
-mercury (0.11.0.rotd.20050707-2) unstable; urgency=low
-
-  * Added hlc.gc.tr and hlc.gc.prof.tr grades. 
-
- -- Peter James HAWKINS <peterh at debian.org>  Wed, 20 Jul 2005 02:19:49 +0000
-
-mercury (0.11.0.rotd.20050707-1) unstable; urgency=low
-
-  * New upstream version. 
-  * Reenabled the deep profiler.
-
- -- Peter Hawkins <peterh at debian.org>  Fri, 17 Jun 2005 11:13:28 +1000
-
-mercury (0.11.0.rotd.20040511-5) unstable; urgency=low
-
-  * Added sparc to the list of architectures that can use asm_fast grades.
-  * Fix configure.in for s390 (previous upload only fixed it for s390x).
-  * Removed hlc.par.gc from the list of grades built on all architectures.
-  * Don't build asm_fast.gc.prof.tr on powerpc. 
-
- -- Peter Hawkins <peterh at debian.org>  Sat, 17 Jul 2004 11:44:55 +1000
-
-mercury (0.11.0.rotd.20040511-4) unstable; urgency=low
-
-  * Added build dependency on autotools-dev and added code to update
-    config.sub and config.guess to debian/rules.
-  * Changed maintainer field in debian/control to peterh at debian.org.
-
- -- Peter Hawkins <peterh at debian.org>  Thu, 15 Jul 2004 22:30:30 +1000
-
-mercury (0.11.0.rotd.20040511-3) unstable; urgency=low
-
-  * Removed subshell invocations from debian/rules so bad builds are caught
-    early.
-  * Changed compiler grade to be hlc.gc since it is more portable (although
-    possibly slower than the LLDS grades on architectures like i386). 
-    Since the source package shipped by upstream has precompiled C
-    files for LLDS grades, we build our own source packages with 
-    precompiled hlc.gc C files.
-  * Non-local gotos don't appear to work on hppa or ia64, so build reg grades
-    instead of asm_fast grades on those architectures. For unknown
-    architectures (eg. arm, s390) we don't have global register support,
-    so build none grades.
-
- -- Peter Hawkins <peter at hawkins.emu.id.au>  Thu, 15 Jul 2004 17:05:11 +1000
-
-mercury (0.11.0.rotd.20040511-2) unstable; urgency=low
-
-  * debian/control, debian/rules: Remove dependency on gcc-3.2 since gcc-3.3
-    works for versions 1:3.3.4-3 and above. (closes: #258660)
-
- -- Peter Hawkins <peter at hawkins.emu.id.au>  Sun, 11 Jul 2004 13:04:30 +1000
-
-mercury (0.11.0.rotd.20040511-1) unstable; urgency=low
-
-  * Updated to upstream unstable ROTD 2004-05-11.
-  * Added asm_fast.gc.prof.tr to the list of grades that are compiled.
-  * Initial upload to unstable. 
-
- -- Peter Hawkins <peter at hawkins.emu.id.au>  Thu,  1 Jul 2004 19:28:00 +1000
-
-mercury (0.11.0.rotd.20040327-1) unstable; urgency=low
-
-  * Initial Release.
-
- -- Peter Hawkins <peter at hawkins.emu.id.au>  Mon,  5 Apr 2004 19:51:58 +1000
-
Index: debian/control
===================================================================
RCS file: debian/control
diff -N debian/control
--- debian/control	2 Sep 2005 05:28:42 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,37 +0,0 @@
-Source: mercury
-Section: devel
-Priority: optional
-Maintainer: Peter Hawkins <peterh at debian.org>
-Build-Depends: debhelper (>= 4.0.0), autotools-dev, libreadline5-dev
-Standards-Version: 3.6.1
-
-Package: mercury
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, make
-Conflicts: mmake
-Description: A new logic/functional programming language 
- Mercury is a new logic/functional programming language, which combines
- the clarity and expressiveness of declarative programming with advanced
- static analysis and error detection features.  Its highly optimized
- execution algorithm delivers efficiency far in excess of existing logic
- programming systems, and close to conventional programming
- systems. Mercury addresses the problems of large-scale program
- development, allowing modularity, separate compilation, and numerous
- optimization/time trade-offs.
- .
- This package contains all the files required for developing programs
- in the Mercury language.
-
-Package: mercury-doc
-Architecture: all
-Description: Documentation for mercury
- Mercury is a new logic/functional programming language, which combines
- the clarity and expressiveness of declarative programming with advanced
- static analysis and error detection features.  Its highly optimized
- execution algorithm delivers efficiency far in excess of existing logic
- programming systems, and close to conventional programming
- systems. Mercury addresses the problems of large-scale program
- development, allowing modularity, separate compilation, and numerous
- optimization/time trade-offs.
- .
- This package contains the documentation for the Mercury compiler.
Index: debian/copyright
===================================================================
RCS file: debian/copyright
diff -N debian/copyright
--- debian/copyright	2 Sep 2005 05:28:42 -0000	1.5
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,67 +0,0 @@
-This package was debianized by Peter Hawkins <peter at hawkins.emu.id.au> on
-Mon,  5 Apr 2004 19:51:58 +1000.
-
-It was downloaded from http://www.cs.mu.oz.au/mercury/
-
-Upstream Authors: Mercury research group, University of Melbourne. 
-
-Copyright:
-
-This directory contains the source distribution for the University of Melbourne
-Mercury compiler, version rotd-2004-03-23.
-
-        The Mercury implementation is free software, but it is Copyright
-        (C) 1993-2003 The University of Melbourne.  It is distributed
-        under the terms of the GNU General Public License.  See the file
-        COPYING for copying permission.
-
-        The Mercury library and runtime (the files in the library and
-        runtime subdirectories) are distributed under the terms of the
-        GNU Library General Public License.  
-        
-        On Debian GNU/Linux systems, the complete text of the GNU Library
-        General Public License can be found in
-        `/usr/share/common-licenses/LGPL'.
-
-        If those licencing arrangements are not satisfactory, please
-        contact us!  We are willing to offer alternative arrangements,
-        if the need should arise.
-
-The subdirectory `boehm_gc' contains a slightly modified copy of
-the conservative garbage collector distributed by Hans Boehm:
-
-        Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
-        Copyright (c) 1991-1995 by Xerox Corporation.  All rights reserved.
-        Copyright (c) 1996-1999 by Silicon Graphics.  All rights reserved.
-        Copyright (c) 1999 by Hewlett-Packard Company. All rights reserved.
-
-        THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY
-        EXPRESSED OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
-
-        Permission is hereby granted to use or copy this program for any
-        purpose, provided the above notices are retained on all copies.
-        Permission to modify the code and to distribute modified code is
-        granted, provided the above notices are retained, and a notice
-        that the code was modified is included with the above copyright
-        notice.
-
-A few files (config.guess, config.sub) are derived from code that is
-copyright by the Free Software Foundation, Inc, and are distributed
-under the GNU General Public License version 2.
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License version 2 can be found in `/usr/share/common-licenses/GPL'.
-
-The program `texi2html' in the `doc' directory is copyright by CERN
-and is distributed under the GNU General Public
-License version 2:
-
-        This program is the intellectual property of the European
-        Laboratory for Particle Physics (known as CERN).  No guarantee
-        whatsoever is provided by CERN.  No liability whatsoever is
-        accepted for any loss or damage of any kind resulting from any
-        defect or inaccuracy in this information or code.
-
-The files in the `samples' directory are either public domain, or
-distributed under the GNU General Public License.
-
Index: debian/mercury-doc.docs
===================================================================
RCS file: debian/mercury-doc.docs
diff -N debian/mercury-doc.docs
--- debian/mercury-doc.docs	2 Sep 2005 05:28:42 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-debian/tmp/usr/lib/mercury/doc
-debian/tmp/usr/lib/mercury/html
Index: debian/mercury-doc.info
===================================================================
RCS file: debian/mercury-doc.info
diff -N debian/mercury-doc.info
--- debian/mercury-doc.info	2 Sep 2005 05:28:42 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-debian/tmp/usr/info/*
Index: debian/mercury.dirs
===================================================================
RCS file: debian/mercury.dirs
diff -N debian/mercury.dirs
--- debian/mercury.dirs	2 Sep 2005 05:28:42 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-usr/share/doc/mercury
Index: debian/mercury.install
===================================================================
RCS file: debian/mercury.install
diff -N debian/mercury.install
--- debian/mercury.install	2 Sep 2005 05:28:42 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-debian/tmp/usr/lib/mercury/bin
-debian/tmp/usr/lib/mercury/conf
-debian/tmp/usr/lib/mercury/elisp
-debian/tmp/usr/lib/mercury/inc
-debian/tmp/usr/lib/mercury/ints
-debian/tmp/usr/lib/mercury/lib
-debian/tmp/usr/lib/mercury/mdb
-debian/tmp/usr/lib/mercury/mmake
-debian/tmp/usr/lib/mercury/modules
-debian/tmp/usr/bin/mmake
-debian/tmp/usr/bin/mmc
-debian/tmp/usr/bin/mdb
-debian/tmp/usr/bin/c2init
-debian/tmp/usr/bin/mgnuc
-debian/tmp/usr/bin/ml
-debian/tmp/usr/bin/mprof
-debian/tmp/usr/bin/mprof_merge_runs
-debian/tmp/usr/bin/mtags
-debian/tmp/usr/bin/mercury_update_interface
-debian/tmp/usr/bin/mercury_config
-debian/tmp/usr/bin/mkinit
-debian/tmp/usr/bin/mdemangle
-debian/tmp/usr/bin/vpath_find
Index: debian/mercury.manpages
===================================================================
RCS file: debian/mercury.manpages
diff -N debian/mercury.manpages
--- debian/mercury.manpages	2 Sep 2005 05:28:42 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,10 +0,0 @@
-debian/tmp/usr/man/man1/c2init.1
-debian/tmp/usr/man/man1/mdb.1
-debian/tmp/usr/man/man1/mercury_config.1
-debian/tmp/usr/man/man1/mgnuc.1
-debian/tmp/usr/man/man1/ml.1
-debian/tmp/usr/man/man1/mmake.1
-debian/tmp/usr/man/man1/mmc.1
-debian/tmp/usr/man/man1/mprof.1
-debian/tmp/usr/man/man1/mprof_merge_runs.1
-debian/tmp/usr/man/man1/mtags.1
Index: debian/rules
===================================================================
RCS file: debian/rules
diff -N debian/rules
--- debian/rules	25 Oct 2005 10:17:27 -0000	1.7
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,177 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# debian/rules for the Mercury compiler
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Changes: Peter Hawkins (public domain)
-#
-#
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export DH_COMPAT=3
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-# We really need this to be 'gcc', not 'cc'
-CC=gcc
-MACHINE=`$(CC) -dumpmachine`
-
-GRADES_COMMON=hlc.gc
-ifneq ($(findstring $(DEB_HOST_ARCH),i386 amd64 powerpc alpha m68k mips sparc),)
-	ifneq ($(findstring $(DEB_HOST_ARCH),powerpc),)
-		# For some reason asm_fast.gc.prof.tr doesn't build correctly
-		# on powerpc
-		GRADES=$(GRADES_COMMON),asm_fast.gc,asm_fast.gc.prof,asm_fast.gc.memprof,asm_fast.gc.tr,asm_fast.gc.tr.debug,hlc.gc.prof.tr
-	else
-		GRADES=$(GRADES_COMMON),asm_fast.gc,asm_fast.gc.prof,asm_fast.gc.memprof,asm_fast.gc.tr,asm_fast.gc.tr.debug,asm_fast.gc.prof.tr,asm_fast.gc.profdeep,asm_fast.gc.profdeep.tr,hlc.gc.tr,hlc.gc.prof.tr
-	endif
-else
-	ifneq ($(findstring $(DEB_HOST_ARCH),ia64 hppa),)
-		GRADES+=$(GRADES_COMMON),reg.gc,reg.gc.prof,reg.gc.memprof,reg.gc.tr,reg.gc.tr.debug,reg.gc.prof.tr
-	else
-		# arm, mipsel, s390
-		GRADES+=$(GRADES_COMMON),none.gc,hlc.gc.prof,hlc.gc.memprof,hlc.gc.tr,none.gc.tr.debug,hlc.gc.prof.tr
-	endif
-endif
-	
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-
-	(cd build ; \
-	tar zxvf ../upstream/mercury-compiler-*.tar.gz ; \
-	mv mercury-compiler-* mercury ; \
-	)
-	cp /usr/share/misc/config.sub /usr/share/misc/config.guess build/mercury/
-
-	# Apply Debian specific patches
-	if test ! -f patch-stamp; then \
-            for patch in $(CURDIR)/debian/patches/*.diff ; do\
-            	echo APPLYING PATCH\: $${patch##*/};\
-                (cd build ; patch -p0 < $$patch) ;\
-            done ;\
-            touch patch-stamp ;\
-    fi
-	echo "Building grades: $(GRADES)"
-
-	# Create the cgi-bin directory or the configure script barfs.
-	mkdir -p debian/tmp/usr/lib/cgi-bin
-
-	cd build/mercury && \
-	CC="$(CC)" BOOTSTRAP_MC="/nonexistent" ./configure --host=$(MACHINE) --prefix=/usr --enable-deep-profiler=$(CURDIR)/debian/tmp/usr/lib/cgi-bin --enable-libgrades=$(GRADES)
-	
-	touch configure-stamp
-
-
-#Architecture 
-build: build-stamp
-build-stamp: configure-stamp 
-
-	(cd build/mercury ; $(MAKE) $(PMAKEFLAGS) )
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp configure-stamp install-stamp patch-stamp
-
-	rm -rf build/*
-
-	dh_clean 
-
-install: install-stamp
-
-install-stamp:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs -A
-
-	cd build/mercury && \
-	  CC="$(CC)" \
-	  MERCURY_COMPILER="$(CURDIR)/debian/tmp/usr/bin/mercury_compile" \
-	  $(MAKE) install INSTALL_PREFIX=$(CURDIR)/debian/tmp/usr $(MAKEFLAGS) 
-
-	cp build/mercury/README build/mercury/README.DotNet \
-	   build/mercury/README.Java build/mercury/README.Linux* \
-	   build/mercury/README.gcc-backend build/mercury/RELEASE_NOTES \
-	   build/mercury/BUGS build/mercury/HISTORY \
-	   build/mercury/LIMITATIONS \
-	   build/mercury/NEWS build/mercury/TODO \
-	   build/mercury/WORK_IN_PROGRESS debian/mercury/usr/share/doc/mercury/
-
-	touch install-stamp
-	
-# Build architecture independant packages using the common target.
-binary-indep: build install
-	dh_testdir
-	dh_testroot 
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_install -i
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate	
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-	dh_installinfo -i
-	dh_installman -i
-	dh_link -i
-	dh_compress  -i
-	dh_fixperms -i
-#	dh_perl
-#	dh_python
-	dh_makeshlibs -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
-
-# Build architecture dependent packages using the common target.
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_install -a
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate	
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installcron
-	dh_installinfo -a
-	dh_installman -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a 
-	dh_fixperms -a
-#	dh_perl
-#	dh_python
-	dh_makeshlibs -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary binary install configure
Index: debian/patches/000-make-manpage.diff
===================================================================
RCS file: debian/patches/000-make-manpage.diff
diff -N debian/patches/000-make-manpage.diff
--- debian/patches/000-make-manpage.diff	2 Sep 2005 05:28:57 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
---- mercury/doc/make_manpage	Thu Oct 10 20:43:32 2002
-+++ mercury/doc/make_manpage	Mon Jun  7 20:38:01 2004
-@@ -65,6 +65,8 @@
- rm -f /tmp/make_manpage$$
- uppername="$name"
- 
-+summary="`echo \"$manpage\" | head -n 1 | cut -d ',' -f 1`"
-+
- if echo "$manpage" | grep '^.SH "ARGUMENTS' > /dev/null; then
- 	first_half="`echo \"$manpage\" | sed '/^.SH \"ARGUMENTS *\"/,$d'`"
- 	last_half="`echo \"$manpage\" | sed -n '/^.SH \"ARGUMENTS *\"/,$p'`"
-@@ -83,6 +85,9 @@
- .fi
- ..
- .TH $uppername 1 "`date`" "" "Mercury Programmer's Manual"
-+.SH NAME
-+$uppername \- $summary
-+.SH VERSION
- .AT 3
- .Vb 2
- $first_half
Index: debian/patches/004-boehm-gcconfig-h.diff
===================================================================
RCS file: debian/patches/004-boehm-gcconfig-h.diff
diff -N debian/patches/004-boehm-gcconfig-h.diff
--- debian/patches/004-boehm-gcconfig-h.diff	2 Sep 2005 05:28:57 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,17 +0,0 @@
---- mercury/boehm_gc/include/private/gcconfig.h	2003-10-28 19:48:43.000000000 +1100
-+++ mercury/boehm_gc/include/private/gcconfig.h	2005-08-26 15:31:40.438114698 +1000
-@@ -1818,10 +1818,10 @@
- 	     extern int etext[];
- #            define DATASTART ((ptr_t)((((word) (etext)) + 0xfff) & ~0xfff))
- #       endif
--#	define PREFETCH(x) \
--	  __asm__ __volatile__ ("	prefetch	%0": : "m"(*(char *)(x)))
--#	define PREFETCH_FOR_WRITE(x) \
--	  __asm__ __volatile__ ("	prefetchw	%0": : "m"(*(char *)(x)))
-+#       if defined(__GNUC__) && __GNUC >= 3
-+#           define PREFETCH(x) __builtin_prefetch((x), 0, 0)
-+#           define PREFETCH_FOR_WRITE(x) __builtin_prefetch((x), 1)
-+#       endif
- #   endif
- # endif
- 
Index: debian/patches/005-boehm-osdep-c.diff
===================================================================
RCS file: debian/patches/005-boehm-osdep-c.diff
diff -N debian/patches/005-boehm-osdep-c.diff
--- debian/patches/005-boehm-osdep-c.diff	2 Sep 2005 05:28:58 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
---- mercury/boehm_gc/os_dep.c	2003-11-04 17:34:59.000000000 +1100
-+++ mercury/boehm_gc/os_dep.c	2005-08-26 15:36:37.941606021 +1000
-@@ -2251,7 +2251,7 @@
- #   if defined(ALPHA) || defined(M68K)
-       typedef void (* REAL_SIG_PF)(int, int, s_c *);
- #   else
--#     if defined(IA64) || defined(HP_PA)
-+#     if defined(IA64) || defined(HP_PA) || defined(X86_64)
-         typedef void (* REAL_SIG_PF)(int, siginfo_t *, s_c *);
- #     else
-         typedef void (* REAL_SIG_PF)(int, s_c);
-@@ -2365,7 +2365,7 @@
- #   if defined(ALPHA) || defined(M68K)
-       void GC_write_fault_handler(int sig, int code, s_c * sc)
- #   else
--#     if defined(IA64) || defined(HP_PA)
-+#     if defined(IA64) || defined(HP_PA) || defined(X86_64)
-         void GC_write_fault_handler(int sig, siginfo_t * si, s_c * scp)
- #     else
- #       if defined(ARM32)
-@@ -2426,7 +2426,7 @@
- 	char * addr = (char *) (scp -> si_addr);
- #   endif
- #   ifdef LINUX
--#     if defined(I386) || defined (X86_64)
-+#     if defined(I386)
- 	char * addr = (char *) (sc.cr2);
- #     else
- #	if defined(M68K)
-@@ -2461,7 +2461,7 @@
- #	  ifdef ALPHA
-             char * addr = get_fault_addr(sc);
- #	  else
--#	    if defined(IA64) || defined(HP_PA)
-+#	    if defined(IA64) || defined(HP_PA) || defined(X86_64)
- 	      char * addr = si -> si_addr;
- 	      /* I believe this is claimed to work on all platforms for	*/
- 	      /* Linux 2.3.47 and later.  Hopefully we don't have to	*/
-@@ -2532,7 +2532,7 @@
- #		    if defined(ALPHA) || defined(M68K)
- 		        (*(REAL_SIG_PF)old_handler) (sig, code, sc);
- #		    else 
--#		      if defined(IA64) || defined(HP_PA)
-+#		      if defined(IA64) || defined(HP_PA) || defined(X86_64)
- 		        (*(REAL_SIG_PF)old_handler) (sig, si, scp);
- #		      else
- 		        (*(REAL_SIG_PF)old_handler) (sig, sc);
-@@ -2626,7 +2626,8 @@
-       struct sigaction	act, oldact;
-       /* We should probably specify SA_SIGINFO for Linux, and handle 	*/
-       /* the different architectures more uniformly.			*/
--#     if defined(IRIX5) || defined(LINUX) || defined(OSF1) || defined(HURD)
-+#     if defined(IRIX5) || defined(LINUX) && !defined(X86_64) \
-+      	|| defined(OSF1) || defined(HURD)
-     	act.sa_flags	= SA_RESTART;
-         act.sa_handler  = (SIG_PF)GC_write_fault_handler;
- #     else
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 489 bytes
Desc: Digital signature
URL: <http://lists.mercurylang.org/archives/reviews/attachments/20100503/f24d0168/attachment.sig>


More information about the reviews mailing list