From patchwork Thu Nov 10 00:03:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vineet Gupta X-Patchwork-Id: 692994 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tDjvC6cgrz9tlW for ; Thu, 10 Nov 2016 11:03:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id AF11891FB0; Thu, 10 Nov 2016 00:03:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id az7iM11LSTe0; Thu, 10 Nov 2016 00:03:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id AB7B591FA2; Thu, 10 Nov 2016 00:03:47 +0000 (UTC) X-Original-To: uclibc@lists.busybox.net Delivered-To: uclibc@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 3A9C51CF7FD for ; Thu, 10 Nov 2016 00:03:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 35D3195822 for ; Thu, 10 Nov 2016 00:03:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gPyI0+vUsLse for ; Thu, 10 Nov 2016 00:03:45 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from smtprelay.synopsys.com (us01smtprelay-2.synopsys.com [198.182.47.9]) by hemlock.osuosl.org (Postfix) with ESMTPS id 9F5BC95809 for ; Thu, 10 Nov 2016 00:03:45 +0000 (UTC) Received: from mailhost.synopsys.com (mailhost3.synopsys.com [10.12.238.238]) by smtprelay.synopsys.com (Postfix) with ESMTP id AA40024E22E0; Wed, 9 Nov 2016 16:03:44 -0800 (PST) Received: from mailhost.synopsys.com (localhost [127.0.0.1]) by mailhost.synopsys.com (Postfix) with ESMTP id 90791F7B; Wed, 9 Nov 2016 16:03:44 -0800 (PST) Received: from us01wehtc1.internal.synopsys.com (us01wehtc1-vip.internal.synopsys.com [10.12.239.236]) by mailhost.synopsys.com (Postfix) with ESMTP id 43FC2F78; Wed, 9 Nov 2016 16:03:44 -0800 (PST) Received: from IN01WEHTCA.internal.synopsys.com (10.144.199.104) by us01wehtc1.internal.synopsys.com (10.12.239.231) with Microsoft SMTP Server (TLS) id 14.3.266.1; Wed, 9 Nov 2016 16:03:44 -0800 Received: from IN01WEHTCB.internal.synopsys.com (10.144.199.105) by IN01WEHTCA.internal.synopsys.com (10.144.199.103) with Microsoft SMTP Server (TLS) id 14.3.266.1; Thu, 10 Nov 2016 05:33:41 +0530 Received: from vineetg-Latitude-E7450.internal.synopsys.com (10.10.161.67) by IN01WEHTCB.internal.synopsys.com (10.144.199.243) with Microsoft SMTP Server (TLS) id 14.3.266.1; Thu, 10 Nov 2016 05:33:40 +0530 From: Vineet Gupta To: Subject: [PATCH] ARC: string: handle gcc 6.x macro changes Date: Wed, 9 Nov 2016 16:03:33 -0800 Message-ID: <1478736213-26116-1-git-send-email-vgupta@synopsys.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [10.10.161.67] Cc: uclibc@uclibc.org, Vineet Gupta , linux-snps-arc@lists.infradead.org X-BeenThere: uclibc@uclibc.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "Discussion and development of uClibc \(the embedded C library\)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: uclibc-bounces@uclibc.org Sender: "uClibc" In gcc 6.x cleanup, the macros got renamed. (Need to support the old toggle for some more time) Signed-off-by: Vineet Gupta --- libc/string/arc/arcv2/memcpy.S | 2 +- libc/string/arc/arcv2/memset.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libc/string/arc/arcv2/memcpy.S b/libc/string/arc/arcv2/memcpy.S index 7573daf51acb..ba29e8790721 100644 --- a/libc/string/arc/arcv2/memcpy.S +++ b/libc/string/arc/arcv2/memcpy.S @@ -23,7 +23,7 @@ # define EXTRACT_2(RX,RY,IMM) lsr RX, RY, 0x08 #endif -#ifdef __LL64__ +#if defined(__LL64__) || defined(__ARC_LL64__) # define PREFETCH_READ(RX) prefetch [RX, 56] # define PREFETCH_WRITE(RX) prefetchw [RX, 64] # define LOADX(DST,RX) ldd.ab DST, [RX, 8] diff --git a/libc/string/arc/arcv2/memset.S b/libc/string/arc/arcv2/memset.S index 0918d377462c..343cfaf81c6d 100644 --- a/libc/string/arc/arcv2/memset.S +++ b/libc/string/arc/arcv2/memset.S @@ -52,7 +52,7 @@ ENTRY(memset) lpnz @.Lset64bytes ;; LOOP START PREWRITE(r3, 64) ;Prefetch the next write location -#ifdef __LL64__ +#if defined(__LL64__) || defined(__ARC_LL64__) std.ab r4, [r3, 8] std.ab r4, [r3, 8] std.ab r4, [r3, 8] @@ -85,7 +85,7 @@ ENTRY(memset) lpnz .Lset32bytes ;; LOOP START prefetchw [r3, 32] ;Prefetch the next write location -#ifdef __LL64__ +#if defined(__LL64__) || defined(__ARC_LL64__) std.ab r4, [r3, 8] std.ab r4, [r3, 8] std.ab r4, [r3, 8]