Index: sysdeps/mach/hurd/dl-sysdep.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/dl-sysdep.c,v
retrieving revision 1.78
diff -u -p -r1.78 dl-sysdep.c
--- sysdeps/mach/hurd/dl-sysdep.c	6 Sep 2004 21:31:38 -0000	1.78
+++ sysdeps/mach/hurd/dl-sysdep.c	18 Sep 2005 13:34:50 -0000
@@ -1,5 +1,5 @@
 /* Operating system support for run-time dynamic linker.  Hurd version.
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004,2005
 	Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
@@ -63,8 +63,10 @@ hp_timing_t _dl_cpuclock_offset;
 struct hurd_startup_data *_dl_hurd_data;
 
 /* This is used only within ld.so, via dl-minimal.c's __errno_location.  */
+#ifndef USE___THREAD
 #undef errno
 int errno attribute_hidden;
+#endif
 
 /* Defining these variables here avoids the inclusion of hurdsig.c.  */
 unsigned long int __hurd_sigthread_stack_base;
Index: sysdeps/mach/hurd/fork.c
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/fork.c,v
retrieving revision 1.56
diff -u -p -r1.56 fork.c
--- sysdeps/mach/hurd/fork.c	27 Oct 2004 07:47:10 -0000	1.56
+++ sysdeps/mach/hurd/fork.c	18 Sep 2005 13:34:51 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994,95,96,97,99,2001,02, 04 Free Software Foundation, Inc.
+/* Copyright (C) 1994,95,96,97,99,2001,02, 04, 05 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -537,7 +537,7 @@ __fork (void)
 	LOSE;
 #endif
 
-      if (err = __thread_set_state (thread, MACHINE_THREAD_STATE_FLAVOR,
+      if (err = __thread_set_state (thread, i386_REGS_SEGS_STATE,
 				    (natural_t *) &state, statecount))
 	LOSE;
 
