public inbox for libc-hacker@sourceware.org
 help / color / mirror / Atom feed
From: Jakub Jelinek <jakub@redhat.com>
To: Thorsten Kukuk <kukuk@suse.de>
Cc: Glibc hackers <libc-hacker@sources.redhat.com>
Subject: Re: [PATCH] Add multiple inclusion guards to useldt.h
Date: Fri, 01 Oct 2004 08:38:00 -0000	[thread overview]
Message-ID: <20041001083810.GX30497@sunsite.ms.mff.cuni.cz> (raw)
In-Reply-To: <20041001083338.GA16316@suse.de>

On Fri, Oct 01, 2004 at 10:33:39AM +0200, Thorsten Kukuk wrote:
> On Sat, Sep 25, Jakub Jelinek wrote:
> 
> > Hi!
> > 
> > >From reading the code, I believe i686 --with-tls linuxthreads
> > are now broken.
> 
> It is still broken for me using --with-tls --without-__thread.
> 
> All thread test cases will be killed.

I know, I'm using following patch ATM, but didn't have time to figure
out why exactly current CVS doesn't work, which would be good to understand
so that it can be fixed for real.

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

	* sysdeps/i386/tls.h: Only include useldt.h if THREAD_SELF
	is not defined.
	* sysdeps/i386/i686/pt-machine.h: Revert last change.

--- libc/linuxthreads/sysdeps/i386/tls.h	25 Sep 2004 03:32:13 -0000	1.36
+++ libc/linuxthreads/sysdeps/i386/tls.h	26 Sep 2004 08:45:21 -0000	1.35.2.3
@@ -113,7 +113,9 @@ typedef struct
 #   define TLS_LOAD_EBX
 #  endif
 
-#  include "useldt.h"		/* For the structure.  */
+#  ifndef THREAD_SELF
+#   include "useldt.h"		/* For the structure.  */
+#  endif
 #  if __ASSUME_LDT_WORKS > 0
 #   define TLS_DO_MODIFY_LDT_KERNEL_CHECK(doit) (doit) /* Nothing to check.  */
 #  else
--- libc/linuxthreads/sysdeps/i386/i686/pt-machine.h	25 Sep 2004 10:04:15 -0000	1.23
+++ libc/linuxthreads/sysdeps/i386/i686/pt-machine.h	26 Sep 2004 08:45:22 -0000	1.22.2.2
@@ -69,9 +69,7 @@ __compare_and_swap (long int *p, long in
 }
 #endif
 
-/* If tls.h was included, it will include useldt.h after defining USE_TLS.
-   We don't want to include it here first when tls.h includes us.  */
-#if __ASSUME_LDT_WORKS > 0 && !defined _TLS_H
+#if __ASSUME_LDT_WORKS > 0
 #include "../useldt.h"
 #endif
 


	Jakub

      reply	other threads:[~2004-10-01  8:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-09-25  8:11 Jakub Jelinek
2004-09-25 10:07 ` Roland McGrath
2004-10-01  8:33 ` Thorsten Kukuk
2004-10-01  8:38   ` Jakub Jelinek [this message]

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=20041001083810.GX30497@sunsite.ms.mff.cuni.cz \
    --to=jakub@redhat.com \
    --cc=kukuk@suse.de \
    --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).