☠☠ backed out by 6c83f735355d ☠ ☠ | |
author | Mike Hommey <mh+mozilla@glandium.org> |
Fri, 31 Aug 2018 14:00:14 +0900 | |
changeset 434335 | 331706d8558f8dadeba4fbf5f56651130d43f092 |
parent 434334 | d78b833293db7633edf815964d76b2c374ce60a2 |
child 434355 | 0aa31e702587617919d21d135d757b1004dd6aca |
child 434357 | dcef4c14d55eb3e5416ba9ce53356449e57e4a0d |
push id | 107337 |
push user | mh@glandium.org |
push date | Fri, 31 Aug 2018 22:21:13 +0000 |
treeherder | mozilla-inbound@331706d8558f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | froydnj |
bugs | 1487595 |
milestone | 63.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
build/autoconf/expandlibs.m4 | file | annotate | diff | comparison | revisions | |
build/moz.configure/toolchain.configure | file | annotate | diff | comparison | revisions |
--- a/build/autoconf/expandlibs.m4 +++ b/build/autoconf/expandlibs.m4 @@ -9,29 +9,33 @@ dnl = dnl = Check what kind of list files are supported by the dnl = linker dnl = dnl ======================================================== AC_CACHE_CHECK(what kind of list files are supported by the linker, EXPAND_LIBS_LIST_STYLE, [echo "int main() {return 0;}" > conftest.${ac_ext} - if AC_TRY_COMMAND(${CC-cc} -o conftest.${OBJ_SUFFIX} -c $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5) && test -s conftest.${OBJ_SUFFIX}; then + dnl Because BFD ld doesn't work with LTO + linker scripts, we + dnl must pass the LTO CFLAGS to the compile command, and the LTO + dnl LDFLAGS to all subsequent link commands. + dnl https://sourceware.org/bugzilla/show_bug.cgi?id=23600 + if AC_TRY_COMMAND(${CC-cc} -o conftest.${OBJ_SUFFIX} -c $MOZ_LTO_CFLAGS $CFLAGS $CPPFLAGS conftest.${ac_ext} 1>&5) && test -s conftest.${OBJ_SUFFIX}; then echo "INPUT(conftest.${OBJ_SUFFIX})" > conftest.list - if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.list $LIBS 1>&5) && test -s conftest${ac_exeext}; then + if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $MOZ_LTO_LDFLAGS $LDFLAGS conftest.list $LIBS 1>&5) && test -s conftest${ac_exeext}; then EXPAND_LIBS_LIST_STYLE=linkerscript else echo "conftest.${OBJ_SUFFIX}" > conftest.list dnl -filelist is for the OS X linker. We need to try -filelist dnl first because clang understands @file, but may pass an dnl oversized argument list to the linker depending on the dnl contents of @file. - if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS [-Wl,-filelist,conftest.list] $LIBS 1>&5) && test -s conftest${ac_exeext}; then + if AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $MOZ_LTO_LDFLAGS $LDFLAGS [-Wl,-filelist,conftest.list] $LIBS 1>&5) && test -s conftest${ac_exeext}; then EXPAND_LIBS_LIST_STYLE=filelist - elif AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS @conftest.list $LIBS 1>&5) && test -s conftest${ac_exeext}; then + elif AC_TRY_COMMAND(${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $MOZ_LTO_LDFLAGS $LDFLAGS @conftest.list $LIBS 1>&5) && test -s conftest${ac_exeext}; then EXPAND_LIBS_LIST_STYLE=list else AC_ERROR([Couldn't find one that works]) fi fi else dnl We really don't expect to get here, but just in case AC_ERROR([couldn't compile a simple C file])
--- a/build/moz.configure/toolchain.configure +++ b/build/moz.configure/toolchain.configure @@ -1402,16 +1402,18 @@ def lto(value, pgo, c_compiler): ) add_old_configure_assignment('MOZ_LTO', lto.enabled) set_config('MOZ_LTO', lto.enabled) set_define('MOZ_LTO', lto.enabled) set_config('MOZ_LTO_CFLAGS', lto.cflags) set_config('MOZ_LTO_LDFLAGS', lto.ldflags) +add_old_configure_assignment('MOZ_LTO_CFLAGS', lto.cflags) +add_old_configure_assignment('MOZ_LTO_LDFLAGS', lto.ldflags) # ASAN # ============================================================== js_option('--enable-address-sanitizer', help='Enable Address Sanitizer') @depends_if('--enable-address-sanitizer')