From 4e00196912e63bd44f9a62a88a0f5c5fde25ad86 Mon Sep 17 00:00:00 2001
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Wed, 20 Dec 2017 10:39:36 +0000
Subject: [PATCH] aarch64: fix memset with --disable-multi-arch

	* sysdeps/aarch64/memset.S (MEMSET): Define.
---
 ChangeLog                | 4 ++++
 sysdeps/aarch64/memset.S | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index de2ee3f779..15e6cb6543 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-12-20  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
+
+	* sysdeps/aarch64/memset.S (MEMSET): Define.
+
 2017-12-20  Florian Weimer  <fweimer@redhat.com>
 
 	[BZ #22635]
diff --git a/sysdeps/aarch64/memset.S b/sysdeps/aarch64/memset.S
index 45fb0a86a9..7f5127f672 100644
--- a/sysdeps/aarch64/memset.S
+++ b/sysdeps/aarch64/memset.S
@@ -19,6 +19,10 @@
 #include <sysdep.h>
 #include "memset-reg.h"
 
+#ifndef MEMSET
+# define MEMSET memset
+#endif
+
 /* Assumptions:
  *
  * ARMv8-a, AArch64, unaligned accesses
-- 
2.11.4.GIT