From e230dbf6ca642eb6cc660e5d581fa4d16a85934b Mon Sep 17 00:00:00 2001
From: notaz
Date: Sun, 10 Jul 2016 02:09:08 +0300
Subject: libretro: try to prevent bad builds

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

(limited to 'Makefile.libretro')

diff --git a/Makefile.libretro b/Makefile.libretro
index d566e23..cbebc5d 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -182,6 +182,17 @@ MAIN_LDFLAGS += -shared
 MAIN_LDLIBS += -lm -lz
 EXTRA_LDFLAGS =
 
+# try to autodetect stuff for the lazy
+ifndef ARCH
+ARCH = $(shell $(CC) -dumpmachine | awk -F- '{print $$1}')
+endif
+ifndef HAVE_NEON
+HAVE_NEON = $(shell $(CC) -E -dD - < /dev/null 2> /dev/null | grep -q __ARM_NEON__ && echo 1 || echo 0)
+endif
+ifeq ($(shell ld -v 2> /dev/null | awk '{print $$1}'),GNU)
+MAIN_LDFLAGS += -Wl,--no-undefined
+endif
+
 TARGET ?= libretro.so
 PLATFORM = libretro
 BUILTIN_GPU ?= peops
-- 
cgit v1.2.3


From 0702a1f36ab283a6f6de9f3e2e473cd03a78bdf5 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Sat, 6 Aug 2016 21:04:49 +0200
Subject: (Vita) Try to enable dynarec now

---
 Makefile.libretro | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Makefile.libretro')

diff --git a/Makefile.libretro b/Makefile.libretro
index 1cb1df9..b019cb1 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -124,8 +124,8 @@ else ifeq ($(platform), vita)
 	HAVE_NEON = 1
 	BUILTIN_GPU = neon
 
-#	USE_DYNAREC = 1
-#	DRC_CACHE_BASE = 0
+	USE_DYNAREC = 1
+	DRC_CACHE_BASE = 1
 
 	ARCH = arm
 	STATIC_LINKING = 1
-- 
cgit v1.2.3


From 1cc8c854f8161cd0251a9b92929ad01584031ed3 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Sat, 6 Aug 2016 21:06:10 +0200
Subject: (Vita) Have to set DRC_CACHE_BASE to 0 for now

---
 Makefile.libretro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.libretro')

diff --git a/Makefile.libretro b/Makefile.libretro
index b019cb1..79d71c5 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -125,7 +125,7 @@ else ifeq ($(platform), vita)
 	BUILTIN_GPU = neon
 
 	USE_DYNAREC = 1
-	DRC_CACHE_BASE = 1
+	DRC_CACHE_BASE = 0
 
 	ARCH = arm
 	STATIC_LINKING = 1
-- 
cgit v1.2.3


From 9b400da1a7d44efda870462121b3e36ab42e134b Mon Sep 17 00:00:00 2001
From: orbea
Date: Tue, 6 Sep 2016 17:47:31 -0700
Subject: Use DEBUG=1 properly for debug builds

---
 Makefile.libretro | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile.libretro')

diff --git a/Makefile.libretro b/Makefile.libretro
index 79d71c5..01c1fcf 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -1,5 +1,7 @@
 # Makefile for PCSX ReARMed (libretro)
 
+DEBUG=0
+
 ifeq ($(platform),)
 	platform = unix
 	ifeq ($(shell uname -a),)
-- 
cgit v1.2.3


From f82bcc681184536aa6d3ee410b938671c1ba2ead Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Fri, 9 Sep 2016 07:19:14 +0200
Subject: redports backport

---
 Makefile.libretro | 1 -
 1 file changed, 1 deletion(-)

(limited to 'Makefile.libretro')

diff --git a/Makefile.libretro b/Makefile.libretro
index 01c1fcf..4875aaf 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -24,7 +24,6 @@ CFLAGS ?=
 TARGET_NAME := pcsx_rearmed
 LIBZ := -lz
 LIBPTHREAD := -lpthread
-LIBDL := -ldl
 MMAP_WIN32=0
 EXTRA_LDFLAGS =
 
-- 
cgit v1.2.3


From 8356146f0b98c811a0e254b3f35c7e7dc653efce Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Mon, 19 Sep 2016 15:47:23 +0200
Subject: Revert "redports backport"

This reverts commit f82bcc681184536aa6d3ee410b938671c1ba2ead.
---
 Makefile.libretro | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Makefile.libretro')

diff --git a/Makefile.libretro b/Makefile.libretro
index 4875aaf..01c1fcf 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -24,6 +24,7 @@ CFLAGS ?=
 TARGET_NAME := pcsx_rearmed
 LIBZ := -lz
 LIBPTHREAD := -lpthread
+LIBDL := -ldl
 MMAP_WIN32=0
 EXTRA_LDFLAGS =
 
-- 
cgit v1.2.3


From 1e212a25c55c298490867c2ded029c82db1d2b9d Mon Sep 17 00:00:00 2001
From: notaz
Date: Wed, 21 Sep 2016 02:07:16 +0300
Subject: drc: some vita and 3ds support

not tested, mostly just guesswork
---
 Makefile.libretro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.libretro')

diff --git a/Makefile.libretro b/Makefile.libretro
index cbebc5d..223ba9f 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -128,7 +128,7 @@ else ifeq ($(platform), qnx)
 	DRC_CACHE_BASE = 0
 	BUILTIN_GPU = neon
 	ARCH = arm
-	CFLAGS += -DBASE_ADDR_FIXED=0 -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp
+	CFLAGS += -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=softfp
 	ASFLAGS +=  -mcpu=cortex-a9 -mfpu=neon -mfloat-abi=softfp
 
 # ARM
-- 
cgit v1.2.3


From 73081f238a4d80891cf9df5aebeebe3d13c84144 Mon Sep 17 00:00:00 2001
From: Francisco José García García
Date: Mon, 26 Sep 2016 01:03:14 +0200
Subject: (VITA) Dynarec working

---
 Makefile.libretro | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile.libretro')

diff --git a/Makefile.libretro b/Makefile.libretro
index 0f6608d..1aae08e 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -118,6 +118,8 @@ else ifeq ($(platform), vita)
 	AR = arm-vita-eabi-ar$(EXE_EXT)
 	CFLAGS += -DVITA
 	CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
+	CFLAGS += -fsingle-precision-constant -mword-relocations -fno-unwind-tables 
+	CFLAGS += -fno-asynchronous-unwind-tables -ftree-vectorize -funroll-loops
 	CFLAGS += -I$(VITASDK)/include -Ifrontend/vita
 	CFLAGS += -DNO_SOCKET -DNO_OS -DNO_DYLIB
 	ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
-- 
cgit v1.2.3


From 3037393600cc5e63aafe487186025650a6a4d119 Mon Sep 17 00:00:00 2001
From: Francisco José García García
Date: Tue, 27 Sep 2016 00:59:08 +0200
Subject: (VITA) Enable O3 optimizations

---
 Makefile.libretro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Makefile.libretro')

diff --git a/Makefile.libretro b/Makefile.libretro
index 1aae08e..a0f0c07 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -1,6 +1,6 @@
 # Makefile for PCSX ReARMed (libretro)
 
-DEBUG=0
+DEBUG=1
 
 ifeq ($(platform),)
 	platform = unix
@@ -120,6 +120,7 @@ else ifeq ($(platform), vita)
 	CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
 	CFLAGS += -fsingle-precision-constant -mword-relocations -fno-unwind-tables 
 	CFLAGS += -fno-asynchronous-unwind-tables -ftree-vectorize -funroll-loops
+	CFLAGS +=  -fno-optimize-sibling-calls
 	CFLAGS += -I$(VITASDK)/include -Ifrontend/vita
 	CFLAGS += -DNO_SOCKET -DNO_OS -DNO_DYLIB
 	ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
-- 
cgit v1.2.3


From 2f73c14c11377887630c696cefd035a21e976e09 Mon Sep 17 00:00:00 2001
From: Francisco José García García
Date: Tue, 27 Sep 2016 01:02:00 +0200
Subject: (Vita) Disable debug

---
 Makefile.libretro | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Makefile.libretro')

diff --git a/Makefile.libretro b/Makefile.libretro
index a0f0c07..a7fa0eb 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -1,6 +1,6 @@
 # Makefile for PCSX ReARMed (libretro)
 
-DEBUG=1
+DEBUG=0
 
 ifeq ($(platform),)
 	platform = unix
-- 
cgit v1.2.3


From 8fc5171a4c53b6f0e7ef7247d36ee5e05eaf0a07 Mon Sep 17 00:00:00 2001
From: Gregor Richards
Date: Fri, 9 Dec 2016 19:56:33 -0500
Subject: Report git version with library_version

---
 Makefile.libretro | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'Makefile.libretro')

diff --git a/Makefile.libretro b/Makefile.libretro
index a7fa0eb..df1cec2 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -22,6 +22,10 @@ CC_AS ?= $(CC)
 CFLAGS ?=
 
 TARGET_NAME := pcsx_rearmed
+GIT_VERSION := " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+	CFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+endif
 LIBZ := -lz
 LIBPTHREAD := -lpthread
 LIBDL := -ldl
-- 
cgit v1.2.3