From b09a1d34f7fa3f8cee6b24ac33e3d98efad7712f Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Mon, 1 Apr 2013 20:45:53 +0300
Subject: [PATCH] libretro: minor adjustments and a sanity check

---
 Makefile.libretro      | 9 +++++----
 frontend/cspace_neon.S | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index c062048e..2b20dfaa 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -17,6 +17,7 @@ CC ?= gcc
 CXX ?= g++
 AS ?= as
 CC_AS ?= $(CC)
+CFLAGS ?=
 
 ifeq ($(platform), unix)
    TARGET := libretro_pcsx_rearmed.so
@@ -78,8 +79,8 @@ else ifeq ($(platform), wii)
    CFLAGS += -DGEKKO -DHW_RVL -mrvl -mcpu=750 -meabi -mhard-float -DBLARGG_BIG_ENDIAN=1 -D__ppc__
 else ifeq ($(platform), qnx)
    TARGET := libretro_pcsx_rearmed_qnx.so
-	CC = qcc -Vgcc_ntoarmv7le
-	AR = qcc -Vgcc_ntoarmv7le
+   CC ?= qcc -Vgcc_ntoarmv7le
+   CC_AS = $(CC)
    HAVE_NEON = 1
    USE_DYNAREC = 1
    DRC_CACHE_BASE = 0
@@ -94,8 +95,8 @@ else ifeq ($(platform), arm)
    DRC_CACHE_BASE = 0
    BUILTIN_GPU = neon
    ARCH = arm
-   CFLAGS += -DBASE_ADDR_FIXED=0 -marm -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
-   ASFLAGS +=  -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp
+   CFLAGS += -marm -mcpu=cortex-a8 -mfpu=neon
+   ASFLAGS += -mcpu=cortex-a8 -mfpu=neon
 else
    TARGET := pcsx_rearmed_retro.dll
    CC = gcc
diff --git a/frontend/cspace_neon.S b/frontend/cspace_neon.S
index e7b48a90..7420585c 100644
--- a/frontend/cspace_neon.S
+++ b/frontend/cspace_neon.S
@@ -10,6 +10,12 @@
 
 #include "arm_features.h"
 
+/* sanity check */
+#ifndef __ARM_NEON__
+#error Compiling NEON code, but appropriate preprocessor flag is missing
+#error This usually means -mfpu=neon or -mfloat-abi= is not correctly specified
+#endif
+
 .text
 .align 2
 
-- 
2.39.5