Commit 8c199b7a authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1513798 - Revert bug 638149 and leave it to configure to set -dead_strip. r=nalexander 

We're always setting -dead_strip on mac builds, per
cross-mozconfig.common, we might as well not do that and revert bug
638149, which disabled adding -dead_strip with LTO: that is apparently
not a problem anymore.

Differential Revision: https://phabricator.services.mozilla.com/D14373
parent 463bafbd

aclocal.m4

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ builtin(include, build/autoconf/codeset.m4)dnl 
builtin(include, build/autoconf/altoptions.m4)dnl

builtin(include, build/autoconf/mozprog.m4)dnl

builtin(include, build/autoconf/mozheader.m4)dnl

builtin(include, build/autoconf/lto.m4)dnl

builtin(include, build/autoconf/frameptr.m4)dnl

builtin(include, build/autoconf/compiler-opts.m4)dnl

builtin(include, build/autoconf/expandlibs.m4)dnl

build/autoconf/lto.m4

deleted100644 → 0
+0 −19
Original line number Diff line number Diff line 
dnl This Source Code Form is subject to the terms of the Mozilla Public

dnl License, v. 2.0. If a copy of the MPL was not distributed with this

dnl file, You can obtain one at http://mozilla.org/MPL/2.0/.



dnl check if the build is using lto. This is really primitive and only detects llvm based

dnl compilers right now.

AC_DEFUN([MOZ_DOING_LTO],

[

  cat > conftest.c <<EOF

                  int foo = 1;

EOF

  $1=no

  if ${CC-cc} ${CFLAGS} -S conftest.c -o conftest.s >/dev/null 2>&1; then

    if grep '^target triple =' conftest.s; then

      $1=yes

    fi

  fi

  rm -f conftest.[cs]

])

build/macosx/cross-mozconfig.common

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ export CC="$topsrcdir/clang/bin/clang $FLAGS" 
export CXX="$topsrcdir/clang/bin/clang++ $FLAGS"

export CPP="$topsrcdir/clang/bin/clang $FLAGS -E"

export LLVMCONFIG=$topsrcdir/clang/bin/llvm-config

export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT -Wl,-dead_strip"

export LDFLAGS="-Wl,-syslibroot,$CROSS_SYSROOT"

export BINDGEN_CFLAGS="$FLAGS"

export TOOLCHAIN_PREFIX=$CROSS_CCTOOLS_PATH/bin/x86_64-apple-darwin11-

export DSYMUTIL=$topsrcdir/build/macosx/llvm-dsymutil

js/src/aclocal.m4

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ builtin(include, ../../build/autoconf/codeset.m4)dnl 
builtin(include, ../../build/autoconf/altoptions.m4)dnl

builtin(include, ../../build/autoconf/mozprog.m4)dnl

builtin(include, ../../build/autoconf/mozheader.m4)dnl

builtin(include, ../../build/autoconf/lto.m4)dnl

builtin(include, ../../build/autoconf/frameptr.m4)dnl

builtin(include, ../../build/autoconf/compiler-opts.m4)dnl

builtin(include, ../../build/autoconf/expandlibs.m4)dnl

js/src/old-configure.in

+1 −5
Original line number Diff line number Diff line
@@ -556,8 +556,6 @@ case "$host" in 
    ;;

esac



MOZ_DOING_LTO(lto_is_enabled)



dnl ========================================================

dnl Add optional and non-optional hardening flags from toolchain.configure

dnl ========================================================
@@ -593,11 +591,9 @@ case "$target" in 
    fi

    LDFLAGS=$_SAVE_LDFLAGS



    if test "x$lto_is_enabled" = "xyes"; then

        echo "Skipping -dead_strip because lto is enabled."

    dnl DTrace and -dead_strip don't interact well. See bug 403132.

    dnl ===================================================================

    elif test "x$enable_dtrace" = "xyes"; then

    if test "x$enable_dtrace" = "xyes"; then

        echo "Skipping -dead_strip because DTrace is enabled. See bug 403132."

    else

        dnl check for the presence of the -dead_strip linker flag