From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13463 invoked by alias); 11 Mar 2004 09:17:26 -0000 Mailing-List: contact libc-hacker-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-hacker-owner@sources.redhat.com Received: (qmail 13445 invoked from network); 11 Mar 2004 09:17:25 -0000 Received: from unknown (HELO sunsite.ms.mff.cuni.cz) (195.113.19.66) by sources.redhat.com with SMTP; 11 Mar 2004 09:17:25 -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 i2B78Fnd008287; Thu, 11 Mar 2004 08:08:15 +0100 Received: (from jakub@localhost) by sunsite.ms.mff.cuni.cz (8.12.8/8.12.8/Submit) id i2B78EVs008254; Thu, 11 Mar 2004 08:08:14 +0100 Date: Thu, 11 Mar 2004 09:17:00 -0000 From: Jakub Jelinek To: Ulrich Drepper Cc: Glibc hackers Subject: [PATCH] Fix s390{,x} build Message-ID: <20040311070814.GD3822@sunsite.ms.mff.cuni.cz> Reply-To: Jakub Jelinek Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4i X-SW-Source: 2004-03/txt/msg00064.txt.bz2 Hi! The recent dl-tls.c -> dl-sym.c reshuffling broke s390*. Here is a fix, verified so far with doing dlsym on a STT_TLS symbol in a shared library. 2004-03-11 Jakub Jelinek * sysdeps/s390/dl-tls.h: Only add __tls_get_offset assembly if IS_IN_rtld. (__TLS_GET_ADDR): Use __tls_get_offset, not __tls_get_addr. --- libc/sysdeps/s390/dl-tls.h.jj 2003-01-28 11:34:02.000000000 +0100 +++ libc/sysdeps/s390/dl-tls.h 2004-03-11 09:47:56.536933703 +0100 @@ -1,5 +1,5 @@ /* Thread-local storage handling in the ELF dynamic linker. s390 version. - Copyright (C) 2003 Free Software Foundation, Inc. + Copyright (C) 2003, 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 @@ -31,6 +31,7 @@ typedef struct extern void *__tls_get_addr (tls_index *ti) attribute_hidden; extern unsigned long __tls_get_offset (unsigned long got_offset); +# ifdef IS_IN_rtld /* The special thing about the s390 TLS ABI is that we do not have the standard __tls_get_addr function but the __tls_get_offset function which differs in two important aspects: @@ -39,7 +40,7 @@ extern unsigned long __tls_get_offset (u 2) __tls_get_offset returns the offset of the requested variable to the thread descriptor instead of a pointer to the variable. */ -#if defined __s390x__ +# if defined __s390x__ asm("\n\ .text\n\ .globl __tls_get_offset\n\ @@ -49,7 +50,7 @@ __tls_get_offset:\n\ la %r2,0(%r2,%r12)\n\ jg __tls_get_addr\n\ "); -#elif defined __s390__ +# elif defined __s390__ asm("\n\ .text\n\ .globl __tls_get_offset\n\ @@ -62,12 +63,15 @@ __tls_get_offset:\n\ b 0(%r4,%r3)\n\ 1: .long __tls_get_addr - 0b\n\ "); -#endif +# endif +# endif -#define GET_ADDR_OFFSET \ +# define GET_ADDR_OFFSET \ (ti->ti_offset - (unsigned long) __builtin_thread_pointer ()) -#define __TLS_GET_ADDR(__ti) \ - (__tls_get_addr(__ti) + (unsigned long) __builtin_thread_pointer ()) +# define __TLS_GET_ADDR(__ti) \ + ({ extern char _GLOBAL_OFFSET_TABLE_[] attribute_hidden; \ + (void *) __tls_get_offset ((char *) (__ti) - _GLOBAL_OFFSET_TABLE_) \ + + (unsigned long) __builtin_thread_pointer (); }) #endif Jakub