On Sun, Jul 15, 2007 at 07:34:20AM -0400, Michael Casadevall wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
The GPG seems to have garbled the patch somewhat. Here is patch against
the Debian package, introducing a new dpatch, is this fine?
Michael
diff -u gcc-4.1-4.1.2/debian/rules.patch gcc-4.1-4.1.2/debian/rules.patch
--- gcc-4.1-4.1.2/debian/rules.patch
+++ gcc-4.1-4.1.2/debian/rules.patch
@@ -165,7 +165,7 @@
endif
ifeq ($(DEB_TARGET_ARCH_OS),hurd)
- debian_patches += hurd-changes hurd-fast-math
+ debian_patches += hurd-changes hurd-fast-math hurd-profiling
endif
ifeq ($(DEB_TARGET_ARCH),alpha)
--- gcc-4.1-4.1.2.orig/debian/patches/hurd-profiling.dpatch
+++ gcc-4.1-4.1.2/debian/patches/hurd-profiling.dpatch
@@ -0,0 +1,38 @@
+#! /bin/sh -e
+
+# DP: Fix profiling on hurd-i386.
+
+dir=
+if [ $# -eq 3 -a "$2" = '-d' ]; then
+ pdir="-d $3"
+ dir="$3/"
+elif [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+case "$1" in
+ -patch)
+ patch $pdir -f --no-backup-if-mismatch -p0 < $0
+ ;;
+ -unpatch)
+ patch $pdir -f --no-backup-if-mismatch -R -p0 < $0
+ ;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+esac
+exit 0
+
+--- gcc/config/i386/gnu.h.orig 2007-07-18 21:51:25.000000000 +0200
++++ gcc/config/i386/gnu.h 2007-07-18 21:52:18.000000000 +0200
+@@ -34,8 +34,8 @@
+ #define STARTFILE_SPEC \
+ "%{!shared: \
+ %{!static: \
+- %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} %{!p:crt1.o%s}}} \
+- %{static:crt0.o%s}} \
++ %{pg:gcrt0.o%s} %{!pg:%{p:gcrt0.o%s} %{!p:crt1.o%s}}} \
++ %{static: %{pg:gcrt0.o%s} %{!pg:{%p:gcrt0}} %{!p:crt0.o%s}}} \
+ crti.o%s %{static:crtbeginT.o%s}\
+ %{!static:%{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}"
+
