From patchwork Tue Jun 6 19:10:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 9769729 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4F6A060364 for ; Tue, 6 Jun 2017 19:14:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3CC53284A6 for ; Tue, 6 Jun 2017 19:14:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30CB3284DA; Tue, 6 Jun 2017 19:14:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AC4DF284A6 for ; Tue, 6 Jun 2017 19:14:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751444AbdFFTOC (ORCPT ); Tue, 6 Jun 2017 15:14:02 -0400 Received: from mail-pg0-f65.google.com ([74.125.83.65]:36535 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751878AbdFFTKm (ORCPT ); Tue, 6 Jun 2017 15:10:42 -0400 Received: by mail-pg0-f65.google.com with SMTP id v18so10499098pgb.3 for ; Tue, 06 Jun 2017 12:10:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dabbelt-com.20150623.gappssmtp.com; s=20150623; h=from:to:to:to:to:to:to:to:to:to:to:to:to:to:cc:subject:date :message-id:in-reply-to:references; bh=DU+j+hDs5dB2J42cyGzv7UJeslovCouMWa7zzHJo8Ms=; b=DM+SvFZkYfCbLmoCAlRIPH2OkL7U/f9sVCHk95nspcpIK+LxUpW8lTSpIqc33048B9 eMm9oUGJ0zUYyNG7R0vYs2gyctPTeVS3eFcqttgJ5kZ/aL2Ln7hgF/Ivc80Xxrh1CSnD Ij3gwte9PYgj5Kdsdw05U5gb8YGm2IYxTj8UOmQaChBVZWOkLqQTN9tNob7rfj0b5/LT xn/P6KpA3/S0T0DoiQIM4R71YWIEf0H13PtdwZsdr2qNP0yn57Vvy1ssKLT5Bq7Lu1w3 Y8QH6nwTPHAN6xKdpU2P2ekgEQFgzfZvXBjZHhc4FSQzevEU+8ZpUpu4ZOppzuGa7n11 7SKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:to:to:to:to:to:to:to:to:to:to:to:to:cc :subject:date:message-id:in-reply-to:references; bh=DU+j+hDs5dB2J42cyGzv7UJeslovCouMWa7zzHJo8Ms=; b=aHCX+MSk3liMoEiJbiv310yFtS0Z8/Xe7+MX5PNng+nZpvftbOw8QsVmaHLsCn0FWV YtvFHwcnj69ngxzYQ2ykcZdvVFUcfxYO5WSuFthMEEsRBBJzKKCV3aYnew6f+7giKsgW S5YTxzpSHljNt7AXHXCD4Gq1gVDAAIra1gByfPW1f3voppg1LkIdwtPBMfJlZTjd7/pV o+q9FoIVvH0zfwhX4mIOiORjJfzXYXGA0T+NS10Ahw2dh04OJhRqiTlDuW0fr2mhRTkN gDpK2hMkYl1Dtdy1e9aL79WoJQrlE1ihjIxr2OvJYugEGKOYu9getMrjUFrjXZc7bG17 T1xw== X-Gm-Message-State: AODbwcD1OZoYTSC9YBz9Yi4bY1uy4SStvSvoImLEbtSfnDi+R58fS0BX vy4iBI9tzEahKOAD X-Received: by 10.98.196.86 with SMTP id y83mr22956509pff.97.1496776236687; Tue, 06 Jun 2017 12:10:36 -0700 (PDT) Received: from localhost ([216.38.154.21]) by smtp.gmail.com with ESMTPSA id g86sm1266292pfk.101.2017.06.06.12.10.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Jun 2017 12:10:35 -0700 (PDT) From: Palmer Dabbelt To: monstr@monstr.eu To: ralf@linux-mips.org To: liqin.linux@gmail.com To: lennox.wu@gmail.com To: ysato@users.sourceforge.jp To: dalias@libc.org To: davem@davemloft.net To: linux-mips@linux-mips.org To: linux-sh@vger.kernel.org To: sparclinux@vger.kernel.org To: geert@linux-m68k.org To: linux-kernel@vger.kernel.org To: linux-arch@vger.kernel.org Cc: Palmer Dabbelt Subject: [PATCH 6/7] sparc: Use lib/{cmpdi2,ucmpdi2}.c Date: Tue, 6 Jun 2017 12:10:22 -0700 Message-Id: <20170606191023.24581-7-palmer@dabbelt.com> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170606191023.24581-1-palmer@dabbelt.com> References: <20170523220546.16758-1-palmer@dabbelt.com> <20170606191023.24581-1-palmer@dabbelt.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP These files are functionally identical to the shared copies that I recently added. Signed-off-by: Palmer Dabbelt Reviewed-by: Geert Uytterhoeven --- arch/sparc/Kconfig | 2 ++ arch/sparc/lib/Makefile | 4 ++-- arch/sparc/lib/cmpdi2.c | 27 --------------------------- arch/sparc/lib/libgcc.h | 18 ------------------ arch/sparc/lib/ucmpdi2.c | 19 ------------------- 5 files changed, 4 insertions(+), 66 deletions(-) delete mode 100644 arch/sparc/lib/cmpdi2.c delete mode 100644 arch/sparc/lib/libgcc.h delete mode 100644 arch/sparc/lib/ucmpdi2.c diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 58243b0d21c0..cbb1aeb0d419 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -52,6 +52,8 @@ config SPARC32 select CLZ_TAB select HAVE_UID16 select OLD_SIGACTION + select GENERIC_CMPDI2 + select GENERIC_UCMPDI2 config SPARC64 def_bool 64BIT diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile index 69912d2f8b54..815b4a336aa8 100644 --- a/arch/sparc/lib/Makefile +++ b/arch/sparc/lib/Makefile @@ -14,7 +14,7 @@ lib-$(CONFIG_SPARC32) += divdi3.o udivdi3.o lib-$(CONFIG_SPARC32) += copy_user.o locks.o lib-$(CONFIG_SPARC64) += atomic_64.o lib-$(CONFIG_SPARC32) += lshrdi3.o ashldi3.o -lib-$(CONFIG_SPARC32) += muldi3.o bitext.o cmpdi2.o +lib-$(CONFIG_SPARC32) += muldi3.o bitext.o lib-$(CONFIG_SPARC64) += copy_page.o clear_page.o bzero.o lib-$(CONFIG_SPARC64) += csum_copy.o csum_copy_from_user.o csum_copy_to_user.o @@ -42,5 +42,5 @@ lib-$(CONFIG_SPARC64) += copy_in_user.o memmove.o lib-$(CONFIG_SPARC64) += mcount.o ipcsum.o xor.o hweight.o ffs.o obj-$(CONFIG_SPARC64) += iomap.o -obj-$(CONFIG_SPARC32) += atomic32.o ucmpdi2.o +obj-$(CONFIG_SPARC32) += atomic32.o obj-$(CONFIG_SPARC64) += PeeCeeI.o diff --git a/arch/sparc/lib/cmpdi2.c b/arch/sparc/lib/cmpdi2.c deleted file mode 100644 index 8c1306437ed1..000000000000 --- a/arch/sparc/lib/cmpdi2.c +++ /dev/null @@ -1,27 +0,0 @@ -#include - -#include "libgcc.h" - -word_type __cmpdi2(long long a, long long b) -{ - const DWunion au = { - .ll = a - }; - const DWunion bu = { - .ll = b - }; - - if (au.s.high < bu.s.high) - return 0; - else if (au.s.high > bu.s.high) - return 2; - - if ((unsigned int) au.s.low < (unsigned int) bu.s.low) - return 0; - else if ((unsigned int) au.s.low > (unsigned int) bu.s.low) - return 2; - - return 1; -} - -EXPORT_SYMBOL(__cmpdi2); diff --git a/arch/sparc/lib/libgcc.h b/arch/sparc/lib/libgcc.h deleted file mode 100644 index b84fd797f3ea..000000000000 --- a/arch/sparc/lib/libgcc.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef __ASM_LIBGCC_H -#define __ASM_LIBGCC_H - -#include - -typedef int word_type __attribute__ ((mode (__word__))); - -struct DWstruct { - int high, low; -}; - -typedef union -{ - struct DWstruct s; - long long ll; -} DWunion; - -#endif /* __ASM_LIBGCC_H */ diff --git a/arch/sparc/lib/ucmpdi2.c b/arch/sparc/lib/ucmpdi2.c deleted file mode 100644 index 1e06ed500682..000000000000 --- a/arch/sparc/lib/ucmpdi2.c +++ /dev/null @@ -1,19 +0,0 @@ -#include -#include "libgcc.h" - -word_type __ucmpdi2(unsigned long long a, unsigned long long b) -{ - const DWunion au = {.ll = a}; - const DWunion bu = {.ll = b}; - - if ((unsigned int) au.s.high < (unsigned int) bu.s.high) - return 0; - else if ((unsigned int) au.s.high > (unsigned int) bu.s.high) - return 2; - if ((unsigned int) au.s.low < (unsigned int) bu.s.low) - return 0; - else if ((unsigned int) au.s.low > (unsigned int) bu.s.low) - return 2; - return 1; -} -EXPORT_SYMBOL(__ucmpdi2);