Bug#369690: gcc-4.1: FTBFS on hurd-i386: hurd-changes.dpatch needs updating

[Michael Banck <mbanck@debian.org>]

Package: gcc-4.1
Version: 4.1.0-4
Severity: important
Tags: patch

Hi,

this is the failure:

|patching file gcc/ada/adaint.c
|Hunk #1 FAILED at 261.
|1 out of 1 hunk FAILED -- saving rejects to file gcc/ada/adaint.c.rej

this is the second one:

|/build/buildd/gcc-4.1-4.1.0/build/./gcc/xgcc
|-B/build/buildd/gcc-4.1-4.1.0/build/./gcc/ -B/usr/i486-gnu/bin/
|-B/usr/i486-gnu/lib/ -isystem /usr/i486-gnu/include -isystem
|/usr/i486-gnu/sys-include -DHAVE_CONFIG_H -I. -I../../../src/libgfortran
|-I. -iquote../../../src/libgfortran/io -I../../../src/libgfortran/../gcc
|-I../../../src/libgfortran/../gcc/config -I../.././gcc -D_GNU_SOURCE
|-std=gnu99 -Wall -Wstrict-prototypes -Wmissing-prototypes
|-Wold-style-definition -Wextra -Wwrite-strings -O2 -g -O2 -c
|../../../src/libgfortran/intrinsics/chdir.c  -fPIC -DPIC -o
|.libs/chdir.o
[...]
|../../../src/libgfortran/intrinsics/chdir.c:73: error:
|'_gfortran_chdir_i4_sub' aliased to undefined symbol
|'_gfortrani_chdir_i4_sub'
|../../../src/libgfortran/intrinsics/chdir.c:98: error:
|'_gfortran_chdir_i8_sub' aliased to undefined symbol
|'_gfortrani_chdir_i8_sub'
|make[6]: *** [chdir.lo] Error 1
|make[6]: Leaving directory
|`/build/buildd/gcc-4.1-4.1.0/build/i486-gnu/libgfortran'

We were finally able to trace back why gfortran-4.1 did not compile
anymore, the #pragma weaks are no longer needed as this got fixed in
libpthread upstream.

Patch attached, I checked it patches fine with that, and Thomas Schwinge
made a successful cross-compiled test build.  We hope gcc-4.1 is now
working for hurd-i386.


cheers,

Michael

-- 
Michael Banck
Debian Developer
mbanck@debian.org
http://www.advogato.org/person/mbanck/diary.html

--- debian/patches/hurd-changes.dpatch.orig	2006-05-31 14:43:11.000000000 +0200
+++ debian/patches/hurd-changes.dpatch	2006-05-31 14:45:15.000000000 +0200
@@ -27,8 +27,6 @@
 # DP: upstream.
 # DP: 
 # DP: Define MAXPATHLEN and PATH_MAX.
-# DP:
-# DP: Add some #pragma weak for _pthread_* functions.
 
 --- gcc/config/gnu.h.orig	2005-06-22 13:23:24.000000000 +0200
 +++ gcc/config/gnu.h	2005-06-22 13:24:18.000000000 +0200
@@ -62,25 +60,9 @@
  /* Defined in the automatically-generated underscore.c.  */
  extern int prepends_underscore;
  
---- gcc/gthr-posix.h.orig	2005-07-19 13:58:06.000000000 +0200
-+++ gcc/gthr-posix.h	2005-07-23 17:28:14.000000000 +0200
-@@ -40,6 +40,13 @@
- #define _REENTRANT 1
- #endif
- 
-+#pragma weak _pthread_mutex_lock
-+#pragma weak _pthread_mutex_trylock
-+#pragma weak _pthread_mutex_unlock
-+
-+#pragma weak _pthread_mutex_init
-+#pragma weak _pthread_mutex_destroy
-+
- #include <pthread.h>
- #include <unistd.h>
- 
---- gcc/ada/adaint.c.orig	2005-08-01 23:10:02.000000000 +0200
-+++ gcc/ada/adaint.c	2005-08-01 23:11:10.000000000 +0200
-@@ -261,6 +261,10 @@
+--- gcc/ada/adaint.c.orig       2006-05-29 17:43:55.000000000 +0200
++++ gcc/ada/adaint.c    2006-05-29 17:54:32.000000000 +0200
+@@ -272,6 +272,10 @@
  #include <sys/param.h>
  #endif
  
@@ -88,6 +70,6 @@
 +#define MAXPATHLEN 4096
 +#endif
 +
+ #ifdef MAXPATHLEN
  #define GNAT_MAX_PATH_LEN MAXPATHLEN
- 
- #endif
+ #else