From patchwork Mon Nov 9 20:18:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 40998 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 1A934397305F; Mon, 9 Nov 2020 20:19:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1A934397305F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1604953145; bh=4Fqj3uzk2ptlKVB4mKaKcs7Yb0NVR+EgWT8QaRwfCGU=; 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=AYg6Io25zf7atdtX0Uz+Z7eK/3SDpo3Uq1w0Q0kb2cMqAQV13vkaVUH5DQZ/WqJFb 2sBAy62B81aZCT9rgsFfF0yEL6FC/bzS21hapmeI9XJeOFqqFMfqm905SJNT2QDcH3 IBfttEjrStkqGJab2rjEUqvFOt7Qm9TQGwvMXi7Q= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x844.google.com (mail-qt1-x844.google.com [IPv6:2607:f8b0:4864:20::844]) by sourceware.org (Postfix) with ESMTPS id 8CA1839730A9 for ; Mon, 9 Nov 2020 20:19:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8CA1839730A9 Received: by mail-qt1-x844.google.com with SMTP id 7so2589253qtp.1 for ; Mon, 09 Nov 2020 12:19:01 -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=4Fqj3uzk2ptlKVB4mKaKcs7Yb0NVR+EgWT8QaRwfCGU=; b=Q9+Ko6x9eWQ6r0ugSXIGedX4ZqzG9mdDVZzmrtSHhYhPq1zdiXHzcXPSqRsuPjtBF8 zn2WTpbTT9IPhPhTdLOplqvirQInOnPxdftygrjKItFXdgNyEitzz8zX4nClKeOo4MJO 04AEm1N60+mn5Dc8tngQhWAMfxiVih20QacUT05/FwRhhCZVDXeug+VGxLQEIdUGu6xG 5+x0mQJfDpCQvWm8wdrKY7FZJSnrnvygc22Y8dO9lWusE8N43Srv79flZxCCeJxO+Dls whoaAierhMQvGAVEuSedlXszQZ0Ue05qzDS2ENZnhBeykzqojCboYz+TjLy124uT0wk9 iHqA== X-Gm-Message-State: AOAM531/0frwq/c7VaUnMKtk6nWNef6/IkwhzqzQV6qTa6ia7PoL/ekD ZpyV80ykswzYkjT0qazAyF8tvHpsjbcJhA== X-Google-Smtp-Source: ABdhPJxlN8ejQ5rAYFaaFIBJ8NfQqkaqDYgQb6t2P71Fdx/XIS6x+qavIPg0R44ENvssDgPZ4tZgZA== X-Received: by 2002:aed:38c8:: with SMTP id k66mr14863014qte.385.1604953140903; Mon, 09 Nov 2020 12:19:00 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id z2sm6843407qkl.22.2020.11.09.12.18.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 12:19:00 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 18/23] linux: Use generic __syscall_error for m68k Date: Mon, 9 Nov 2020 17:18:21 -0300 Message-Id: <20201109201826.120534-19-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 Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Although the auto-generated syscall sets errno directly for dynamic case, using a function call generates more compact code: --- sizes-m68k-linux-gnu.inline +++ sizes-m68k-linux-gnu.outline text data bss dec hex filename -1283686 20376 9304 1313366 140a56 libc.so - 119206 5960 184 125350 1e9a6 elf/ld.so - 87078 1456 8360 96894 17a7e nptl/libpthread.so - 23918 888 160 24966 6186 rt/librt.so +1277602 20376 9304 1307282 13f292 libc.so + 119174 5960 184 125318 1e986 elf/ld.so + 86314 1456 8360 96130 17782 nptl/libpthread.so + 23562 888 160 24610 6022 rt/librt.so Checked with some basic tests to see if errno is set correctly on both static and dynamic binaries with auto-generated syscals and C implementation (which uses INTERNAL_SYSCALL_CALL). --- sysdeps/unix/sysv/linux/m68k/sysdep.S | 50 --------------------------- sysdeps/unix/sysv/linux/m68k/sysdep.h | 11 +++--- 2 files changed, 6 insertions(+), 55 deletions(-) delete mode 100644 sysdeps/unix/sysv/linux/m68k/sysdep.S diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.S b/sysdeps/unix/sysv/linux/m68k/sysdep.S deleted file mode 100644 index 1313ab17c3..0000000000 --- a/sysdeps/unix/sysv/linux/m68k/sysdep.S +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright (C) 1996-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 following code is only used in the shared library when we - compile the reentrant version. Otherwise each system call defines - each own version. */ - -#ifndef PIC - -/* The syscall stubs jump here when they detect an error. */ - -#undef CALL_MCOUNT -#define CALL_MCOUNT /* Don't insert the profiling call, it clobbers %d0. */ - - .text -ENTRY (__syscall_error) - neg.l %d0 -#ifndef _LIBC_REENTRANT - move.l %d0, errno -#else - move.l %d0, -(%sp) - cfi_adjust_cfa_offset (4) - jbsr __errno_location - move.l (%sp)+, (%a0) - cfi_adjust_cfa_offset (-4) -#endif - move.l #-1, %d0 - /* Copy return value to %a0 for syscalls that are declared to - return a pointer. */ - move.l %d0, %a0 - rts -END (__syscall_error) -#endif /* PIC */ diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.h b/sysdeps/unix/sysv/linux/m68k/sysdep.h index 3e0ab605de..2f59c0a2f4 100644 --- a/sysdeps/unix/sysv/linux/m68k/sysdep.h +++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h @@ -17,6 +17,8 @@ License along with the GNU C Library. If not, see . */ +#define SYSCALL_ERROR_FUNC + #include #include @@ -45,11 +47,7 @@ /* We don't want the label for the error handler to be visible in the symbol table when we define it here. */ #undef SYSCALL_ERROR_LABEL -#ifdef PIC #define SYSCALL_ERROR_LABEL .Lsyscall_error -#else -#define SYSCALL_ERROR_LABEL __syscall_error -#endif #undef PSEUDO #define PSEUDO(name, syscall_name, args) \ @@ -137,7 +135,10 @@ SYSCALL_ERROR_LABEL: \ rts; # endif /* _LIBC_REENTRANT */ #else -# define SYSCALL_ERROR_HANDLER /* Nothing here; code in sysdep.S is used. */ +# define SYSCALL_ERROR_HANDLER \ +SYSCALL_ERROR_LABEL: \ + move.l %d0,4(%sp); \ + bra.l __syscall_error #endif /* PIC */ /* Linux takes system call arguments in registers: