* sysdeps/generic/dl-lookupcfg.h: Include <tls.h>.

	* sysdeps/sh/dl-lookupcfg.h: File removed.
	* sysdeps/i386/dl-lookupcfg.h: File removed.

4 files changed, 7 insertions, 56 deletions

diff --git a/ChangeLog b/ChangeLog
index c60eceea4f..d335df9885 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-10-11  Roland McGrath  <roland@redhat.com>
 
+	* sysdeps/generic/dl-lookupcfg.h: Include <tls.h>.
+	* sysdeps/sh/dl-lookupcfg.h: File removed.
+	* sysdeps/i386/dl-lookupcfg.h: File removed.
+
 	* sysdeps/unix/sysv/linux/x86_64/sysdep.h (SYSCALL_ERROR_HANDLER): Add
 	missing labels and ; from last change.
 
diff --git a/sysdeps/generic/dl-lookupcfg.h b/sysdeps/generic/dl-lookupcfg.h
index 76c803dcb1..f48cb0a844 100644
--- a/sysdeps/generic/dl-lookupcfg.h
+++ b/sysdeps/generic/dl-lookupcfg.h
@@ -22,6 +22,9 @@
 
    However, because of how _dl_sym and _dl_tls_symaddr are written, every
    platform needs it when we support TLS.  */
+
+#include <tls.h>		/* Defines USE_TLS (or doesn't).  */
+
 #ifdef USE_TLS
 # define DL_LOOKUP_RETURNS_MAP
 #else
diff --git a/sysdeps/i386/dl-lookupcfg.h b/sysdeps/i386/dl-lookupcfg.h
deleted file mode 100644
index 8daf7a8a75..0000000000
--- a/sysdeps/i386/dl-lookupcfg.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Configuration of lookup functions.  i386 version.
-   Copyright (C) 2000, 2002 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
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <tls.h>
-
-/* Some platforms need more information from the symbol lookup function
-   than just the address.  For x86 we need it when we support TLS.  */
-#ifdef USE_TLS
-# define DL_LOOKUP_RETURNS_MAP
-#else
-# undef DL_LOOKUP_RETURNS_MAP
-#endif
diff --git a/sysdeps/sh/dl-lookupcfg.h b/sysdeps/sh/dl-lookupcfg.h
deleted file mode 100644
index 14511473cb..0000000000
--- a/sysdeps/sh/dl-lookupcfg.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Configuration of lookup functions.  SH version.
-   Copyright (C) 2000, 2002 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
-   modify it under the terms of the GNU Lesser General Public
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
-
-#include <tls.h>
-
-/* Some platforms need more information from the symbol lookup function
-   than just the address.  For SH we need it when we support TLS.  */
-#ifdef USE_TLS
-# define DL_LOOKUP_RETURNS_MAP
-#else
-# undef DL_LOOKUP_RETURNS_MAP
-#endif