From patchwork Thu Jun 23 11:55:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 13325 Received: (qmail 63372 invoked by alias); 23 Jun 2016 14:16:29 -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 63331 invoked by uid 89); 23 Jun 2016 14:16:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.0 required=5.0 tests=AWL, BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW autolearn=no version=3.3.2 spammy=sk:have_as, sk:HAVE_AS, 2.3.0, !HAVE_IFUNC X-HELO: mx0a-001b2d01.pphosted.com X-IBM-Helo: d06dlp03.portsmouth.uk.ibm.com X-IBM-MailFrom: stli@linux.vnet.ibm.com X-IBM-RcptTo: libc-alpha@sourceware.org From: Stefan Liebler To: libc-alpha@sourceware.org Cc: stli@linux.vnet.ibm.com, joseph@codesourcery.com, carlos@redhat.com, munroesj@linux.vnet.ibm.com Subject: [PATCH 6/8] Use libc_ifunc macro for system in libpthread. Date: Thu, 23 Jun 2016 13:55:50 +0200 In-Reply-To: <1466682952-6301-1-git-send-email-stli@linux.vnet.ibm.com> References: <1466682952-6301-1-git-send-email-stli@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16062311-0020-0000-0000-00000212BD2A X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16062311-0021-0000-0000-00003CAB4730 Message-Id: <1466682952-6301-6-git-send-email-stli@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-06-23_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1606230130 This patch uses the libc_ifunc macro to create already existing ifunc function system_ifunc if HAVE_IFUNC is defined. ChangeLog: * nptl/pt-system.c (system_ifunc): Use libc_ifunc macro. --- nptl/pt-system.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/nptl/pt-system.c b/nptl/pt-system.c index 56f2a89..6515056 100644 --- a/nptl/pt-system.c +++ b/nptl/pt-system.c @@ -32,21 +32,9 @@ # if HAVE_IFUNC -static __typeof (system) * -__attribute__ ((used)) -system_resolve (void) -{ - return &__libc_system; -} - -asm (".globl system_ifunc\n" - ".type system_ifunc, %gnu_indirect_function"); - -# ifdef HAVE_ASM_SET_DIRECTIVE -asm (".set system_ifunc, system_resolve"); -# else -asm ("system_ifunc = system_resolve"); -# endif +extern __typeof(system) system_ifunc; +# define INIT_ARCH() +libc_ifunc (system_ifunc, &__libc_system) # else /* !HAVE_IFUNC */