From a5e3a74e9333a3fd17182ea3d89b44ef23e86f89 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Wed, 8 Jul 2020 02:40:43 +0700
Subject: [PATCH] waf/xcompile: gnu hash on android confuses old linkers

---
 scripts/waifulib/xcompile.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/waifulib/xcompile.py b/scripts/waifulib/xcompile.py
index 2872306f..3f0be086 100644
--- a/scripts/waifulib/xcompile.py
+++ b/scripts/waifulib/xcompile.py
@@ -281,7 +281,7 @@ class Android:
 					cflags += fixup_host_clang_with_old_ndk()
 
 				# ARMv5 support
-				cflags += ['-march=armv5te', '-mtune=xscale', '-msoft-float']
+				cflags += ['-march=armv5te', '-msoft-float']
 		elif self.is_x86():
 			cflags += ['-mtune=atom', '-march=atom', '-mssse3', '-mfpmath=sse', '-DVECTORIZE_SINCOS', '-DHAVE_EFFICIENT_UNALIGNED_ACCESS']
 		return cflags
@@ -300,7 +300,7 @@ class Android:
 		if self.is_clang() or self.is_host():
 			linkflags += ['-fuse-ld=lld']
 
-		linkflags += ['-Wl,--hash-style=both','-Wl,--no-undefined']
+		linkflags += ['-Wl,--hash-style=sysv', '-Wl,--no-undefined', '-no-canonical-prefixes']
 		return linkflags
 
 	def ldflags(self):