From patchwork Mon Nov 9 20:18:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 40999 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1B95539730B2; Mon, 9 Nov 2020 20:19:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B95539730B2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1604953146; bh=BPWJ6ObjyMApRK1a1jcZfuWj1v05Ec4MX86rzVQ+IYk=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=qD09eYeTVbjGR2NtOhJC8mISgpVC7LeBaUEgRZr4VphnzNfd05H1E2Rp9NEc8lA4q 2L1PQPauzrju9o8rUtGYF4E6jZLFFeXD/jWeTCPflENPisS+oXfGnAnJpFjDOHnC40 76Z3G/gtaoJN8ysT+JGnu408HsN9VGunUQRoejMI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) by sourceware.org (Postfix) with ESMTPS id 005B63857C56 for ; Mon, 9 Nov 2020 20:19:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 005B63857C56 Received: by mail-qt1-x841.google.com with SMTP id j31so6952548qtb.8 for ; Mon, 09 Nov 2020 12:19:02 -0800 (PST) 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:mime-version:content-transfer-encoding; bh=BPWJ6ObjyMApRK1a1jcZfuWj1v05Ec4MX86rzVQ+IYk=; b=tfMk2rGqYvLKl2JtVJusQp3vqTKCQ0UGkkfYr7tWfZLqccRnsLVv4xVMy9Eoujhz0j 3+yimsBmfb4VE9xjEMLI/zrFESMJbhGG7ltA91xVkE7kYhPeynTIRgwxVCDj0LnoF6YK buaxeJkFChLMxVM+RAYll90BaWDlfA48d5KgaWrrHW11V0aDkoswdNKK9O6sb/E/aVCL T3zRvhblkNWou7xCfXxDw+FZ2Bhp4CHYmcL8fqi8Dbn4PD7ZGxRdHk2Znq4IlJ4zcpr+ dZNbrsm2R5onxl+yb45rGXHSidwUwPIILLbA2col9LcF/eKscvCov54/EG+nVAojR/2L b3IQ== X-Gm-Message-State: AOAM533LS4ozViA/UNJ/gN9l1n39exc8b0Ji6yVsM8rJF3ZmiWCKj6i1 8OHS5S2ln16m4+vUEfbAlNHNufHqruGTCQ== X-Google-Smtp-Source: ABdhPJzwhjk1/mOV9woelvVobim1UlbZbJ+db1ZSQqMWKUeF/4/uRlDJ6oCm7oZPworxuGjtj2WBWQ== X-Received: by 2002:ac8:7110:: with SMTP id z16mr14717307qto.14.1604953142216; Mon, 09 Nov 2020 12:19:02 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id z2sm6843407qkl.22.2020.11.09.12.19.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 12:19:01 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 19/23] linux: Use generic __syscall_error for csky Date: Mon, 9 Nov 2020 17:18:22 -0300 Message-Id: <20201109201826.120534-20-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201109201826.120534-1-adhemerval.zanella@linaro.org> References: <20201109201826.120534-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, URIBL_BLACK autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Although the auto-generated syscall issue __syscall_error, using an inline function generates slight more compact code: --- sizes-csky-linux-gnuabiv2-soft.outline +++ sizes-csky-linux-gnuabiv2-soft.inline text data bss dec hex filename -1210010 10408 9212 1229630 12c33e libc.so - 121439 3876 184 125499 1ea3b elf/ld.so - 93074 920 8348 102342 18fc6 nptl/libpthread.so - 24971 648 156 25775 64af rt/librt.so +1209202 10408 9212 1228822 12c016 libc.so + 121171 3876 184 125231 1e92f elf/ld.so + 93630 920 8348 102898 191f2 nptl/libpthread.so + 24967 648 156 25771 64ab rt/librt.so Checked with a cross make check for csky-linux-gnuabiv2-soft. --- sysdeps/unix/sysv/linux/csky/abiv2/sysdep.S | 65 --------------------- sysdeps/unix/sysv/linux/csky/sysdep.h | 2 + 2 files changed, 2 insertions(+), 65 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/csky/abiv2/sysdep.S diff --git a/sysdeps/unix/sysv/linux/csky/abiv2/sysdep.S b/sysdeps/unix/sysv/linux/csky/abiv2/sysdep.S deleted file mode 100644 index fe6b600bdc..0000000000 --- a/sysdeps/unix/sysv/linux/csky/abiv2/sysdep.S +++ /dev/null @@ -1,65 +0,0 @@ -/* syscall error handlers. C-SKY ABIV2 version. - Copyright (C) 2018-2020 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -#include - -/* The syscall stubs jump here when they detect an error. - The code for Linux is almost identical to the canonical Unix - code, except that the error number in R0 is negated. */ - -#undef CALL_MCOUNT -#define CALL_MCOUNT /* Don't insert the profiling call, it clobbers R0. */ - - .text -ENTRY (__syscall_error) - movi a1, 0 - rsub a0, a0, a1 - -#if !IS_IN (rtld) - mov a1, a0 - mov a0, tls - - grs t1, .Lgetpc1 -.Lgetpc1: - lrw t0, errno@gottpoff - add t1, t1, t0 - ldw t1, (t1) - add t1, a0 - stw a1, (t1) - bmaski a0, 0 - rts -#elif RTLD_PRIVATE_ERRNO /* !IS_IN (rtld) */ -# ifdef __PIC__ - grs t1, .Lgetpc2 -.Lgetpc2: - lrw t0, .Lgetpc2@GOTPC - addu t1, t1, t0 - lrw t0, rtld_errno@PLT - ldr.w t0, (t1, t0 << 0) -# else - lrw t0, rtld_errno -# endif /* __PIC__ */ - stw a0, (t0) - bmaski a0, 0 - rts -#else -# error "Unsupported non-TLS case" -#endif /* RTLD_PRIVATE_ERRNO */ - -#undef __syscall_error -END (__syscall_error) diff --git a/sysdeps/unix/sysv/linux/csky/sysdep.h b/sysdeps/unix/sysv/linux/csky/sysdep.h index 7e8e89dd42..c8a7dd77ad 100644 --- a/sysdeps/unix/sysv/linux/csky/sysdep.h +++ b/sysdeps/unix/sysv/linux/csky/sysdep.h @@ -19,6 +19,8 @@ #ifndef _LINUX_CSKY_SYSDEP_H #define _LINUX_CSKY_SYSDEP_H 1 +#define SYSCALL_ERROR_FUNC + /* There is some commonality. */ #include #include