From patchwork Mon Sep 11 23:36:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 812663 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-84475-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="MlMl9kXX"; 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 3xrkpZ20kyz9s7F for ; Tue, 12 Sep 2017 09:36:38 +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=iV+iBfiv2PX8sJUxTifjZVGdwMjaBvrSokQcYMKrbZLYwW+1Yfgbl qSIVXJ5Lg/Ed+tyg96sV3MdqvLGom5vQE0H1GWZmR0hJe1j3+Uuq8f2TJaDrzlug Ity0Ac9/PInO4karb0/5L6jO9kQZjczFEcjChpWUVIHNOAkJequ3bw= 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=lQFcAKr40XT7MjRsDuKBRKZn5/Y=; b=MlMl9kXX+R0LfeIL3/KDIaqZy9q3 t37yGy4OjFDf1kMRG1XX79s2sYphxHDJ9vM0F1bOR0taqGQQ9l+zoN8wZm+lgE+G i9RMWl+wcIriGYbJBLVEcGpb3B7cLSiwfXN3Q/Has1dF/rzfv0Ti/wfO54sTK8F4 kaiFf62Bw9zR80k= Received: (qmail 126165 invoked by alias); 11 Sep 2017 23:36:30 -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 126148 invoked by uid 89); 11 Sep 2017 23:36:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_HELO_PASS, SPF_NEUTRAL, URIBL_RED autolearn=ham version=3.3.2 spammy=hassle X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited] hurd: Fix build without NO_HIDDEN Date: Tue, 12 Sep 2017 01:36:14 +0200 Message-Id: <20170911233614.26389-1-samuel.thibault@ens-lyon.org> * posix/sched_primax.c (__sched_get_priority_max): Add libc_hidden_def. * posix/sched_primin.c (__sched_get_priority_min): Likewise. * sysdeps/mach/hurd/mmap.c (__mmap): Likewise. * sysdeps/mach/hurd/mmap64.c (__mmap64): Likewise. * sysdeps/mach/hurd/mprotect.c (__mprotect): Likewise. * sysdeps/mach/hurd/munmap.c (__munmap): Likewise. * sysdeps/mach/hurd/dl-sysdep.c (__GI___getpid, __GI___strtoul_internal, __GI_____strtoul_internal, __GI___chk_fail, __GI___fortify_fail, __GI___assert_fail, __GI___assert_perror_fail): Add aliases. --- ChangeLog | 14 ++++++++++++++ posix/sched_primax.c | 1 + posix/sched_primin.c | 1 + sysdeps/mach/hurd/dl-sysdep.c | 13 +++++++++++++ sysdeps/mach/hurd/mmap.c | 1 + sysdeps/mach/hurd/mmap64.c | 1 + sysdeps/mach/mprotect.c | 1 + sysdeps/mach/munmap.c | 1 + 8 files changed, 33 insertions(+) diff --git a/ChangeLog b/ChangeLog index a9b6460090..7f8432cb37 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2017-09-12 Samuel Thibault + + * posix/sched_primax.c (__sched_get_priority_max): Add + libc_hidden_def. + * posix/sched_primin.c (__sched_get_priority_min): Likewise. + * sysdeps/mach/hurd/mmap.c (__mmap): Likewise. + * sysdeps/mach/hurd/mmap64.c (__mmap64): Likewise. + * sysdeps/mach/hurd/mprotect.c (__mprotect): Likewise. + * sysdeps/mach/hurd/munmap.c (__munmap): Likewise. + * sysdeps/mach/hurd/dl-sysdep.c (__GI___getpid, + __GI___strtoul_internal, __GI_____strtoul_internal, __GI___chk_fail, + __GI___fortify_fail, __GI___assert_fail, __GI___assert_perror_fail): + Add aliases. + 2017-09-11 Joseph Myers * sysdeps/generic/libm-alias-float.h: New file. diff --git a/posix/sched_primax.c b/posix/sched_primax.c index 6f40b83f6c..ed711c7317 100644 --- a/posix/sched_primax.c +++ b/posix/sched_primax.c @@ -26,6 +26,7 @@ __sched_get_priority_max (int algorithm) __set_errno (ENOSYS); return -1; } +libc_hidden_def (__sched_get_priority_max) stub_warning (sched_get_priority_max) weak_alias (__sched_get_priority_max, sched_get_priority_max) diff --git a/posix/sched_primin.c b/posix/sched_primin.c index 7e38a7cc6b..149b994406 100644 --- a/posix/sched_primin.c +++ b/posix/sched_primin.c @@ -26,6 +26,7 @@ __sched_get_priority_min (int algorithm) __set_errno (ENOSYS); return -1; } +libc_hidden_def (__sched_get_priority_min) stub_warning (sched_get_priority_min) weak_alias (__sched_get_priority_min, sched_get_priority_min) diff --git a/sysdeps/mach/hurd/dl-sysdep.c b/sysdeps/mach/hurd/dl-sysdep.c index 517e4d62cc..8a8ac76efa 100644 --- a/sysdeps/mach/hurd/dl-sysdep.c +++ b/sysdeps/mach/hurd/dl-sysdep.c @@ -577,6 +577,10 @@ __getpid (void) return pid; } +/* We need this alias to satisfy references from libc_pic.a objects + that were affected by the libc_hidden_proto declaration for __getpid. */ +strong_alias (__getpid, __GI___getpid) + /* This is called only in some strange cases trying to guess a value for $ORIGIN for the executable. The dynamic linker copes with getcwd failing (dl-object.c), and it's too much hassle to include @@ -611,6 +615,11 @@ __strtoul_internal (const char *nptr, char **endptr, int base, int group) return _dl_strtoul (nptr, endptr); } +/* We need this alias to satisfy references from libc_pic.a objects + that were affected by the libc_hidden_proto declaration for __strtoul_internal. */ +strong_alias (__strtoul_internal, __GI___strtoul_internal) +strong_alias (__strtoul_internal, __GI_____strtoul_internal) + void weak_function attribute_hidden _exit (int status) { @@ -649,6 +658,10 @@ abort (void) /* We need this alias to satisfy references from libc_pic.a objects that were affected by the libc_hidden_proto declaration for abort. */ strong_alias (abort, __GI_abort) +strong_alias (abort, __GI___chk_fail) +strong_alias (abort, __GI___fortify_fail) +strong_alias (abort, __GI___assert_fail) +strong_alias (abort, __GI___assert_perror_fail) /* This function is called by interruptible RPC stubs. For initial dynamic linking, just use the normal mach_msg. Since this defn is diff --git a/sysdeps/mach/hurd/mmap.c b/sysdeps/mach/hurd/mmap.c index 72706c3332..a6b4e8bf9e 100644 --- a/sysdeps/mach/hurd/mmap.c +++ b/sysdeps/mach/hurd/mmap.c @@ -185,4 +185,5 @@ __mmap (void *addr, size_t len, int prot, int flags, int fd, off_t offset) return (void *) mapaddr; } +libc_hidden_def (__mmap) weak_alias (__mmap, mmap) diff --git a/sysdeps/mach/hurd/mmap64.c b/sysdeps/mach/hurd/mmap64.c index 282b7525c8..1547e856b7 100644 --- a/sysdeps/mach/hurd/mmap64.c +++ b/sysdeps/mach/hurd/mmap64.c @@ -44,4 +44,5 @@ __mmap64 (void *addr, size_t len, int prot, int flags, int fd, return __mmap (addr, len, prot, flags, fd, small_offset); } +libc_hidden_def (__mmap64) weak_alias (__mmap64, mmap64) diff --git a/sysdeps/mach/mprotect.c b/sysdeps/mach/mprotect.c index 84a72850ac..680905703d 100644 --- a/sysdeps/mach/mprotect.c +++ b/sysdeps/mach/mprotect.c @@ -47,4 +47,5 @@ __mprotect (void *addr, size_t len, int prot) } return 0; } +libc_hidden_def (__mprotect) weak_alias (__mprotect, mprotect) diff --git a/sysdeps/mach/munmap.c b/sysdeps/mach/munmap.c index 4a98613baf..5ba414ba05 100644 --- a/sysdeps/mach/munmap.c +++ b/sysdeps/mach/munmap.c @@ -43,4 +43,5 @@ __munmap (void *addr, size_t len) return 0; } +libc_hidden_def (__munmap) weak_alias (__munmap, munmap)