AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

MIPS: Add android build support for mips in gyp.

Browse Source 
Added mipsel target in gyp and makefiles used for android build.

BUG=

Review URL: https://codereview.chromium.org/12248014
Patch from Paul Lind <plind44@gmail.com>.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@13723 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
jkummerow@chromium.org 2013-02-25 16:39:03 +00:00
parent 9ebcfb41e2
commit 8336fd2d3a
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -148,7 +148,7 @@ endif
ARCHES = ia32 x64 arm mipsel ARCHES = ia32 x64 arm mipsel
DEFAULT_ARCHES = ia32 x64 arm DEFAULT_ARCHES = ia32 x64 arm
MODES = release debug MODES = release debug
ANDROID_ARCHES = android_ia32 android_arm ANDROID_ARCHES = android_ia32 android_arm android_mipsel
# List of files that trigger Makefile regeneration: # List of files that trigger Makefile regeneration:
GYPFILES = build/all.gyp build/common.gypi build/standalone.gypi \ GYPFILES = build/all.gyp build/common.gypi build/standalone.gypi \

16
Makefile.android
View File

@ -26,7 +26,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# Those definitions should be consistent with the main Makefile # Those definitions should be consistent with the main Makefile
ANDROID_ARCHES = android_ia32 android_arm ANDROID_ARCHES = android_ia32 android_arm android_mipsel
MODES = release debug MODES = release debug
# Generates all combinations of ANDROID ARCHES and MODES, # Generates all combinations of ANDROID ARCHES and MODES,
@ -50,11 +50,17 @@ ifeq ($(ARCH), android_arm)
DEFINES += arm_neon=0 armv7=1 DEFINES += arm_neon=0 armv7=1
TOOLCHAIN_ARCH = arm-linux-androideabi-4.6 TOOLCHAIN_ARCH = arm-linux-androideabi-4.6
else else
ifeq ($(ARCH), android_ia32) ifeq ($(ARCH), android_mipsel)
DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86 DEFINES = target_arch=mipsel v8_target_arch=mipsel android_target_arch=mips
TOOLCHAIN_ARCH = x86-4.6 DEFINES += mips_arch_variant=mips32r2
TOOLCHAIN_ARCH = mipsel-linux-android-4.6
else else
$(error Target architecture "${ARCH}" is not supported) ifeq ($(ARCH), android_ia32)
DEFINES = target_arch=ia32 v8_target_arch=ia32 android_target_arch=x86
TOOLCHAIN_ARCH = x86-4.6
else
$(error Target architecture "${ARCH}" is not supported)
endif
endif endif
endif endif

15
build/android.gypi
View File

@ -181,6 +181,11 @@
'-L<(android_stlport_libs)/armeabi', '-L<(android_stlport_libs)/armeabi',
], ],
}], }],
['target_arch=="mipsel"', {
'ldflags': [
'-L<(android_stlport_libs)/mips',
],
}],
['target_arch=="ia32"', { ['target_arch=="ia32"', {
'ldflags': [ 'ldflags': [
'-L<(android_stlport_libs)/x86', '-L<(android_stlport_libs)/x86',
@ -197,6 +202,16 @@
'-fno-stack-protector', '-fno-stack-protector',
], ],
}], }],
['target_arch=="mipsel"', {
# The mips toolchain currently has problems with stack-protector.
'cflags!': [
'-fstack-protector',
'-U__linux__'
],
'cflags': [
'-fno-stack-protector',
],
}],
], ],
'target_conditions': [ 'target_conditions': [
['_type=="executable"', { ['_type=="executable"', {