Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 343894f

Browse filesBrowse files
iandrcaddaleax
authored andcommitted
build: toolchain.gypi and node_gyp.py cleanup
Removed `linux_use_gold_flag`, `linux_use_bundled_gold` and `linux_use_bundled_binutils` flags from `tools/v8_gypfiles/toolchain.gypi` and `/tools/gyp_node.py`. Fixes: #34256 PR-URL: #34268 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent f350b51 commit 343894f
Copy full SHA for 343894f

File tree

Expand file treeCollapse file tree

2 files changed

+0
-75
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

2 files changed

+0
-75
lines changed
Open diff view settings
Collapse file

‎tools/gyp_node.py‎

Copy file name to clipboardExpand all lines: tools/gyp_node.py
-12Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,6 @@ def run_gyp(args):
4545
args.append('-Dcomponent=static_library')
4646
args.append('-Dlibrary=static_library')
4747

48-
# Don't compile with -B and -fuse-ld=, we don't bundle ld.gold. Can't be
49-
# set in common.gypi due to how deps/v8/build/toolchain.gypi uses them.
50-
args.append('-Dlinux_use_bundled_binutils=0')
51-
args.append('-Dlinux_use_bundled_gold=0')
52-
args.append('-Dlinux_use_gold_flags=0')
53-
54-
# Set the current program to this module. This is done because gyp
55-
# will use the program path in targets it generates. If this script was called
56-
# by another script the program name will not be gyp_node.py but whatever
57-
# the name of the script that called it is, leading to incorrect commands
58-
# in generated targets (for example cmd_regen_makefile).
59-
sys.argv[0] = os.path.abspath(__file__)
6048
rc = gyp.main(args)
6149
if rc != 0:
6250
print('Error running GYP')
Collapse file

‎tools/v8_gypfiles/toolchain.gypi‎

Copy file name to clipboardExpand all lines: tools/v8_gypfiles/toolchain.gypi
-63Lines changed: 0 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -99,34 +99,6 @@
9999
['OS=="linux" and host_arch=="ia32"', {
100100
'binutils_dir%': 'third_party/binutils/Linux_ia32/Release/bin',
101101
}],
102-
103-
# linux_use_bundled_gold: whether to use the gold linker binary checked
104-
# into third_party/binutils. Force this off via GYP_DEFINES when you
105-
# are using a custom toolchain and need to control -B in ldflags.
106-
# Do not use 32-bit gold on 32-bit hosts as it runs out address space
107-
# for component=static_library builds.
108-
['((OS=="linux" or OS=="android") and (target_arch=="x64" or target_arch=="arm" or (target_arch=="ia32" and host_arch=="x64"))) or (OS=="linux" and target_arch=="mipsel")', {
109-
'linux_use_bundled_gold%': 1,
110-
}, {
111-
'linux_use_bundled_gold%': 0,
112-
}],
113-
# linux_use_bundled_binutils: whether to use the binary binutils
114-
# checked into third_party/binutils. These are not multi-arch so cannot
115-
# be used except on x86 and x86-64 (the only two architectures which
116-
# are currently checke in). Force this off via GYP_DEFINES when you
117-
# are using a custom toolchain and need to control -B in cflags.
118-
['OS=="linux" and (target_arch=="ia32" or target_arch=="x64")', {
119-
'linux_use_bundled_binutils%': 1,
120-
}, {
121-
'linux_use_bundled_binutils%': 0,
122-
}],
123-
# linux_use_gold_flags: whether to use build flags that rely on gold.
124-
# On by default for x64 Linux.
125-
['OS=="linux" and target_arch=="x64"', {
126-
'linux_use_gold_flags%': 1,
127-
}, {
128-
'linux_use_gold_flags%': 0,
129-
}],
130102
],
131103

132104
# Indicates if gcmole tools are downloaded by a hook.
@@ -982,26 +954,6 @@
982954
'-mx32',
983955
],
984956
}], # v8_target_arch=="x32"
985-
['linux_use_gold_flags==1', {
986-
# Newer gccs and clangs support -fuse-ld, use the flag to force gold
987-
# selection.
988-
# gcc -- http://gcc.gnu.org/onlinedocs/gcc-4.8.0/gcc/Optimize-Options.html
989-
'ldflags': [ '-fuse-ld=gold', ],
990-
}],
991-
['linux_use_bundled_binutils==1', {
992-
'cflags': [
993-
'-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)',
994-
],
995-
}],
996-
['linux_use_bundled_gold==1', {
997-
# Put our binutils, which contains gold in the search path. We pass
998-
# the path to gold to the compiler. gyp leaves unspecified what the
999-
# cwd is when running the compiler, so the normal gyp path-munging
1000-
# fails us. This hack gets the right path.
1001-
'ldflags': [
1002-
'-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)',
1003-
],
1004-
}],
1005957
['OS=="win"', {
1006958
'defines': [
1007959
'WIN32',
@@ -1187,21 +1139,6 @@
11871139
}],
11881140
],
11891141
}],
1190-
['linux_use_gold_flags==1', {
1191-
'target_conditions': [
1192-
['_toolset=="target"', {
1193-
'ldflags': [
1194-
# Experimentation found that using four linking threads
1195-
# saved ~20% of link time.
1196-
# https://groups.google.com/a/chromium.org/group/chromium-dev/browse_thread/thread/281527606915bb36
1197-
# Only apply this to the target linker, since the host
1198-
# linker might not be gold, but isn't used much anyway.
1199-
'-Wl,--threads',
1200-
'-Wl,--thread-count=4',
1201-
],
1202-
}],
1203-
],
1204-
}],
12051142
['v8_optimized_debug==0', {
12061143
'msvs_settings': {
12071144
'VCCLCompilerTool': {

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.