Skip to contentSkip to conversation

ARC: string: handle gcc 6.x macro changes

PATCH New Vineet Gupta 2 participants 2 messages Nov 10, 2016 – Nov 16, 2016 Synopsys ARC architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARC: string: handle gcc 6.x macro changes

In gcc 6.x cleanup, the macros got renamed. (Need to support the old toggle for some more time)

Signed-off-by Vineet Gupta <vgupta at synopsys.com>
---
 libc/string/arc/arcv2/memcpy.S | 2 +-
 libc/string/arc/arcv2/memset.S | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
libc/string/arc/arcv2/memcpy.S +1 -1
index 7573daf51acb..ba29e8790721 100644
@@ -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]
libc/string/arc/arcv2/memset.S +2 -2
index 0918d377462c..343cfaf81c6d 100644
@@ -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]
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 ARC: string: handle gcc 6.x macro changes

Hi Vineet,
Vineet Gupta wrote,

Quoted 2 lines

In gcc 6.x cleanup, the macros got renamed. (Need to support the old toggle for some more time)

Applied and pushed,

thx
Waldemar