Skip to content

Commit de26866

Browse files
refackMylesBorins
authored andcommitted
build: remove AIX/ppc (32bit) dead code
* also dedup OS400 detection PR-URL: #25523 Refs: https://github.com/nodejs/node/pull/25447/files/36839defcfaf7c46435e16fb1f0da006f3ebe8ac#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>
1 parent cd4a932 commit de26866

File tree

2 files changed

+27
-71
lines changed

2 files changed

+27
-71
lines changed

Diff for: common.gypi

+27-50
Original file line numberDiff line numberDiff line change
@@ -113,28 +113,8 @@
113113
'msvs_configuration_platform': 'x64',
114114
}],
115115
['OS=="aix"', {
116-
'variables': {'real_os_name': '<!(uname -s)',},
117116
'cflags': [ '-gxcoff' ],
118117
'ldflags': [ '-Wl,-bbigtoc' ],
119-
'conditions': [
120-
['target_arch=="ppc64"', {
121-
'ldflags': [
122-
'-Wl,-blibpath:/usr/lib:/lib:'
123-
'/opt/freeware/lib/pthread/ppc64'
124-
],
125-
}],
126-
['target_arch=="ppc"', {
127-
'ldflags': [
128-
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread'
129-
],
130-
}],
131-
['"<(real_os_name)"=="OS400"', {
132-
'ldflags': [
133-
'-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
134-
'-Wl,-brtl',
135-
],
136-
}],
137-
],
138118
}],
139119
['OS == "android"', {
140120
'cflags': [ '-fPIE' ],
@@ -422,9 +402,9 @@
422402
'ldflags': [ '-m32' ],
423403
}],
424404
[ 'target_arch=="ppc64" and OS!="aix"', {
425-
'cflags': [ '-m64', '-mminimal-toc' ],
426-
'ldflags': [ '-m64' ],
427-
}],
405+
'cflags': [ '-m64', '-mminimal-toc' ],
406+
'ldflags': [ '-m64' ],
407+
}],
428408
[ 'target_arch=="s390"', {
429409
'cflags': [ '-m31', '-march=z196' ],
430410
'ldflags': [ '-m31', '-march=z196' ],
@@ -439,38 +419,35 @@
439419
'cflags!': [ '-pthread' ],
440420
'ldflags!': [ '-pthread' ],
441421
}],
442-
[ 'OS=="aix"', {
443-
'variables': {'real_os_name': '<!(uname -s)',},
444-
'conditions': [
445-
[ 'target_arch=="ppc"', {
446-
'ldflags': [
447-
'-Wl,-bmaxdata:0x60000000/dsa',
448-
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread',
449-
],
450-
}],
451-
[ 'target_arch=="ppc64"', {
452-
'cflags': [ '-maix64' ],
453-
'ldflags': [
454-
'-maix64',
455-
'-Wl,-blibpath:/usr/lib:/lib:'
456-
'/opt/freeware/lib/pthread/ppc64',
457-
],
458-
}],
459-
['"<(real_os_name)"=="OS400"', {
460-
'ldflags': [
461-
'-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
462-
'-Wl,-brtl',
463-
],
464-
}],
465-
],
466-
'ldflags': [ '-Wl,-bbigtoc' ],
467-
'ldflags!': [ '-rdynamic' ],
468-
}],
469422
[ 'node_shared=="true"', {
470423
'cflags': [ '-fPIC' ],
471424
}],
472425
],
473426
}],
427+
[ 'OS=="aix"', {
428+
'variables': {
429+
# Used to differentiate `AIX` and `OS400`(IBM i).
430+
'aix_variant_name': '<!(uname -s)',
431+
},
432+
'cflags': [ '-maix64', ],
433+
'ldflags!': [ '-rdynamic', ],
434+
'ldflags': [
435+
'-Wl,-bbigtoc',
436+
'-maix64',
437+
],
438+
'conditions': [
439+
[ '"<(aix_variant_name)"=="OS400"', { # a.k.a. `IBM i`
440+
'ldflags': [
441+
'-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
442+
'-Wl,-brtl',
443+
],
444+
}, { # else it's `AIX`
445+
'ldflags': [
446+
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread/ppc64',
447+
],
448+
}],
449+
],
450+
}],
474451
['OS=="android"', {
475452
'target_conditions': [
476453
['_toolset=="target"', {

Diff for: node.gyp

-21
Original file line numberDiff line numberDiff line change
@@ -981,34 +981,13 @@
981981

982982
'conditions': [
983983
[ 'OS=="aix" and node_shared=="true"', {
984-
'variables': {'real_os_name': '<!(uname -s)',},
985984
'targets': [
986985
{
987986
'target_name': 'node_aix_shared',
988987
'type': 'shared_library',
989988
'product_name': '<(node_core_target_name)',
990989
'ldflags': [ '--shared' ],
991990
'product_extension': '<(shlib_suffix)',
992-
'conditions': [
993-
['target_arch=="ppc64"', {
994-
'ldflags': [
995-
'-Wl,-blibpath:/usr/lib:/lib:'
996-
'/opt/freeware/lib/pthread/ppc64'
997-
],
998-
}],
999-
['target_arch=="ppc"', {
1000-
'ldflags': [
1001-
'-Wl,-blibpath:/usr/lib:/lib:/opt/freeware/lib/pthread'
1002-
],
1003-
}],
1004-
['"<(real_os_name)"=="OS400"', {
1005-
'ldflags': [
1006-
'-Wl,-blibpath:/QOpenSys/pkgs/lib:/QOpenSys/usr/lib',
1007-
'-Wl,-bbigtoc',
1008-
'-Wl,-brtl',
1009-
],
1010-
}],
1011-
],
1012991
'includes': [
1013992
'node.gypi'
1014993
],

0 commit comments

Comments
 (0)