From 10a39de1a498c1910bce8c1caffaaf01744d9bbd Mon Sep 17 00:00:00 2001
From: CompCom <33770230+CompCom@users.noreply.github.com>
Date: Sun, 14 Oct 2018 19:20:19 +1100
Subject: [PATCH] Auto set flags for different gcc versions.

---
 Makefile.libretro | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 84e242d0..d29676de 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -250,12 +250,21 @@ else ifeq ($(platform), classic_armv7_a7)
 	-falign-functions=1 -falign-jumps=1 -falign-loops=1 \
 	-fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
 	-fmerge-all-constants -fno-math-errno \
-	-marm -march=armv7ve -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard #armv7-a for older GCC i.e. 4.8
+	-marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
 	ASFLAGS += $(CFLAGS)
 	HAVE_NEON = 1
 	ARCH = arm
 	BUILTIN_GPU = neon
 	USE_DYNAREC = 1
+	ifeq ($(shell echo `$(CC) -dumpversion` "< 4.9" | bc -l), 1)
+	  CFLAGS += -march=armv7-a
+	else
+	  CFLAGS += -march=armv7ve
+	  # If gcc is 5.0 or later
+	  ifeq ($(shell echo `$(CC) -dumpversion` ">= 5" | bc -l), 1)
+	    MAIN_LDFLAGS += -static-libgcc -static-libstdc++
+	  endif
+	endif
 
 
 #######################################
-- 
2.39.5