From 9b8561f33c2b1f4a3e802d984424a6a7e3025d82 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Mon, 5 Sep 2016 09:00:35 -0400
Subject: [PATCH] libgcc: Use libgcc from armv7-a/ for arm

---
 packages/libgcc/build.sh | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/libgcc/build.sh b/packages/libgcc/build.sh
index 44e948e87..4a201b968 100644
--- a/packages/libgcc/build.sh
+++ b/packages/libgcc/build.sh
@@ -1,11 +1,16 @@
 TERMUX_PKG_HOMEPAGE=https://gcc.gnu.org/onlinedocs/gccint/Libgcc.html
 TERMUX_PKG_DESCRIPTION="GCC low-level runtime library"
 TERMUX_PKG_VERSION=4.9
+TERMUX_PKG_BUILD_REVISION=1
 TERMUX_PKG_KEEP_STATIC_LIBRARIES="true"
 
 termux_step_extract_into_massagedir () {
-        mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/
+	mkdir -p $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/
 
-	LIBGCC_PATH=lib/gcc/$TERMUX_HOST_PLATFORM/4.9.x/libgcc.a
+	local LIBGCC_PATH=lib/gcc/$TERMUX_HOST_PLATFORM/4.9.x
+	if [ $TERMUX_ARCH = "arm" ]; then
+		LIBGCC_PATH+="/armv7-a"
+	fi
+	LIBGCC_PATH+="/libgcc.a"
 	cp $TERMUX_STANDALONE_TOOLCHAIN/$LIBGCC_PATH $TERMUX_PKG_MASSAGEDIR/$TERMUX_PREFIX/lib/
 }