renun/koreader
1
0
Fork 0
mirror of https://github.com/koreader/koreader.git synced 2025-08-10 00:52:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't use the backward compat flags on the host. Move to a dedicated

Browse Source 
variable, with a few comments to explain ;).
This commit is contained in:
NiLuJe
2012-10-03 14:54:45 +02:00
parent c312eaabf1
commit bd306da170
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -32,10 +32,12 @@ HOSTCXX:=g++
HOSTAR:=ar HOSTAR:=ar
# Base CFLAGS, without arch. We'll need it for luajit, because its Makefiles do some tricky stuff to differentiate HOST/TARGET # Base CFLAGS, without arch. We'll need it for luajit, because its Makefiles do some tricky stuff to differentiate HOST/TARGET
BASE_CFLAGS:=-O2 -ffast-math -pipe -fomit-frame-pointer -fno-stack-protector -U_FORTIFY_SOURCE -D_GNU_SOURCE BASE_CFLAGS:=-O2 -ffast-math -pipe -fomit-frame-pointer
# Use this for debugging: # Use this for debugging:
#BASE_CFLAGS:=-O0 -g #BASE_CFLAGS:=-O0 -g
ARM_ARCH:=-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp -marm -fno-finite-math-only # Misc GCC tricks to ensure backward compatibility with the K2, even when using a fairly recent TC (Linaro/MG).
ARM_BACKWARD_COMPAT_FLAGS:=-fno-stack-protector -U_FORTIFY_SOURCE -D_GNU_SOURCE -fno-finite-math-only
ARM_ARCH:=-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp -marm
HOST_ARCH:=-march=native HOST_ARCH:=-march=native
HOSTCFLAGS:=$(HOST_ARCH) $(BASE_CFLAGS) HOSTCFLAGS:=$(HOST_ARCH) $(BASE_CFLAGS)
CFLAGS:=$(BASE_CFLAGS) CFLAGS:=$(BASE_CFLAGS)
@@ -68,8 +70,8 @@ ifdef EMULATE_READER
CFLAGS+= $(HOST_ARCH) CFLAGS+= $(HOST_ARCH)
CXXFLAGS+= $(HOST_ARCH) CXXFLAGS+= $(HOST_ARCH)
else else
CFLAGS+= $(ARM_ARCH) CFLAGS+= $(ARM_ARCH) $(ARM_BACKWARD_COMPAT_FLAGS)
CXXFLAGS+= $(ARM_ARCH) CXXFLAGS+= $(ARM_ARCH) $(ARM_BACKWARD_COMPAT_FLAGS)
endif endif
# standard includes # standard includes