PPC/s390: [build] fix target_arch for ppc/s390 native builds

Makefile

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 430 matching lines @@
 
 clean: $(addsuffix .clean, $(ARCHES) $(ANDROID_ARCHES) $(NACL_ARCHES)) native.clean gtags.clean tags.clean
 
 # GYP file generation targets.
 OUT_MAKEFILES = $(addprefix $(OUTDIR)/Makefile.,$(BUILDS))
 $(OUT_MAKEFILES): $(GYPFILES) $(ENVFILE)
         $(eval CXX_TARGET_ARCH:=$(shell $(CXX) -v 2>&1 | grep ^Target: | \
                 cut -f 2 -d " " | cut -f 1 -d "-" ))
         $(eval CXX_TARGET_ARCH:=$(subst aarch64,arm64,$(CXX_TARGET_ARCH)))
         $(eval CXX_TARGET_ARCH:=$(subst x86_64,x64,$(CXX_TARGET_ARCH)))
+        $(eval CXX_TARGET_ARCH:=$(subst s390x,s390,$(CXX_TARGET_ARCH)))
+        $(eval CXX_TARGET_ARCH:=$(subst powerpc,ppc,$(CXX_TARGET_ARCH)))
+        $(eval CXX_TARGET_ARCH:=$(subst ppc64,ppc,$(CXX_TARGET_ARCH)))

[Michael Achenbach, 2016/06/17 06:35:01]

Not sure I understand the replacement of ppc64 with ppc. So if ppc64 is compiled
native, isn't the v8_target_arch == ppc64? In this case the condition below
would not set target_arch, but on the other hand it also wouldn't set ia32 as
also that condition wouldn't hold for ppc64. Maybe doesn't matter...

[john.yan, 2016/06/17 13:06:09]

Hello Michael,

I found that when v8_target_arch == ppc64 and CXX_TARGET_ARCH == ppc,
"$(findstring $(CXX_TARGET_ARCH),$(V8_TARGET_ARCH))" will actually return TRUE.
So target_arch will actually be set correctly.

+        $(eval CXX_TARGET_ARCH:=$(subst ppcle,ppc,$(CXX_TARGET_ARCH)))
         $(eval V8_TARGET_ARCH:=$(subst .,,$(suffix $(basename $@))))
         PYTHONPATH="$(shell pwd)/tools/generate_shim_headers:$(shell pwd)/gypfiles:$(PYTHONPATH):$(shell pwd)/tools/gyp/pylib:$(PYTHONPATH)" \
         GYP_GENERATORS=make \
         tools/gyp/gyp --generator-output="$(OUTDIR)" gypfiles/all.gyp \
                       -Igypfiles/standalone.gypi --depth=. \
                       -Dv8_target_arch=$(V8_TARGET_ARCH) \
                       $(if $(findstring $(CXX_TARGET_ARCH),$(V8_TARGET_ARCH)), \
                       -Dtarget_arch=$(V8_TARGET_ARCH), \
                           $(if $(shell echo $(ARCHES32) | grep $(V8_TARGET_ARCH)), \
                           -Dtarget_arch=ia32,)) \
@@ skipping 56 matching lines @@
 tags: gtags.files $(wildcard $(shell cat gtags.files 2> /dev/null))
         @(ctags --version | grep 'Exuberant Ctags' >/dev/null) || \
                 (echo "Please install Exuberant Ctags (check 'ctags --version')" >&2; false)
         ctags --fields=+l -L $<
 
 tags.clean:
         rm -r tags
 
 dependencies builddeps:
         $(error Use 'gclient sync' instead)