From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <libc-hacker-return-7948-listarch-libc-hacker=sources.redhat.com@sources.redhat.com>
Received: (qmail 18313 invoked by alias); 25 Sep 2004 08:11:06 -0000
Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:libc-hacker-subscribe@sources.redhat.com>
List-Archive: <http://sources.redhat.com/ml/libc-hacker/>
List-Post: <mailto:libc-hacker@sources.redhat.com>
List-Help: <mailto:libc-hacker-help@sources.redhat.com>, <http://sources.redhat.com/ml/#faqs>
Sender: libc-hacker-owner@sources.redhat.com
Received: (qmail 18296 invoked from network); 25 Sep 2004 08:11:06 -0000
Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.15.26)
  by sourceware.org with SMTP; 25 Sep 2004 08:11:06 -0000
Received: from sunsite.ms.mff.cuni.cz (sunsite.mff.cuni.cz [127.0.0.1])
	by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8) with ESMTP id i8P8Ae3j014583;
	Sat, 25 Sep 2004 10:10:40 +0200
Received: (from jakub@localhost)
	by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id i8P8AeGL014581;
	Sat, 25 Sep 2004 10:10:40 +0200
Date: Sat, 25 Sep 2004 08:11:00 -0000
From: Jakub Jelinek <jakub@redhat.com>
To: Ulrich Drepper <drepper@redhat.com>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: [PATCH] Add multiple inclusion guards to useldt.h
Message-ID: <20040925081040.GR30497@sunsite.ms.mff.cuni.cz>
Reply-To: Jakub Jelinek <jakub@redhat.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
X-SW-Source: 2004-09/txt/msg00099.txt.bz2

Hi!

>From reading the code, I believe i686 --with-tls linuxthreads
are now broken.
i686/pt-machine.h includes "../useldt.h", and after change from yesterday
tls.h which includes <pt-machine.h> includes useldt.h unconditionally too.
But this header defines structures.

Untested patch below.

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

	* sysdeps/i386/useldt.h: Avoid multiple inclusion.

--- libc/linuxthreads/sysdeps/i386/useldt.h.jj	2003-04-20 10:23:23.000000000 +0200
+++ libc/linuxthreads/sysdeps/i386/useldt.h	2004-09-25 10:01:47.243988345 +0200
@@ -1,6 +1,6 @@
 /* Special definitions for ix86 machine using segment register based
    thread descriptor.
-   Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>.
 
@@ -19,6 +19,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.	*/
 
+#ifndef __USELDT_H
+#define __USELDT_H 1
+
 #ifndef __ASSEMBLER__
 #include <stddef.h>	/* For offsetof.  */
 #include <stdlib.h>	/* For abort().	 */
@@ -312,3 +315,5 @@ extern int __have_no_set_thread_area;
 /* Maximum size of the stack if the rlimit is unlimited.  */
 #define ARCH_STACK_MAX_SIZE	8*1024*1024
 #endif
+
+#endif

	Jakub