1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: remove AIX/ppc (32bit) dead code

Browse Source 
* also dedup OS400 detection

PR-URL: https://github.com/nodejs/node/pull/25523
Refs: 36839defcf (r247378894)
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
This commit is contained in:
Refael Ackermann 2019-01-15 13:41:22 -05:00
parent a6286e64c5
commit b1a4e41006
2 changed files with 27 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
common.gypi
View File

@ -145,28 +145,8 @@
'msvs_configuration_platform': 'x64', 'msvs_configuration_platform': 'x64',
}], }],
['OS=="aix"', { ['OS=="aix"', {
'variables': {'real_os_name': '<!(uname -s)',},
'cflags': [ '-gxcoff' ], 'cflags': [ '-gxcoff' ],
'ldflags': [ '-Wl,-bbigtoc' ], 'ldflags': [ '-Wl,-bbigtoc' ],
'conditions': [
['target_arch=="ppc64"', {
'ldflags': [
'-Wl,-blibpath:/usr/lib:/lib:'
'/opt/freeware/lib/pthread/ppc64'
],
}],
['target_arch=="ppc"', {
'ldflags': [
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread'
],
}],
['"<(real_os_name)"=="OS400"', {
'ldflags': [
'-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
'-Wl,-brtl',
],
}],
],
}], }],
['OS == "android"', { ['OS == "android"', {
'cflags': [ '-fPIE' ], 'cflags': [ '-fPIE' ],
@ -451,9 +431,9 @@
'ldflags': [ '-m32' ], 'ldflags': [ '-m32' ],
}], }],
[ 'target_arch=="ppc64" and OS!="aix"', { [ 'target_arch=="ppc64" and OS!="aix"', {
'cflags': [ '-m64', '-mminimal-toc' ], 'cflags': [ '-m64', '-mminimal-toc' ],
'ldflags': [ '-m64' ], 'ldflags': [ '-m64' ],
}], }],
[ 'target_arch=="s390"', { [ 'target_arch=="s390"', {
'cflags': [ '-m31', '-march=z196' ], 'cflags': [ '-m31', '-march=z196' ],
'ldflags': [ '-m31', '-march=z196' ], 'ldflags': [ '-m31', '-march=z196' ],
@ -468,38 +448,35 @@
'cflags!': [ '-pthread' ], 'cflags!': [ '-pthread' ],
'ldflags!': [ '-pthread' ], 'ldflags!': [ '-pthread' ],
}], }],
[ 'OS=="aix"', {
'variables': {'real_os_name': '<!(uname -s)',},
'conditions': [
[ 'target_arch=="ppc"', {
'ldflags': [
'-Wl,-bmaxdata:0x60000000/dsa',
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread',
],
}],
[ 'target_arch=="ppc64"', {
'cflags': [ '-maix64' ],
'ldflags': [
'-maix64',
'-Wl,-blibpath:/usr/lib:/lib:'
'/opt/freeware/lib/pthread/ppc64',
],
}],
['"<(real_os_name)"=="OS400"', {
'ldflags': [
'-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
'-Wl,-brtl',
],
}],
],
'ldflags': [ '-Wl,-bbigtoc' ],
'ldflags!': [ '-rdynamic' ],
}],
[ 'node_shared=="true"', { [ 'node_shared=="true"', {
'cflags': [ '-fPIC' ], 'cflags': [ '-fPIC' ],
}], }],
], ],
}], }],
[ 'OS=="aix"', {
'variables': {
# Used to differentiate `AIX` and `OS400`(IBM i).
'aix_variant_name': '<!(uname -s)',
},
'cflags': [ '-maix64', ],
'ldflags!': [ '-rdynamic', ],
'ldflags': [
'-Wl,-bbigtoc',
'-maix64',
],
'conditions': [
[ '"<(aix_variant_name)"=="OS400"', { # a.k.a. `IBM i`
'ldflags': [
'-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
'-Wl,-brtl',
],
}, { # else it's `AIX`
'ldflags': [
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread/ppc64',
],
}],
],
}],
['OS=="android"', { ['OS=="android"', {
'target_conditions': [ 'target_conditions': [
['_toolset=="target"', { ['_toolset=="target"', {

21
node.gyp
View File

@ -1043,7 +1043,6 @@
'conditions': [ 'conditions': [
[ 'OS=="aix" and node_shared=="true"', { [ 'OS=="aix" and node_shared=="true"', {
'variables': {'real_os_name': '<!(uname -s)',},
'targets': [ 'targets': [
{ {
'target_name': 'node_aix_shared', 'target_name': 'node_aix_shared',
@ -1051,26 +1050,6 @@
'product_name': '<(node_core_target_name)', 'product_name': '<(node_core_target_name)',
'ldflags': [ '--shared' ], 'ldflags': [ '--shared' ],
'product_extension': '<(shlib_suffix)', 'product_extension': '<(shlib_suffix)',
'conditions': [
['target_arch=="ppc64"', {
'ldflags': [
'-Wl,-blibpath:/usr/lib:/lib:'
'/opt/freeware/lib/pthread/ppc64'
],
}],
['target_arch=="ppc"', {
'ldflags': [
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread'
],
}],
['"<(real_os_name)"=="OS400"', {
'ldflags': [
'-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
'-Wl,-bbigtoc',
'-Wl,-brtl',
],
}],
],
'includes': [ 'includes': [
'node.gypi' 'node.gypi'
], ],