From patchwork Thu Mar 18 20:07:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 42671 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E21B93844019; Thu, 18 Mar 2021 20:07:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E21B93844019 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1616098028; bh=WgxeeCbyM4ZSo5SiT3XKGocC35trqvp10skhpOpzvMQ=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=CvcAZcAmqL5HQ5dSXpuGBiRryZstekdsQ7kJ4IF9R/UWnUE2ao6JBxueSAa6GslNE blITmJI6FZomM3A0uZhKhn7yvv7I1BcBtzFOeN54EUG+0k/LOKHMNdpgwm9wlc0W/1 wVB/D7voeq5CYPdP3UVbWDVgZLzUf5Kwc9LMRaLU= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id A4F343843856 for ; Thu, 18 Mar 2021 20:07:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A4F343843856 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-277-hYutaJVzPSqTYtlWTyIZJg-1; Thu, 18 Mar 2021 16:07:02 -0400 X-MC-Unique: hYutaJVzPSqTYtlWTyIZJg-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 307E8817469 for ; Thu, 18 Mar 2021 20:07:01 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-115-121.ams2.redhat.com [10.36.115.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8504810013C1 for ; Thu, 18 Mar 2021 20:07:00 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [RFC 1/2] Change how the symbol_version_reference macro is defined In-Reply-To: References: Message-Id: <0f5cee98e3474cbcf1d699334b2d9e993f1c3776.1616095061.git.fweimer@redhat.com> Date: Thu, 18 Mar 2021 21:07:09 +0100 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" A subsequent change will require including for defining symbol_version_reference. should not include for _ISOMAC, so it cannot define symbol_version_reference anymore, but symbol_version_reference is needed even for _ISOMAC. Moving the definition of symbol_version_reference to a separate file makes it possible to use a single definition for both cases. Reviewed-by: Adhemerval Zanella --- include/libc-symbols.h | 16 +++------------- include/libc-symver.h | 38 ++++++++++++++++++++++++++++++++++++++ include/shlib-compat.h | 3 +++ 3 files changed, 44 insertions(+), 13 deletions(-) create mode 100644 include/libc-symver.h diff --git a/include/libc-symbols.h b/include/libc-symbols.h index c83e550b03..ce5f75a1a2 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -59,19 +59,6 @@ # define IN_MODULE (-1) #endif -/* Use symbol_version_reference to specify the version a symbol - reference should link to. Use symbol_version or - default_symbol_version for the definition of a versioned symbol. - The difference is that the latter is a no-op in non-shared - builds. */ -#ifdef __ASSEMBLER__ -# define symbol_version_reference(real, name, version) \ - .symver real, name##@##version -#else /* !__ASSEMBLER__ */ -# define symbol_version_reference(real, name, version) \ - __asm__ (".symver " #real "," #name "@" #version) -#endif - #ifndef _ISOMAC /* This is defined for the compilation of all C library code. features.h @@ -97,6 +84,9 @@ #include +/* Obtain the definition of symbol_version_reference. */ +#include + /* When PIC is defined and SHARED isn't defined, we are building PIE by default. */ #if defined PIC && !defined SHARED diff --git a/include/libc-symver.h b/include/libc-symver.h new file mode 100644 index 0000000000..11c77ae1cd --- /dev/null +++ b/include/libc-symver.h @@ -0,0 +1,38 @@ +/* Symbol version management. + Copyright (C) 1995-2021 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* This file is included from for !_ISOMAC, and + unconditionally from . */ + +#ifndef _LIBC_SYMVER_H +#define _LIBC_SYMVER_H 1 + +/* Use symbol_version_reference to specify the version a symbol + reference should link to. Use symbol_version or + default_symbol_version for the definition of a versioned symbol. + The difference is that the latter is a no-op in non-shared + builds. */ +#ifdef __ASSEMBLER__ +# define symbol_version_reference(real, name, version) \ + .symver real, name##@##version +#else /* !__ASSEMBLER__ */ +# define symbol_version_reference(real, name, version) \ + __asm__ (".symver " #real "," #name "@" #version) +#endif + +#endif /* _LIBC_SYMVER_H */ diff --git a/include/shlib-compat.h b/include/shlib-compat.h index 28baef1ea4..b874e2588f 100644 --- a/include/shlib-compat.h +++ b/include/shlib-compat.h @@ -21,6 +21,9 @@ # include +/* Obtain the definition of symbol_version_reference. */ +#include + /* The file abi-versions.h (generated by scripts/abi-versions.awk) defines symbols like `ABI_libm_GLIBC_2_0' for each version set in the source code for each library. For a version set that is subsumed by a later