From patchwork Wed Nov 12 14:20:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 409988 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 56D3314009B for ; Thu, 13 Nov 2014 01:21:21 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:cc:subject:message-id :mime-version:content-type; q=dns; s=default; b=wUGNlRktsbEoqGRc mQmj8smsu7U0Vk7D/FYgmPqGDt7pw9WS/eOnwV2nrXZ5xEfuqsuCKYTQgNA5zAA6 sv2uMpNwbQAfucOFw09Lj3NqnzEuidIZLwF2AHwNdDZnC5Q9jlLrxqsrmDWl/559 Xqxb80WzBX7gq6piDPhu0f7fhWw= 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:date:from:to:cc:subject:message-id :mime-version:content-type; s=default; bh=/m43vZhf2YNloWgAn2ddE8 ouNO0=; b=KIFCT2vp7kvl93SsLud237eUVebZh3INszwidEDvkmV0exopsQNMZi EtaSawBvMKn0ikTI8O/kwmAuraD0pHGlBHcfXZKsuqvZbqTf6hYsgdiGurp5+x0O 7r7ptizd+uDcNoMONZFggRd4t7nx6LHoBL4xMADKalo3iNZRcCSAk= Received: (qmail 16187 invoked by alias); 12 Nov 2014 14:21:15 -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 16177 invoked by uid 89); 12 Nov 2014 14:21:14 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.6 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Date: Wed, 12 Nov 2014 19:50:56 +0530 From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Cc: Andreas Krebbel Subject: [COMMITTED][s390] Use GOT instead of GOT12 everywhere Message-ID: <20141112142056.GX2086@spoyarek.pnq.redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.22.1-rc1 (2013-10-16) Hi, I've replaced all instances of GOT12 with GOT in s390 code for consistency, following Richard's question about mixing them in the source. The generated code is identical, so installed as obvious. Siddhesh commit 2581b98ecb1f2b3669a4b88a605f763fa4e85ee6 Author: Siddhesh Poyarekar Date: Wed Nov 12 14:32:41 2014 +0530 Use GOT instead of GOT12 all over GOT12 is a synonym for GOT, so just use GOT everywhere for consistency. Generated code is unchanged on s390. diff --git a/ChangeLog b/ChangeLog index 803ccf0..874d2d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2012-11-12 Siddhesh Poyarekar + + * sysdeps/s390/s390-32/bcopy.S (__bcopy): Use GOT instead of + GOT12. + * sysdeps/s390/s390-32/dl-machine.h (elf_machine_load_address): + Likewise. + (_dl_start_user): Likewise. + * sysdeps/s390/s390-32/setjmp.S (__sigsetjmp): Likewise. + 2014-11-12 Carlos O'Donell Siddhesh Poyarekar diff --git a/sysdeps/s390/s390-32/bcopy.S b/sysdeps/s390/s390-32/bcopy.S index d4403dc..7f61bed 100644 --- a/sysdeps/s390/s390-32/bcopy.S +++ b/sysdeps/s390/s390-32/bcopy.S @@ -68,7 +68,7 @@ ENTRY(__bcopy) #ifdef PIC al %r1,.L9-.L8(%r1) # get address of global offset table # load address of memmove - l %r1,memmove@GOT12(%r1) + l %r1,memmove@GOT(%r1) br %r1 .L9: .long _GLOBAL_OFFSET_TABLE_-.L8 #else diff --git a/sysdeps/s390/s390-32/dl-machine.h b/sysdeps/s390/s390-32/dl-machine.h index 0fd5a4f..47f5874 100644 --- a/sysdeps/s390/s390-32/dl-machine.h +++ b/sysdeps/s390/s390-32/dl-machine.h @@ -76,7 +76,7 @@ elf_machine_load_address (void) "2: l %0,4(1)\n" " ar %0,1\n" " al 1,0(1)\n" - " sl %0,_dl_start@GOT12(1)" + " sl %0,_dl_start@GOT(1)" : "=&d" (addr) : : "1" ); return addr; } @@ -165,7 +165,7 @@ _dl_start_user:\n\ ar %r12,%r13\n\ # See if we were run as a command with the executable file\n\ # name as an extra leading argument.\n\ - l %r1,_dl_skip_args@GOT12(0,%r12)\n\ + l %r1,_dl_skip_args@GOT(%r12)\n\ l %r1,0(%r1) # load _dl_skip_args\n\ ltr %r1,%r1\n\ je .L4 # Skip the arg adjustment if there were none.\n\ diff --git a/sysdeps/s390/s390-32/setjmp.S b/sysdeps/s390/s390-32/setjmp.S index 3ebc813..c0cf3ab 100644 --- a/sysdeps/s390/s390-32/setjmp.S +++ b/sysdeps/s390/s390-32/setjmp.S @@ -76,7 +76,7 @@ ENTRY(__sigsetjmp) basr %r1,0 .L0: al %r1,.L1 - .L0(0,%r1) /* get address of global offset table */ /* get address of __sigjmp_save from got */ - l %r1,__sigjmp_save@GOT12(0,%r1) + l %r1,__sigjmp_save@GOT(%r1) br %r1 .L1: .long _GLOBAL_OFFSET_TABLE_ - .L0 #else