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
Date: Sat, 25 Sep 2004 08:11:00 -0000 [thread overview]
Message-ID: <20040925081040.GR30497@sunsite.ms.mff.cuni.cz> (raw)
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
next reply other threads:[~2004-09-25 8:11 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-09-25 8:11 Jakub Jelinek [this message]
2004-09-25 10:07 ` Roland McGrath
2004-10-01 8:33 ` Thorsten Kukuk
2004-10-01 8:38 ` Jakub Jelinek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20040925081040.GR30497@sunsite.ms.mff.cuni.cz \
--to=jakub@redhat.com \
--cc=drepper@redhat.com \
--cc=libc-hacker@sources.redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).