Merge git://github.com/notaz/pcsx_rearmed

diff --combined Makefile.libretro
index 21abefc,dc5c3aa..c062048
--- 1/Makefile.libretro
--- 2/Makefile.libretro
+++ b/Makefile.libretro
@@@ -38,8 -38,7 +38,7 @@@ ARCH := ar
     CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -marm
     ASFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon
     HAVE_NEON = 1
- #TODO
- #   BUILTIN_GPU = neon
+    BUILTIN_GPU = neon
     USE_DYNAREC = 1
     CFLAGS += -DIOS
  else ifeq ($(platform), ps3)
@@@ -79,8 -78,6 +78,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
     HAVE_NEON = 1
     USE_DYNAREC = 1
     DRC_CACHE_BASE = 0
@@@ -88,17 -85,8 +87,17 @@@
     ARCH = arm
     CFLAGS += -DBASE_ADDR_FIXED=0 -D__BLACKBERRY_QNX__ -marm -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
     ASFLAGS +=  -mcpu=cortex-a8 -mfpu=neon -mfloat-abi=softfp
 +else ifeq ($(platform), arm)
 +   TARGET := libretro_pcsx_rearmed.so
 +   HAVE_NEON = 1
 +   USE_DYNAREC = 1
 +   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
  else
 -   TARGET := snes9x_next_retro.dll
 +   TARGET := pcsx_rearmed_retro.dll
     CC = gcc
     fpic := -fPIC
     LD_FLAGS := -fPIC
@@@ -128,3 -116,7 +127,7 @@@ include Makefil
  # Apple LLVM version 4.2 (clang-425.0.27) (based on LLVM 3.2svn)
  libpcsxcore/new_dynarec/pcsxmem.o: libpcsxcore/new_dynarec/pcsxmem.c
        $(CC) -c -o $@ $< $(CPPFLAGS) $(CFLAGS) -Os
+ 
+ # no special AS needed for gpu_neon
+ plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.o: plugins/gpu_neon/psx_gpu/psx_gpu_arm_neon.S
+       $(CC) $(CFLAGS) -c $^ -o $@