corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1480004 - Normalize optimization level passed to the linker when doing LTO with clang. r=froydnj

Browse Source
This commit is contained in:
Mike Hommey
2018-08-10 14:51:28 +09:00
parent 8b06c2a758
commit a77ace2bc7
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/src/old-configure.in
View File

@@ -1420,6 +1420,17 @@ if test -n "$MOZ_OPTIMIZE"; then
AC_MSG_ERROR([These compiler flags are invalid: $MOZ_OPTIMIZE_FLAGS]) AC_MSG_ERROR([These compiler flags are invalid: $MOZ_OPTIMIZE_FLAGS])
fi fi
CFLAGS=$_SAVE_CFLAGS CFLAGS=$_SAVE_CFLAGS
if test -n "$MOZ_LTO" -a -n "$CLANG_CC"; then
# When using llvm-based LTO, non numeric optimization levels are
# not supported by the linker, so force the linker to use -O2 (
# which doesn't influence the level compilation units are actually
# compiled at).
case " $MOZ_OPTIMIZE_FLAGS " in
*\ -Os\ *|*\ -Oz\ *)
MOZ_OPTIMIZE_LDFLAGS="$MOZ_OPTIMIZE_LDFLAGS -O2"
;;
esac
fi
fi fi
fi # COMPILE_ENVIRONMENT fi # COMPILE_ENVIRONMENT

11
old-configure.in
View File

@@ -3469,6 +3469,17 @@ if test -n "$MOZ_OPTIMIZE"; then
AC_MSG_ERROR([These compiler flags for C are invalid: $MOZ_OPTIMIZE_FLAGS]) AC_MSG_ERROR([These compiler flags for C are invalid: $MOZ_OPTIMIZE_FLAGS])
fi fi
CFLAGS=$_SAVE_CFLAGS CFLAGS=$_SAVE_CFLAGS
if test -n "$MOZ_LTO" -a -n "$CLANG_CC"; then
# When using llvm-based LTO, non numeric optimization levels are
# not supported by the linker, so force the linker to use -O2 (
# which doesn't influence the level compilation units are actually
# compiled at).
case " $MOZ_OPTIMIZE_FLAGS " in
*\ -Os\ *|*\ -Oz\ *)
MOZ_OPTIMIZE_LDFLAGS="$MOZ_OPTIMIZE_LDFLAGS -O2"
;;
esac
fi
fi fi
fi # COMPILE_ENVIRONMENT fi # COMPILE_ENVIRONMENT