Re: Fix building with linuxthreads/--without-__thread on ia64

[Jakub Jelinek <jakub@redhat.com>]

On Thu, Aug 12, 2004 at 10:44:37PM -0700, Ulrich Drepper wrote:
> Applied.

This is not enough.
I have
http://sources.redhat.com/ml/libc-hacker/2004-08/msg00015.html
and
http://sources.redhat.com/ml/libc-hacker/2004-08/msg00022.html
in my tree to cure this problem instead.

If __res_initstamp is moved to res-init.c instead, still the
msg00022.html patch needs to be applied (though it doesn't apply
cleanly, so I'm attaching a new one):

2004-08-09  Jakub Jelinek  <jakub@redhat.com>

	* libc-tsd.c: Move resolv.h include before the #if.
	(__res_maybe_init): New function.  Add libc_hidden_def.

--- libc/linuxthreads/libc-tsd.c.jj	2004-08-13 09:10:49.000000000 +0200
+++ libc/linuxthreads/libc-tsd.c	2004-08-13 09:11:55.416058909 +0200
@@ -1,5 +1,5 @@
 /* Special hack used to build link-time libc.so object for linking libpthread.
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004 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
@@ -18,13 +18,13 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <tls.h>
+#include <resolv.h>
 
 #if ! USE___THREAD
 
 /* Special hack used to build link-time libc.so object for linking libpthread.
    See Makefile comments near libc_pic_lite.os rule for what this is for.  */
 
-# include <resolv.h>
 # undef _res
 
 int _errno;
@@ -32,3 +32,10 @@ int _h_errno;
 struct __res_state _res;
 
 #endif
+
+int
+__res_maybe_init (res_state resp, int preinit)
+{
+  return -1;
+}
+libc_hidden_def (__res_maybe_init)


	Jakub