зеркало из https://github.com/mozilla/pjs.git
Bug 753248 - [10.7][10.8] crash in coreclr with Silverlight applications with builds made on OS X 10.7 (Lion). r=ted
This commit is contained in:
Родитель
c75c9be004
Коммит
cd947acb24
|
@ -308,6 +308,8 @@ MOZ_PGO_OPTIMIZE_FLAGS = @MOZ_PGO_OPTIMIZE_FLAGS@
|
|||
MOZ_OPTIMIZE_LDFLAGS = @MOZ_OPTIMIZE_LDFLAGS@
|
||||
MOZ_OPTIMIZE_SIZE_TWEAK = @MOZ_OPTIMIZE_SIZE_TWEAK@
|
||||
|
||||
MOZ_ALLOW_HEAP_EXECUTE_FLAGS = @MOZ_ALLOW_HEAP_EXECUTE_FLAGS@
|
||||
|
||||
MOZ_RTTI_FLAGS_ON = @_MOZ_RTTI_FLAGS_ON@
|
||||
|
||||
PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@
|
||||
|
|
17
configure.in
17
configure.in
|
@ -2268,6 +2268,22 @@ case "$target" in
|
|||
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
fi
|
||||
|
||||
dnl With newer linkers we need to pass -allow_heap_execute because of
|
||||
dnl Microsoft Silverlight (5.1.10411.0 at least).
|
||||
AC_MSG_CHECKING([for -allow_heap_execute option to ld])
|
||||
_SAVE_LDFLAGS=$LDFLAGS
|
||||
LDFLAGS="$LDFLAGS -Wl,-allow_heap_execute"
|
||||
AC_TRY_LINK(,[return 0;],_HAVE_ALLOW_HEAP_EXECUTE=1,
|
||||
_HAVE_ALLOW_HEAP_EXECUTE=)
|
||||
if test -n "$_HAVE_ALLOW_HEAP_EXECUTE" ; then
|
||||
AC_MSG_RESULT([yes])
|
||||
MOZ_ALLOW_HEAP_EXECUTE_FLAGS="-Wl,-allow_heap_execute"
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
LDFLAGS=$_SAVE_LDFLAGS
|
||||
|
||||
MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
|
||||
;;
|
||||
|
||||
|
@ -7015,6 +7031,7 @@ AC_SUBST(MOZ_OPTIMIZE)
|
|||
AC_SUBST(MOZ_FRAMEPTR_FLAGS)
|
||||
AC_SUBST(MOZ_OPTIMIZE_FLAGS)
|
||||
AC_SUBST(MOZ_OPTIMIZE_LDFLAGS)
|
||||
AC_SUBST(MOZ_ALLOW_HEAP_EXECUTE_FLAGS)
|
||||
AC_SUBST(MOZ_OPTIMIZE_SIZE_TWEAK)
|
||||
AC_SUBST(MOZ_PGO_OPTIMIZE_FLAGS)
|
||||
|
||||
|
|
|
@ -62,6 +62,8 @@ endif
|
|||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
LDFLAGS += $(MOZ_ALLOW_HEAP_EXECUTE_FLAGS)
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT) #{
|
||||
#
|
||||
# Control the default heap size.
|
||||
|
|
Загрузка…
Ссылка в новой задаче