From patchwork Fri Nov 13 16:58:31 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: 41065 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 2A24A3947426; Fri, 13 Nov 2020 16:59:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 2A24A3947426 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1605286755; bh=VUaeP8V3YzyC66zGIf6NSJ2uNPnzESD9gKiypBmyEjo=; 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=PRRPXSJIDtaDBwXkyx4tCGROU/VS3DajkeRMFFxaXcyfu85hBPUoYhkgHra2M6VFt eDhFHSbEfSCpdrL9rhlMEhp9FMkHtMV3dW/67QZP7S7ZWtop4MsZ9+Gc/o3yvuVZkf KLMxPzOUqebSvledekkvSp6jxUvDc+Cc402fQAE0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qk1-x730.google.com (mail-qk1-x730.google.com [IPv6:2607:f8b0:4864:20::730]) by sourceware.org (Postfix) with ESMTPS id 560E9394741D for ; Fri, 13 Nov 2020 16:59:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 560E9394741D Received: by mail-qk1-x730.google.com with SMTP id d28so9370748qka.11 for ; Fri, 13 Nov 2020 08:59:12 -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=VUaeP8V3YzyC66zGIf6NSJ2uNPnzESD9gKiypBmyEjo=; b=f7U2JF6+LDjfN75Zm3JkS6fNJV5Doqhyo+xjBCUTaQk0XMAY5gSh+S2K0lHT1H63y9 6DWf7sZ8tgoEAPvYaHhNiZ3n+RdaL4DZCAkkDyZoL7un3aivKYSdRZSLmMCk1XF2SrRU DWStd4x6UF+7bw0wacVQqZAu9YVkgiz8g7JqSl8C2H5LEKkLwRT/CXvPQIhJoUrzLu6g vPus8/baQpufD6UrraMnEYKC2Wd9140RxOwrD2ECTRq1W7isn8UnRJuqGW/e/sWA1FQy njXeHm1HGEgygDMG7LL8OGLuoqaxNKVXjzqqOyrZ1ZjNf4xctGkVPwDAsrEhmGOVuaVy LCNw== X-Gm-Message-State: AOAM532kkVr8nW6XQfIuBfAZJK0MLXUGFdfwm0ggBAig2AsHdQSEyrSF yPEqLPTDXBuYdmNA2KhykRQD9RtB76vmMg== X-Google-Smtp-Source: ABdhPJwPQg/E7MfIxQReSooGD/1P+mrhe4icXn3a5WvYh+9ITInBfwEd86CbuRJIewaqQARh8XBMtQ== X-Received: by 2002:a37:a14a:: with SMTP id k71mr3005664qke.33.1605286746708; Fri, 13 Nov 2020 08:59:06 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id s16sm7363931qkg.5.2020.11.13.08.59.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Nov 2020 08:59:06 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH v2 17/23] linux: Use generic __syscall_error for m68k Date: Fri, 13 Nov 2020 13:58:31 -0300 Message-Id: <20201113165837.121629-18-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201113165837.121629-1-adhemerval.zanella@linaro.org> References: <20201113165837.121629-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/syscall_error.h | 25 ++++++++++ sysdeps/unix/sysv/linux/m68k/sysdep.S | 50 -------------------- sysdeps/unix/sysv/linux/m68k/sysdep.h | 9 ++-- 3 files changed, 29 insertions(+), 55 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/m68k/syscall_error.h delete mode 100644 sysdeps/unix/sysv/linux/m68k/sysdep.S diff --git a/sysdeps/unix/sysv/linux/m68k/syscall_error.h b/sysdeps/unix/sysv/linux/m68k/syscall_error.h new file mode 100644 index 0000000000..4ea7cbdad5 --- /dev/null +++ b/sysdeps/unix/sysv/linux/m68k/syscall_error.h @@ -0,0 +1,25 @@ +/* Linux wrappers for setting errno. m68k version. + Copyright (C) 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 + . */ + +#ifndef _SYSCALL_ERROR_H +#define _SYSCALL_ERROR_H + +#define SYSCALL_ERROR_FUNC 1 +#define SYSCALL_ERROR_FUNC_ATTR + +#endif 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..24835be910 100644 --- a/sysdeps/unix/sysv/linux/m68k/sysdep.h +++ b/sysdeps/unix/sysv/linux/m68k/sysdep.h @@ -45,11 +45,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 +133,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: