--- mame2014-libretro/Makefile.orig	2015-11-04 17:31:20 UTC
+++ mame2014-libretro/Makefile
@@ -108,22 +108,21 @@ ifeq ($(platform), unix)
 	TARGETOS=linux
 	fpic := -fPIC
 	SHARED := -shared -Wl,--version-script=src/osd/retro/link.T -Wl,--no-undefined
-	CCOMFLAGS += $(fpic) -fsigned-char -finline  -fno-common -fno-builtin -fweb -frename-registers -falign-functions=16
-	PLATCFLAGS +=  -DALIGN_INTS -DALIGN_SHORTS -fstrict-aliasing -fno-merge-constants  $(fpic)
+	CCOMFLAGS += $(fpic) -fsigned-char -finline  -fno-common -fno-builtin -falign-functions=16
+	PLATCFLAGS +=  -DALIGN_INTS -DALIGN_SHORTS -fstrict-aliasing $(fpic)
 	ifeq ($(VRENDER),opengl)
 		PLATCFLAGS += -DHAVE_GL
 		LIBS += -lGL
 	endif
+	LD = $(CXX)
 	LDFLAGS +=  $(fpic) $(SHARED)
-	REALCC   = gcc
-	NATIVECC = g++
+	REALCC   = $(CC)
+	NATIVECC = $(CXX)
 	NATIVECFLAGS = -std=gnu99
 	BASELIBS +=  -lpthread
-	CC = g++
 	AR = @ar
-	LD = g++
 	CCOMFLAGS += $(PLATCFLAGS)
-	LIBS += -lstdc++ -lpthread -ldl
+	LIBS += -lstdc++ -lpthread
 	ifeq ($(firstword $(filter x86_64,$(UNAME))),x86_64)
 		PTR64 = 1
 	endif
@@ -150,7 +149,7 @@ else ifeq ($(platform), android)
 	AR = @arm-linux-androideabi-ar
 	LD = @arm-linux-androideabi-g++
 	FORCE_DRC_C_BACKEND = 1
-	CCOMFLAGS += -fPIC -mstructure-size-boundary=32 -mthumb-interwork -falign-functions=16 -fsigned-char -finline  -fno-common -fno-builtin -fweb -frename-registers -falign-functions=16
+	CCOMFLAGS += -fPIC -mstructure-size-boundary=32 -mthumb-interwork -falign-functions=16 -fsigned-char -finline  -fno-common -fno-builtin -falign-functions=16
 	PLATCFLAGS += -march=armv7-a -mfloat-abi=softfp -DANDROID -DALIGN_INTS -DALIGN_SHORTS -DLSB_FIRST -fstrict-aliasing -fno-merge-constants -DSDLMAME_NO64BITIO -DSDLMAME_ARM -DRETRO_SETJMP_HACK
 	ifeq ($(VRENDER),opengl)
 		PLATCFLAGS += -DHAVE_GL
@@ -313,8 +312,8 @@ else ifneq (,$(findstring armv,$(platfor
 	TARGETOS=linux
 	fpic := -fPIC
 	SHARED := -shared -Wl,--version-script=src/osd/retro/link.T -Wl,--no-undefined
-	CCOMFLAGS += $(fpic) -mstructure-size-boundary=32 -falign-functions=16 -fsigned-char -finline -fno-common -fno-builtin -fweb -frename-registers -falign-functions=16
-	PLATCFLAGS += -march=armv7-a -DALIGN_INTS -DALIGN_SHORTS -DLSB_FIRST -fstrict-aliasing -fno-merge-constants -DSDLMAME_NO64BITIO -DSDLMAME_ARM -DRETRO_SETJMP_HACK
+	CCOMFLAGS += $(fpic) -mstructure-size-boundary=32 -falign-functions=16 -fsigned-char -finline -fno-common -fno-builtin -falign-functions=16
+	PLATCFLAGS += -march=armv7-a -DALIGN_INTS -DALIGN_SHORTS -DLSB_FIRST -fstrict-aliasing -DSDLMAME_NO64BITIO -DSDLMAME_ARM -DRETRO_SETJMP_HACK
 	LDFLAGS += -Wl,--fix-cortex-a8 -Wl,--no-as-needed $(fpic) $(SHARED)
 	REALCC   = gcc
 	NATIVECC = g++
@@ -954,7 +953,7 @@ endif
 $(EMULATOR): $(EMUINFOOBJ) $(DRIVLISTOBJ) $(DRVLIBS) $(LIBOSD) $(LIBBUS) $(LIBOPTIONAL) $(LIBEMU) $(LIBDASM) $(LIBUTIL) $(EXPAT) $(SOFTFLOAT) $(JPEG_LIB) $(FLAC_LIB) $(7Z_LIB) $(FORMATS_LIB) $(LUA_LIB) $(SQLITE3_LIB) $(WEB_LIB) $(ZLIB) $(LIBOCORE) $(MIDI_LIB) $(RESFILE)
 	$(CC) $(CDEFS) $(CFLAGS) -c $(SRC)/version.c -o $(VERSIONOBJ)
 	@echo Linking $(TARGETLIB)
-	$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) $^ $(LIBS) -o $(TARGETLIB)
+	$(LD) $(LDFLAGS) $(LDFLAGSEMULATOR) $(VERSIONOBJ) $^ $(LIBS:-ldl=) -o $(TARGETLIB)
 
 
 #-------------------------------------------------