diff --git a/aclocal.m4 b/aclocal.m4 index 6a3100883865..a9f78c0c0618 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -14,7 +14,6 @@ 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/acwinpaths.m4)dnl -builtin(include, build/autoconf/lto.m4)dnl MOZ_PROG_CHECKMSYS() diff --git a/build/autoconf/lto.m4 b/build/autoconf/lto.m4 deleted file mode 100644 index d7a9802166a5..000000000000 --- a/build/autoconf/lto.m4 +++ /dev/null @@ -1,15 +0,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 </dev/null 2>&1; then - if grep '^target triple =' conftest.s; then - $1=yes - fi - fi - rm -f conftest.[cs] -]) diff --git a/configure.in b/configure.in index bff690ce86b7..53addfa082cb 100644 --- a/configure.in +++ b/configure.in @@ -1982,8 +1982,6 @@ fi AC_DEFINE_UNQUOTED(MOZILLA_VERSION,"$MOZILLA_VERSION") AC_DEFINE_UNQUOTED(MOZILLA_VERSION_U,$MOZILLA_VERSION) -MOZ_DOING_LTO(lto_is_enabled) - dnl ======================================================== dnl System overrides of the defaults for target dnl ======================================================== @@ -2085,11 +2083,9 @@ case "$target" in # builds. MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling" - 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 diff --git a/js/src/build/autoconf/lto.m4 b/js/src/build/autoconf/lto.m4 deleted file mode 100644 index d7a9802166a5..000000000000 --- a/js/src/build/autoconf/lto.m4 +++ /dev/null @@ -1,15 +0,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 </dev/null 2>&1; then - if grep '^target triple =' conftest.s; then - $1=yes - fi - fi - rm -f conftest.[cs] -]) diff --git a/js/src/configure.in b/js/src/configure.in index b629bd454254..4df7a01365a3 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -1886,8 +1886,6 @@ if test "$_python_res" != 0; then fi AC_MSG_RESULT([yes]) -MOZ_DOING_LTO(lto_is_enabled) - dnl ======================================================== dnl System overrides of the defaults for target dnl ======================================================== @@ -1992,11 +1990,9 @@ case "$target" in # builds. MOZ_DEBUG_LDFLAGS="$MOZ_DEBUG_LDFLAGS -framework ExceptionHandling" - 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