From patchwork Fri Jul 27 09:22:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 950060 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-94825-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="ehmO4ZsO"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41cNmL13Ckz9ryt for ; Fri, 27 Jul 2018 19:22:57 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=VtU/tLynRPQ6hzXndivMiAbs8cBaLu+tmThovSCSiV3AGEpcFk33O LySn04bM5FcRjQcssxV68PHVVOFKdK/tNrafpb4Lk+4tswdwrwAuav8p383ljHti qdO7T/zEcMLdFMS9lu3i+JNiiF1yYbp+TjTRtLCdT271fDc5LQGh34= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=AaOgqAs+IsKdCzKcLDndv6JOSxU=; b=ehmO4ZsOzSW/Rx/CvU+/w/TQSxt2 64oe5MjhmmE5uLNmdqMnOXVDK6bBz5Pw+AW+hVGIZufmI+6DmZAQDUNntC4ayG50 iiVx9WY7G/wTLuPUSz9kiLWXl3FyXIXDgx8WmoxCKuYXRVr5/TLpy7JqwMPwmNTH pYRPGdhXa8KmbWM= Received: (qmail 76900 invoked by alias); 27 Jul 2018 09:22:51 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 76886 invoked by uid 89); 27 Jul 2018 09:22:51 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=H*MI:20180727092245, H*r:sk:AES256- X-HELO: mail3-relais-sop.national.inria.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited] hurd: Fix some ld.so symbol override from libc Date: Fri, 27 Jul 2018 11:22:45 +0200 Message-Id: <20180727092245.11202-1-samuel.thibault@ens-lyon.org> ld.so symbols to be overriden by libc need to be extern to really get overriden. More fixes are needed to avoid the hidden attribute. * sysdeps/mach/hurd/Versions (libc): Make __access and __access_noerrno external so they can override the ld symbols. (ld): Make __access, __read, __sbrk, __strtoul_internal, __write, __writev, __open64, __access_noerrno extern so they can be overrided. * sysdeps/mach/hurd/i386/libc.abilist: Update accordingly. * sysdeps/mach/hurd/i386/ld.abilist: Update accordingly. --- ChangeLog | 9 +++++++++ sysdeps/mach/hurd/Versions | 19 ++++++++++++++----- sysdeps/mach/hurd/dl-sysdep.c | 5 ++++- sysdeps/mach/hurd/i386/ld.abilist | 4 ++++ sysdeps/mach/hurd/i386/libc.abilist | 1 + sysdeps/mach/hurd/i386/localplt.data | 4 ++-- 6 files changed, 34 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5556e82a2d..61edfc5381 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2018-07-27 Samuel Thibault + + * sysdeps/mach/hurd/Versions (libc): Make __access and + __access_noerrno external so they can override the ld symbols. + (ld): Make __access, __read, __sbrk, __strtoul_internal, __write, + __writev, __open64, __access_noerrno extern so they can be overrided. + * sysdeps/mach/hurd/i386/libc.abilist: Update accordingly. + * sysdeps/mach/hurd/i386/ld.abilist: Update accordingly. + 2018-07-26 Carlos O'Donell * po/libc.pot: Regenerate. diff --git a/sysdeps/mach/hurd/Versions b/sysdeps/mach/hurd/Versions index 7cab8e8551..f69d5fef67 100644 --- a/sysdeps/mach/hurd/Versions +++ b/sysdeps/mach/hurd/Versions @@ -1,11 +1,15 @@ libc { GLIBC_2.0 { # functions with a weak definition in the dynamic linker - __getcwd; __mmap; + __access; __getcwd; __mmap; + } + GLIBC_2.2.6 { + # functions with a weak definition in the dynamic linker + __writev; } GLIBC_PRIVATE { # Functions shared with the dynamic linker - __libc_read; __libc_write; __libc_lseek64; + __access_noerrno; __libc_read; __libc_write; __libc_lseek64; __libc_lock_self0; _dl_init_first; @@ -18,11 +22,16 @@ ld { __hurd_threadvar_stack_mask; __hurd_threadvar_stack_offset; # functions that must be shared with libc - __close; __getcwd; __getpid; - __mmap; __open; __xstat64; __fxstat64; + __access; __close; __getcwd; __getpid; + __mmap; __open; __read; __sbrk; __strtoul_internal; + __write; __writev; __xstat64; __fxstat64; _exit; _hurd_intr_rpc_mach_msg; abort; } + GLIBC_2.2 { + # functions that must be shared with libc + __open64; + } GLIBC_2.2.6 { # this also must be shared with libc. __errno_location; @@ -31,7 +40,7 @@ ld { _dl_init_first; # functions that must be shared with libc - __libc_read; __libc_write; __libc_lseek64; + __access_noerrno; __libc_read; __libc_write; __libc_lseek64; __libc_lock_self0; } } diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index ec55c47f35..b72913d3ba 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -275,7 +275,10 @@ _dl_sysdep_start_cleanup (void) /* Minimal open/close/mmap implementation sufficient for initial loading of shared libraries. These are weak definitions so that when the dynamic linker re-relocates itself to be user-visible (for -ldl), - it will get the user's definition (i.e. usually libc's). */ + it will get the user's definition (i.e. usually libc's). + + They also need to be set in the ld section of sysdeps/mach/hurd/Versions, to + be overridable, and in libc.abilist and ld.abilist to be checked. */ /* This macro checks that the function does not get renamed to be hidden: we do need these to be overridable by libc's. */ diff --git a/sysdeps/mach/hurd/i386/ld.abilist b/sysdeps/mach/hurd/i386/ld.abilist index 14371336de..3a89b5a10e 100644 --- a/sysdeps/mach/hurd/i386/ld.abilist +++ b/sysdeps/mach/hurd/i386/ld.abilist @@ -5,6 +5,10 @@ GLIBC_2.2.6 __getpid F GLIBC_2.2.6 __libc_stack_end D 0x4 GLIBC_2.2.6 __mmap F GLIBC_2.2.6 __open F +GLIBC_2.2.6 __open64 F +GLIBC_2.2.6 __strtoul_internal F +GLIBC_2.2.6 __write F +GLIBC_2.2.6 __writev F GLIBC_2.2.6 __xstat64 F GLIBC_2.2.6 _dl_mcount F GLIBC_2.2.6 _hurd_intr_rpc_mach_msg F diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist index 9a3aac7a92..64586d828d 100644 --- a/sysdeps/mach/hurd/i386/libc.abilist +++ b/sysdeps/mach/hurd/i386/libc.abilist @@ -543,6 +543,7 @@ GLIBC_2.2.6 __wctrans_l F GLIBC_2.2.6 __wctype_l F GLIBC_2.2.6 __woverflow F GLIBC_2.2.6 __write F +GLIBC_2.2.6 __writev F GLIBC_2.2.6 __wuflow F GLIBC_2.2.6 __wunderflow F GLIBC_2.2.6 __xmknod F diff --git a/sysdeps/mach/hurd/i386/localplt.data b/sysdeps/mach/hurd/i386/localplt.data index efcf4e4f6e..69d3a2568d 100644 --- a/sysdeps/mach/hurd/i386/localplt.data +++ b/sysdeps/mach/hurd/i386/localplt.data @@ -27,7 +27,7 @@ ld.so: __open64 ? ld.so: __close ld.so: __read ? ld.so: __write ? -#ld.so: __writev +ld.so: __writev ld.so: __libc_lseek64 ld.so: __mmap ld.so: __fxstat64 @@ -37,7 +37,7 @@ ld.so: __xstat64 ld.so: __getpid #ld.so: __getcwd #ld.so: __sbrk -#ld.so: __strtoul_internal +ld.so: __strtoul_internal #ld.so: _exit ld.so: abort ld.so: _hurd_intr_rpc_mach_msg