From patchwork Thu Oct 26 19:06:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 117277 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1128459qgn; Thu, 26 Oct 2017 12:12:10 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Sz1nOIeMZwQFhf/P5KcN+8hCR/He0aZ+wXR98he3zgfc1/bQztdcIUBFdK/CsoFRaHJs0l X-Received: by 10.98.210.129 with SMTP id c123mr6359013pfg.77.1509045130348; Thu, 26 Oct 2017 12:12:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509045130; cv=none; d=google.com; s=arc-20160816; b=IMXhOSqfD3zY8d/2LnA9rtaB4vNPBBgLkUNEyTTX4rhIbIE5yS9rrRrRPHaKf6mtVD DwowPzpPcFim9YnPyQATXZFtv/C3FW/gURZUegHZdPOyy8kTUYsmOLtPbEDSxExS1QFz mkTmQOAEZgayMnjSMzqpGp5TLuaCeV2HxkMy4gzS9hwiMHg7mh6BZ/6C5UhdExHTmNsi 29c0h4KdqGH2Goz+oJ1VZkiFz2MHRLAUi7lUa+Qy6Z7GxK9lxBQ1FdKdapfVNdTYFk4n fh+ILLNJtdkfRKLknFuVH8EVd3YGVPfVJKEy1PJ2o9HSGoA8TzX4Ag98rT1NhQsrtOrN HkyA== 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:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=/hZ198m2NtPtuDi5Ms02zKkCn9JMV/C/3OsMpW2PV9w=; b=PpAr8ppKB2yYAlkx/lfwU0XJlJqCKmvw9aMct+5JyTElkno2q4EYTAlrfUSBwDdL4l t1D71KZETLhD9O0YfI+ZiLx31kZFGbrUZ5nvucXGDZ54/Zoi9oF8LdXrSofJClWoe76Q q3O5ANfx4xRveFaCsvEiOxKY+KOTKwjuM1GMGry/PdZQH+YfmzAW10TSzDMSvZPHrImF CeWXkm5L8p8blWT1lQUaatTrKiyzttaZkBXLXKqMAJCLgNJSkjO/o4EHEiclboKDFABA rdUlKh/7BrwYN8GaEf1ek9s5y3ZPB6DgAtQbSaG5bHBsRwCclziIrtAojzT7dUBtoZQi Xh+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=nJHOPViO; spf=pass (google.com: domain of libc-alpha-return-86426-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86426-patch=linaro.org@sourceware.org; dmarc=fail (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 q75si4075732pfj.449.2017.10.26.12.12.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Oct 2017 12:12:10 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-86426-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=nJHOPViO; spf=pass (google.com: domain of libc-alpha-return-86426-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86426-patch=linaro.org@sourceware.org; dmarc=fail (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=PiHrbUeXACYovDqvGZ6B5RSSM/amg1P /o4Pt5P17+TzkVTHFLC/ZsPL1n+CBbnwePTwYeWq2ArE6XpgSprATB3CZcVjRGu+ EW1n8SwZleFbmruVGGBbgwMtdqCuABtQ2VZUxAHDg1dSc0WPRnak3fYCSeXorO/t 1VEUsmvI0pu0= 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=QGfPGPwPkz92t8UED7FPg8x/xVg=; b=nJHOP ViOuROb5R1s01FivWgiI/VHaw2zheT50WHIYZ3duS8lXbOUMvtSwYiC9J8dAEhP2 bL5T1Ppgv6Blv+NVKbOv/JxjECl/oR0vdrEUKmsJzz8k5WXpbGrvnfBAUbToHWyc sDRlonZmy5leAnPzGCL5O/XBcHRNdm+kXHTgoQ= Received: (qmail 101289 invoked by alias); 26 Oct 2017 19:07:43 -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 100666 invoked by uid 89); 26 Oct 2017 19:07:38 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qk0-f196.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=/hZ198m2NtPtuDi5Ms02zKkCn9JMV/C/3OsMpW2PV9w=; b=hK4ctKlOh1WLruUdCX3kt7r1g3MMS9GcrFo3nEqC5xLr8YiGzVLw0VDWSrjw8jqSej mW04LvP8L7PWFI1kNl9lO2W69Zk8mIIT4E+e7Hz4bFjIR0dWf1IhoslzX5vIh/R/tMXS mSCZcoAjzg/W03xDg0XvaV1naH2coYNiB8DBtQ4hjp83yI+tNgaLOGjQOKXOZCONRKt4 H+41paQGH4bZ31gcyE42FbHrywiw/+KA2WqgT5r9F00ZqcivuWmD1TNp0FKwt02RTjrU Q8hX0LpX1kUvVBqnsDSvSrwXuDAerAuwiFP1VLWtIoyOEVf/RQ4qcgtHybc46EpIJIXF idJA== X-Gm-Message-State: AMCzsaVZNlt4dNoXXOEphlTxHFR4ucAHOpNNqJ0qoYB3AzSR9atFjiGF v7I+/thP+pfXUWFVjhD7Ntch4i6aHFg= X-Received: by 10.55.174.129 with SMTP id x123mr9756994qke.61.1509044854523; Thu, 26 Oct 2017 12:07:34 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 24/25] sparc: Remove ununsed ifunc assembly macros Date: Thu, 26 Oct 2017 17:06:52 -0200 Message-Id: <1509044813-9951-25-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1509044813-9951-1-git-send-email-adhemerval.zanella@linaro.org> References: <1509044813-9951-1-git-send-email-adhemerval.zanella@linaro.org> * sysdeps/sparc/sparc-ifunc.h (SPARC_ASM_IFUNC_DFLT, SPARC_ASM_IFUNC1, SPARC_ASM_IFUNC2, SET, SPARC_ASM_VIS2_IFUNC, SPARC_ASM_VIS3_IFUNC, SPARC_ASM_VIS3_VIS2_IFUNC): Remove macros. Signed-off-by: Adhemerval Zanella --- ChangeLog | 4 ++ sysdeps/sparc/sparc-ifunc.h | 154 ++++---------------------------------------- 2 files changed, 15 insertions(+), 143 deletions(-) -- 2.7.4 diff --git a/sysdeps/sparc/sparc-ifunc.h b/sysdeps/sparc/sparc-ifunc.h index 4a68cf1..69951e7 100644 --- a/sysdeps/sparc/sparc-ifunc.h +++ b/sysdeps/sparc/sparc-ifunc.h @@ -17,157 +17,25 @@ #include -#ifdef __ASSEMBLER__ +#define INIT_ARCH() -# ifdef SHARED - -# define SPARC_ASM_IFUNC_DFLT(name, dflt) \ -ENTRY (__##name) \ - .type __##name, @gnu_indirect_function; \ - SETUP_PIC_REG_LEAF(o3, o5); \ - sethi %gdop_hix22(dflt), %o1; \ - xor %o1, %gdop_lox10(dflt), %o1; \ - add %o3, %o1, %o1; \ - retl; \ - mov %o1, %o0; \ -END (__##name) - -# define SPARC_ASM_IFUNC1(name, m1, f1, dflt) \ -ENTRY (__##name) \ - .type __##name, @gnu_indirect_function; \ - SETUP_PIC_REG_LEAF(o3, o5); \ - set m1, %o1; \ - andcc %o0, %o1, %g0; \ - be 9f; \ - nop; \ - sethi %gdop_hix22(f1), %o1; \ - xor %o1, %gdop_lox10(f1), %o1; \ - ba 10f; \ - nop; \ -9: sethi %gdop_hix22(dflt), %o1; \ - xor %o1, %gdop_lox10(dflt), %o1; \ -10: add %o3, %o1, %o1; \ - retl; \ - mov %o1, %o0; \ -END (__##name) - -# define SPARC_ASM_IFUNC2(name, m1, f1, m2, f2, dflt) \ -ENTRY (__##name) \ - .type __##name, @gnu_indirect_function; \ - SETUP_PIC_REG_LEAF(o3, o5); \ - set m1, %o1; \ - andcc %o0, %o1, %g0; \ - be 8f; \ - nop; \ - sethi %gdop_hix22(f1), %o1; \ - xor %o1, %gdop_lox10(f1), %o1; \ - ba 10f; \ - nop; \ -8: set m2, %o1; \ - andcc %o0, %o1, %g0; \ - be 9f; \ - nop; \ - sethi %gdop_hix22(f2), %o1; \ - xor %o1, %gdop_lox10(f2), %o1; \ - ba 10f; \ - nop; \ -9: sethi %gdop_hix22(dflt), %o1; \ - xor %o1, %gdop_lox10(dflt), %o1; \ -10: add %o3, %o1, %o1; \ - retl; \ - mov %o1, %o0; \ -END (__##name) - -# else /* SHARED */ - -# ifdef __arch64__ -# define SET(SYM, TMP, REG) setx SYM, TMP, REG -# else -# define SET(SYM, TMP, REG) set SYM, REG -# endif - -# define SPARC_ASM_IFUNC_DFLT(name, dflt) \ -ENTRY (__##name) \ - .type __##name, @gnu_indirect_function; \ - SET(dflt, %g1, %o1); \ - retl; \ - mov %o1, %o0; \ -END (__##name) - -# define SPARC_ASM_IFUNC1(name, m1, f1, dflt) \ -ENTRY (__##name) \ - .type __##name, @gnu_indirect_function; \ - set m1, %o1; \ - andcc %o0, %o1, %g0; \ - be 9f; \ - nop; \ - SET(f1, %g1, %o1); \ - ba 10f; \ - nop; \ -9: SET(dflt, %g1, %o1); \ -10: retl; \ - mov %o1, %o0; \ -END (__##name) - -# define SPARC_ASM_IFUNC2(name, m1, f1, m2, f2, dflt) \ -ENTRY (__##name) \ - .type __##name, @gnu_indirect_function; \ - set m1, %o1; \ - andcc %o0, %o1, %g0; \ - be 8f; \ - nop; \ - SET(f1, %g1, %o1); \ - ba 10f; \ - nop; \ -8: set m2, %o1; \ - andcc %o0, %o1, %g0; \ - be 9f; \ - nop; \ - SET(f2, %g1, %o1); \ - ba 10f; \ - nop; \ -9: SET(dflt, %g1, %o1); \ -10: retl; \ - mov %o1, %o0; \ -END (__##name) - -# endif /* SHARED */ - -#define SPARC_ASM_VIS2_IFUNC(name) \ - SPARC_ASM_IFUNC1(name, HWCAP_SPARC_VIS2, \ - __##name##_vis2, __##name##_generic) - -#define SPARC_ASM_VIS3_IFUNC(name) \ - SPARC_ASM_IFUNC1(name, HWCAP_SPARC_VIS3, \ - __##name##_vis3, __##name##_generic) - -#define SPARC_ASM_VIS3_VIS2_IFUNC(name) \ - SPARC_ASM_IFUNC2(name, HWCAP_SPARC_VIS3, \ - __##name##_vis3, \ - HWCAP_SPARC_VIS2, \ - __##name##_vis2, __##name##_generic) - -#else /* __ASSEMBLER__ */ -# define INIT_ARCH() - -# define sparc_libc_ifunc_redirected(redirected_name, name, expr) \ +#define sparc_libc_ifunc_redirected(redirected_name, name, expr) \ __ifunc (redirected_name, name, expr(hwcap), int hwcap, INIT_ARCH) -# define sparc_libm_ifunc(name, expr) \ - __ifunc (name, name, expr, int hwcap, libm_ifunc_init) +#define sparc_libc_ifunc(name, expr) sparc_libm_ifunc (name, expr) -# define sparc_libc_ifunc(name, expr) sparc_libm_ifunc (name, expr) +#define sparc_libm_ifunc(name, expr) \ + __ifunc (name, name, expr, int hwcap, libm_ifunc_init) -# define sparc_libm_ifunc_redirected(redirected_name, name, expr) \ +#define sparc_libm_ifunc_redirected(redirected_name, name, expr) \ __ifunc (redirected_name, name, expr, int hwcap, libm_ifunc_init) /* It essentially does libc_hidden_builtin_def (name) and redirect the internal redirected symbol to ifunc implementation. */ -# if defined SHARED -# define sparc_ifunc_redirected_hidden_def(redirect_name, name) \ +#if defined SHARED +# define sparc_ifunc_redirected_hidden_def(redirect_name, name) \ __hidden_ver1 (name, __GI_##name, redirect_name) \ __attribute__ ((visibility ("hidden"))); -# else -# define sparc_ifunc_redirected_hidden_def(redirect_name, name) -# endif -#endif /* __ASSEMBLER__ */ +#else +# define sparc_ifunc_redirected_hidden_def(redirect_name, name) +#endif