From patchwork Thu Aug 15 21:18:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 171451 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp16630ily; Thu, 15 Aug 2019 14:19:18 -0700 (PDT) X-Google-Smtp-Source: APXvYqwNa0+X8NWgOQE6yaoysLJ/k/Q7bMBrrb6cUDpcrq3cNcf1a1SwumC2QFGt6hC/yLZUObqH X-Received: by 2002:a17:902:b111:: with SMTP id q17mr2483782plr.177.1565903958030; Thu, 15 Aug 2019 14:19:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1565903958; cv=none; d=google.com; s=arc-20160816; b=XhR64d4BDa9HYJGPXkqckGHK8+WpOBSBswTMnJPQW3H5KCVQCmOZbwzKUmH9ljXSjh xQa61KaR020xCaxr9H3go4dQJCOQxq3SA5OLAucZY6hRCCUQyKSFegEoZTWGPY0bhV9Q shZfX/9hQPKeBXFINdi/Ni0ysLGCd5HXEtUKK2U7/eYB2Wgm9/VOLPkDXkQOSlu4zH8M vtYRvpyWk8gJfrGbUPTG3O5BkzfUUdA9FWGBGXcH3KHkmP6Jk13Z2rvmlEWQdFKZlxLv oxln59pRmQK0xFqNA6ML5e1JpZ4SjxqPu133ebGpCyoYzM9gileWSPD1JsIa8UjLhdCJ DJaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=PcqEohnOJ2nwawyc5G+UXVFc5YRFPwui9NATsOUCPGI=; b=p/qWO9Ixjpw/g+18xFTmR8hpBIQJcUqoMCzbeaeOP5qOxVVjKV6jAA2JF1bDbxb+4n eIPO6iSOHHlx3r+GA6U5SXHSNYRsjrSgOuVy6kWgBsyH7HaGXl9rqhIStG80M55gQaun qS44/HOYsaqcURdenI1HY013OSUVsx1FmaUJJL/7hktZBJ2Wpy0DLBdsXWlqnsOEtdOm +dtSsSB+zLa8zeq9GR/tpYpdUTtwm5hACLB77/joMGyFgavnLwINDhuCFOuRrdaZSaiH QksRPCHNjl91lHCS/HmBX07HdyquVfcIiYfn8w1KDgIcIEeIveGUW1VIF0mQi0u7IKyH pJ/w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=ov+fFoNM; dkim=pass header.i=@linaro.org header.s=google header.b=CvnxtAwp; spf=pass (google.com: domain of libc-alpha-return-104503-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-104503-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id s186si2460017pgs.116.2019.08.15.14.19.17 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Aug 2019 14:19:18 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-104503-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=ov+fFoNM; dkim=pass header.i=@linaro.org header.s=google header.b=CvnxtAwp; spf=pass (google.com: domain of libc-alpha-return-104503-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-104503-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=BUIKdPak2t3EcFoAFxmf7cDtmGkb6tL KZ895X3g5wxZEinOXGgznCmKdHA6QEJvEsR8RNKnTqBCYn5PtWMaVt2/QvJpVXNS 8WNnBgK4z5T2Pe4KGaZ1/QR0/b5wDs/Hd0H4V39ACfq2lodZwjHPFtzzNqABRwpA EBQebe2yXCXw= 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:subject:date:message-id:in-reply-to :references; s=default; bh=mxNA/mn44XT/H5xsduA/aL2B5+Q=; b=ov+fF oNMf+mW9EjKBtTIxKJCamU4zFv7KS95brGPs7t8KDu9TS4X6Tdm4C7CX/7QnMONC MO4FyCiRArWV491vu4qL+LBbnHIDaRdHRdlvjWuhw9swspV1QY7ZVW39Zu9BLdFO 8/+Hwlhtp6KnY1pe5a1cyQ4Siyvnz+GH+sXAcY= Received: (qmail 52315 invoked by alias); 15 Aug 2019 21:18:56 -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 52254 invoked by uid 89); 15 Aug 2019 21:18:56 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-16.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-qk1-f195.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=PcqEohnOJ2nwawyc5G+UXVFc5YRFPwui9NATsOUCPGI=; b=CvnxtAwp1IGvA9PhLYzgTTk1OoECyFAdhnrNWnpRm39VH6YbgZJodIoBqJgST9ZuiC zws9Ec64npYLGRMfwH60qrlenSF0CYUWRLzaWZOjYKpv30jDnYvggqlwscBA8qgdEBom ddnGofsVi4xx0aSc4V2ugzb9N08JIqe1KE8BvBDWQH3tyObFSppcTDinRTMe1aYB8z76 Q+qoYJEfNriOy/QkG/uuAo/ggq7x0tihsYBg3OSfkzGXZqyiQW0qBm4gdFkDIrwr1VGd thh2UhLSwm1QdVgiF8uDRJQggpJqbeth2lPY3+wU4CGakt/0rJC5Oso1cj5EkqGeHAlx 9ubw== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 4/4] linux: Make profil_counter a compat_symbol (BZ#17726) Date: Thu, 15 Aug 2019 18:18:43 -0300 Message-Id: <20190815211843.22799-4-adhemerval.zanella@linaro.org> In-Reply-To: <20190815211843.22799-1-adhemerval.zanella@linaro.org> References: <20190815211843.22799-1-adhemerval.zanella@linaro.org> As indicated by Joseph's comment on BZ#17726, this symbol is most likely a historical ABI accident. This patch make it on both arm and sparc ABIs a compat_symbol. Checked against a build arm-linux-gnueabihf, sparcv9-linux-gnu, adn sparc64-linux-gnu to see if the symbol is still present. * gmon/Versions (libc) [GLIBC_2.31]: New entry. * sysdeps/unix/sysv/linux/arm/profil-counter.h (profil_counter): Make a compat_symbol. * sysdeps/unix/sysv/linux/sparc/profil-counter.h (__profil_counter_global): Likewise. --- gmon/Versions | 2 ++ sysdeps/unix/sysv/linux/arm/profil-counter.h | 5 ++++- sysdeps/unix/sysv/linux/sparc/profil-counter.h | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/gmon/Versions b/gmon/Versions index d0b63334f2..cc705bd978 100644 --- a/gmon/Versions +++ b/gmon/Versions @@ -19,4 +19,6 @@ libc { GLIBC_2.2.3 { sprofil; } + GLIBC_2.31 { + } } diff --git a/sysdeps/unix/sysv/linux/arm/profil-counter.h b/sysdeps/unix/sysv/linux/arm/profil-counter.h index 040c7aa59a..df393332e2 100644 --- a/sysdeps/unix/sysv/linux/arm/profil-counter.h +++ b/sysdeps/unix/sysv/linux/arm/profil-counter.h @@ -30,5 +30,8 @@ __profil_counter (int signo, siginfo_t *_si, void *scp) asm volatile (""); } #ifndef __profil_counter -weak_alias (__profil_counter, profil_counter) +# include +# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_31) +compat_symbol (libc, __profil_counter, profil_counter, GLIBC_2_0); +# endif #endif diff --git a/sysdeps/unix/sysv/linux/sparc/profil-counter.h b/sysdeps/unix/sysv/linux/sparc/profil-counter.h index ad06a4fe06..01271103bb 100644 --- a/sysdeps/unix/sysv/linux/sparc/profil-counter.h +++ b/sysdeps/unix/sysv/linux/sparc/profil-counter.h @@ -21,6 +21,8 @@ #include #ifndef __profil_counter +# include +# if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_31) void __profil_counter_global (int signo, struct sigcontext *si) { @@ -30,5 +32,6 @@ __profil_counter_global (int signo, struct sigcontext *si) profil_count (si->si_regs.pc); #endif } -weak_alias (__profil_counter_global, profil_counter) +compat_symbol (libc, __profil_counter_global, profil_counter, GLIBC_2_0); +# endif #endif