Finished up Armv7 CortexA7

This commit is contained in:
Ryan 'Swingflip' Hamlin 2018-10-16 18:50:04 +01:00 committed by Brandon Wright
parent b95d30529b
commit 25db75cdac
1 changed files with 9 additions and 8 deletions

View File

@ -26,7 +26,9 @@ ifeq ($(platform),)
platform = win
endif
else ifneq (,$(findstring armv,$(platform)))
override platform += unix
ifeq (,$(findstring classic_,$(platform)))
override platform += unix
endif
else ifneq (,$(findstring rpi,$(platform)))
override platform += unix
endif
@ -110,8 +112,8 @@ else ifeq ($(platform), libnx)
else ifeq ($(platform), classic_armv7_a7)
TARGET := $(TARGET_NAME)_libretro.so
fpic := -fPIC
SHARED := -shared -Wl,--version-script=libretro/link.T -Wl,--no-undefined
CFLAGS += -Ofast \
SHARED := -shared -Wl,--version-script=link.T -Wl,--no-undefined
CXXFLAGS += -Ofast \
-flto=4 -fwhole-program -fuse-linker-plugin \
-fdata-sections -ffunction-sections -Wl,--gc-sections \
-fno-stack-protector -fno-ident -fomit-frame-pointer \
@ -119,9 +121,7 @@ else ifeq ($(platform), classic_armv7_a7)
-fno-unwind-tables -fno-asynchronous-unwind-tables -fno-unroll-loops \
-fmerge-all-constants -fno-math-errno \
-marm -mtune=cortex-a7 -mfpu=neon-vfpv4 -mfloat-abi=hard
CXXFLAGS += $(CFLAGS)
CPPFLAGS += $(CFLAGS)
ASFLAGS += $(CFLAGS)
CFLAGS += $(CXXFLAGS)
HAVE_NEON = 1
ARCH = arm
BUILTIN_GPU = neon
@ -617,14 +617,15 @@ ${LIBRARY_NAME}_FILES = $(SOURCES_CXX) $(SOURCES_C)
include $(THEOS_MAKE_PATH)/library.mk
else
all: $(TARGET)
@echo "** BUILDING $(TARGET) FOR PLATFORM $(platform) **"
$(TARGET): $(OBJECTS)
@echo "** BUILDING $(TARGET) FOR PLATFORM $(platform) **"
ifeq ($(STATIC_LINKING), 1)
$(AR) rcs $@ $(OBJECTS)
else
+$(LD) $(fpic) $(SHARED) $(LINKOUT)$@ $(OBJECTS) $(LDFLAGS) $(LIBS)
endif
@echo "** BUILD SUCCESSFUL! GG NO RE **"
@echo "** BUILD SUCCESSFUL! GG NO RE **"
%.o: %.cpp
$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $(OBJOUT)$@ $<