From patchwork Thu May 29 17:04:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 353807 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 67445140098 for ; Fri, 30 May 2014 03:05:42 +1000 (EST) 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:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=CQudvRwWCMFxl4pQZo+buVQNkP0VFNE ZRyv3OZHOZGVMaBozJUQgQleUTdd03f3DosXbDXM/J2mAU7eKKfmA+iXC3VYfSxi gobkjgDnVkjAOpAJniN5hMd/zQfP4sN70CQvWh5r9O9qp0a9yvf921YUVSX8WJ4D xmoNMPl6Wuro= 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:cc:subject:date:message-id:in-reply-to :references; s=default; bh=bDmo692NIY/WquXuAkCRhlkWSV8=; b=OY5J+ 9b5haDbDnFv7pVDE6FZN+Tnizpqy+jzPRunNXCy/DG1Zr3AeZxmkIM4DFi3HLWSB BPENsGDDyLjbTeNoNNLrGlTg6+v9kOassJTKMpFamTjiQx01NK+FNiMK2NIBtEGb OapqCyAuicyQCwXTVkG2SO3zYOmdmQzY/YZRu4= Received: (qmail 18825 invoked by alias); 29 May 2014 17:05:18 -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 18772 invoked by uid 89); 29 May 2014 17:05:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=no version=3.3.2 X-HELO: mail-qg0-f42.google.com X-Received: by 10.224.168.13 with SMTP id s13mr12523478qay.14.1401383114481; Thu, 29 May 2014 10:05:14 -0700 (PDT) From: Richard Henderson To: libc-alpha@sourceware.org Cc: marcus.shawcroft@gmail.com, Richard Henderson Subject: [PATCH v3.5 2/2] aarch64: Remove PSEUDO_RET Date: Thu, 29 May 2014 10:04:38 -0700 Message-Id: <1401383078-32544-3-git-send-email-rth@twiddle.net> In-Reply-To: <1401383078-32544-1-git-send-email-rth@twiddle.net> References: <1401383078-32544-1-git-send-email-rth@twiddle.net> From: Richard Henderson --- sysdeps/unix/sysv/linux/aarch64/sysdep.h | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h index 4686599..3f3c709 100644 --- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h +++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h @@ -61,15 +61,6 @@ cmn x0, #4095; \ b.cs .Lsyscall_error; -/* Notice the use of 'RET' instead of 'ret' the assembler is case - insensitive and eglibc already uses the preprocessor symbol 'ret' - so we use the upper case 'RET' to force through a ret instruction - to the assembler */ -# define PSEUDO_RET \ - RET; -# undef ret -# define ret PSEUDO_RET - # undef PSEUDO_END # define PSEUDO_END(name) \ SYSCALL_ERROR_HANDLER \ @@ -81,20 +72,12 @@ ENTRY (name); \ DO_CALL (syscall_name, args); -/* Notice the use of 'RET' instead of 'ret' the assembler is case - insensitive and eglibc already uses the preprocessor symbol 'ret' - so we use the upper case 'RET' to force through a ret instruction - to the assembler */ -# define PSEUDO_RET_NOERRNO \ - RET; - -# undef ret_NOERRNO -# define ret_NOERRNO PSEUDO_RET_NOERRNO - # undef PSEUDO_END_NOERRNO # define PSEUDO_END_NOERRNO(name) \ END (name) +# define ret_NOERRNO ret + /* The function has to return the error code. */ # undef PSEUDO_ERRVAL # define PSEUDO_ERRVAL(name, syscall_name, args) \ @@ -107,7 +90,7 @@ # define PSEUDO_END_ERRVAL(name) \ END (name) -# define ret_ERRVAL PSEUDO_RET_NOERRNO +# define ret_ERRVAL ret # if NOT_IN_libc # define SYSCALL_ERROR .Lsyscall_error