From patchwork Fri Jul 20 01:58:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 946683 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-94515-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="uGGgozZ2"; 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 41WvDj2qS3z9s3Z for ; Fri, 20 Jul 2018 11:58:28 +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=msxOFuGTPrcoUXUvPf9KVxyy+dwESYTaKGY0T3WtiNSZ/ykAyownA oPCVwbCaTiYHYbYjy9I/eIO/rOZPx3wacpSK6A3JeBxGC0YbJdXDoK+6PYKaaF2A NCyv/7pE/0t7hFcgulnQZjXrlPfFsX+JLa7yTnBJh/ptxo/itAfKKQ= 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=a5BDVNAZbN+gT/AJu2SGAOvqjxg=; b=uGGgozZ2/kkGDw5XxOyvcu5uTSVA utRbvTng/wCs18E7ftRddPb/kB+QPKscJcYLyfMxe3kshn7AJa19FNuk+Ly73ilf rOpSZKDVql9P+DFFTdj74LXEZ6JApsDgj72uQiISXbd8dZZYa+eSl31oTQauL/+R bom97Ora2A8Kjvo= Received: (qmail 71871 invoked by alias); 20 Jul 2018 01:58:22 -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 71742 invoked by uid 89); 20 Jul 2018 01:58:22 -0000 Authentication-Results: sourceware.org; auth=none 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, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy= X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Samuel Thibault Subject: [hurd,commited] hurd: Fix installed-headers tests Date: Fri, 20 Jul 2018 03:58:15 +0200 Message-Id: <20180720015815.31847-1-samuel.thibault@ens-lyon.org> * sysdeps/mach/include/mach-shortcuts-hidden.h [!_ISOMAC]: Do not declare libc hidden prototypes. * sysdeps/mach/include/mach/mach_traps.h [!_ISOMAC]: Likewise. --- ChangeLog | 4 ++++ sysdeps/hurd/include/hurd/port.h | 2 ++ sysdeps/mach/include/mach-shortcuts-hidden.h | 2 ++ sysdeps/mach/include/mach/mach_traps.h | 2 ++ 4 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 93cc5f4e0a..ace34c0a81 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,10 @@ * sysdeps/mach/hurd/i386/tls.h (_hurd_tls_init): Set multiple_threads to 1. + * sysdeps/hurd/include/hurd/port.h [!_ISOMAC]: Do not declare libc + hidden prototypes. + * sysdeps/mach/include/mach-shortcuts-hidden.h [!_ISOMAC]: Likewise. + * sysdeps/mach/include/mach/mach_traps.h [!_ISOMAC]: Likewise. 2018-07-20 Thomas Schwinge diff --git a/sysdeps/hurd/include/hurd/port.h b/sysdeps/hurd/include/hurd/port.h index 84582f6d02..ca1d2d111a 100644 --- a/sysdeps/hurd/include/hurd/port.h +++ b/sysdeps/hurd/include/hurd/port.h @@ -1,5 +1,6 @@ #ifndef _HURD_PORT_H #include_next +#ifndef _ISOMAC libc_hidden_proto (_hurd_port_locked_get) libc_hidden_proto (_hurd_port_locked_set) #ifdef _HURD_PORT_H_HIDDEN_DEF @@ -7,3 +8,4 @@ libc_hidden_def (_hurd_port_locked_get) libc_hidden_def (_hurd_port_locked_set) #endif #endif +#endif diff --git a/sysdeps/mach/include/mach-shortcuts-hidden.h b/sysdeps/mach/include/mach-shortcuts-hidden.h index 0942871f26..f0ab8804ca 100644 --- a/sysdeps/mach/include/mach-shortcuts-hidden.h +++ b/sysdeps/mach/include/mach-shortcuts-hidden.h @@ -1,4 +1,5 @@ #include +#ifndef _ISOMAC libc_hidden_proto (__task_create) libc_hidden_proto (__task_terminate) libc_hidden_proto (__vm_allocate) @@ -11,3 +12,4 @@ libc_hidden_proto (__mach_port_allocate_name) libc_hidden_proto (__mach_port_allocate) libc_hidden_proto (__mach_port_deallocate) libc_hidden_proto (__mach_port_insert_right) +#endif diff --git a/sysdeps/mach/include/mach/mach_traps.h b/sysdeps/mach/include/mach/mach_traps.h index 2d4c1f9c5f..c43349524d 100644 --- a/sysdeps/mach/include/mach/mach_traps.h +++ b/sysdeps/mach/include/mach/mach_traps.h @@ -1,6 +1,7 @@ #ifndef _MACH_MACH_TRAPS_H #include_next +#ifndef _ISOMAC extern mach_port_t __mach_reply_port (void); libc_hidden_proto (__mach_reply_port) extern mach_port_t __mach_thread_self (void); @@ -19,3 +20,4 @@ libc_hidden_proto (__thread_switch) kern_return_t __evc_wait (unsigned int event); libc_hidden_proto (__evc_wait) #endif +#endif