| Index: icu.gyp
|
| diff --git a/icu.gyp b/icu.gyp
|
| index 4e3c0063727072f7e4a288d3da375b851154b2a4..1bceb120abb79fd930ab2c5030954c58aeb5cac8 100644
|
| --- a/icu.gyp
|
| +++ b/icu.gyp
|
| @@ -45,12 +45,21 @@
|
| ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
|
| or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
|
| (target_arch=="arm" or target_arch=="ia32" or \
|
| - target_arch=="mipsel" or target_arch=="mips")', {
|
| + target_arch=="mipsel" or target_arch=="mips" or \
|
| + target_arch=="ppc" or target_arch=="s390")', {
|
| 'target_conditions': [
|
| ['_toolset=="host"', {
|
| - 'cflags': [ '-m32' ],
|
| - 'ldflags': [ '-m32' ],
|
| - 'asflags': [ '-32' ],
|
| + 'conditions': [
|
| + ['host_arch=="s390" or host_arch=="s390x"', {
|
| + 'cflags': [ '-m31' ],
|
| + 'ldflags': [ '-m31' ],
|
| + 'asflags': [ '-31' ],
|
| + },{
|
| + 'cflags': [ '-m32' ],
|
| + 'ldflags': [ '-m32' ],
|
| + 'asflags': [ '-32' ],
|
| + }],
|
| + ],
|
| 'xcode_settings': {
|
| 'ARCHS': [ 'i386' ],
|
| },
|
| @@ -60,7 +69,8 @@
|
| ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \
|
| or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \
|
| (target_arch=="arm64" or target_arch=="x64" or \
|
| - target_arch=="mips64el" or target_arch=="mips64")', {
|
| + target_arch=="mips64el" or target_arch=="mips64" or \
|
| + target_arch=="ppc64" or target_arch=="s390x")', {
|
| 'target_conditions': [
|
| ['_toolset=="host"', {
|
| 'cflags': [ '-m64' ],
|
| @@ -100,7 +110,7 @@
|
| } , { # else: OS != android
|
| 'conditions': [
|
| # Big Endian
|
| - [ 'target_arch=="mips" or target_arch=="mips64"', {
|
| + [ 'v8_host_byteorder=="big"', {
|
| 'files': [
|
| 'common/icudtb.dat',
|
| ],
|
| @@ -118,7 +128,7 @@
|
| 'target_name': 'data_assembly',
|
| 'type': 'none',
|
| 'conditions': [
|
| - [ 'target_arch=="mips" or target_arch=="mips64"', { # Big Endian
|
| + [ 'v8_host_byteorder=="big"', { # Big Endian
|
| 'data_assembly_inputs': [
|
| 'common/icudtb.dat',
|
| ],
|
| @@ -181,7 +191,7 @@
|
| '<(SHARED_INTERMEDIATE_DIR)/third_party/icu/icudtb_dat.S',
|
| ],
|
| 'conditions': [
|
| - [ 'target_arch=="mips" or target_arch=="mips64"', {
|
| + [ 'v8_host_byteorder=="big"', {
|
| 'sources!': ['<(SHARED_INTERMEDIATE_DIR)/third_party/icu/icudtl_dat.S'],
|
| }, {
|
| 'sources!': ['<(SHARED_INTERMEDIATE_DIR)/third_party/icu/icudtb_dat.S'],
|
|
|