OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clean up build-many-glibcs.py libcilkrts disabling.

Browse Source 
The disabling of libcilkrts in build-many-glibcs.py has some
peculiarities.  It's only for the final GCC build, not the initial
bootstrap one, whereas normally anything disabled for the final build
should be disabled for the bootstrap one as well.  And it's only for
Hurd, when it's more natural by analogy with the libsanitizer
disabling to disable this library unconditionally, not only for
targets where it's known to break.  This patch cleans up that
disabling accordingly, adding a comment so it's obvious it can be
removed once GCC 7 is too old to build glibc.

	* scripts/build-many-glibcs.py (Config.build_gcc): Use
	--disable-libcilkrts unconditionally, not just for the final GCC
	build for Hurd.
This commit is contained in:
Joseph Myers 2018-01-29 13:49:21 +00:00
parent 522623e4aa
commit 088de7d009
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2018-01-29 Joseph Myers <joseph@codesourcery.com> 2018-01-29 Joseph Myers <joseph@codesourcery.com>
* scripts/build-many-glibcs.py (Config.build_gcc): Use
--disable-libcilkrts unconditionally, not just for the final GCC
build for Hurd.
* scripts/build-many-glibcs.py (Context.checkout): Default Linux * scripts/build-many-glibcs.py (Context.checkout): Default Linux
version to 4.15. version to 4.15.

8
scripts/build-many-glibcs.py
View File

@ -1311,8 +1311,12 @@ class Config(object):
# libsanitizer commonly breaks because of glibc header # libsanitizer commonly breaks because of glibc header
# changes, or on unusual targets. libssp is of little # changes, or on unusual targets. libssp is of little
# relevance with glibc's own stack checking support. # relevance with glibc's own stack checking support.
# libcilkrts does not support GNU/Hurd (and has been removed
# in GCC 8, so --disable-libcilkrts can be removed once glibc
# no longer supports building with older GCC versions).
cfg_opts = list(self.gcc_cfg) cfg_opts = list(self.gcc_cfg)
cfg_opts += ['--disable-libsanitizer', '--disable-libssp'] cfg_opts += ['--disable-libsanitizer', '--disable-libssp',
'--disable-libcilkrts']
host_libs = self.ctx.host_libraries_installdir host_libs = self.ctx.host_libraries_installdir
cfg_opts += ['--with-gmp=%s' % host_libs, cfg_opts += ['--with-gmp=%s' % host_libs,
'--with-mpfr=%s' % host_libs, '--with-mpfr=%s' % host_libs,
@ -1343,8 +1347,6 @@ class Config(object):
tool_build = 'gcc' tool_build = 'gcc'
cfg_opts += ['--enable-languages=c,c++', '--enable-shared', cfg_opts += ['--enable-languages=c,c++', '--enable-shared',
'--enable-threads'] '--enable-threads']
if self.os == 'gnu':
cfg_opts += ['--disable-libcilkrts']
self.build_cross_tool(cmdlist, 'gcc', tool_build, cfg_opts) self.build_cross_tool(cmdlist, 'gcc', tool_build, cfg_opts)