diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index 7c715e853bf5b..b0f913aac3e09 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -196,18 +196,9 @@ AC_ARG_ENABLE([zts], [ZEND_ZTS=$enableval], [ZEND_ZTS=no]) -AC_ARG_ENABLE([inline-optimization], - [AS_HELP_STRING([--disable-inline-optimization], - [If building zend_execute.lo fails, try this switch])], - [ZEND_INLINE_OPTIMIZATION=$enableval], - [ZEND_INLINE_OPTIMIZATION=yes]) - AC_MSG_CHECKING(whether to enable thread-safety) AC_MSG_RESULT($ZEND_ZTS) -AC_MSG_CHECKING(whether to enable inline optimization for GCC) -AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION) - AC_MSG_CHECKING(whether to enable Zend debugging) AC_MSG_RESULT($ZEND_DEBUG) @@ -232,18 +223,8 @@ if test "$ZEND_ZTS" = "yes"; then CFLAGS="$CFLAGS -DZTS" fi -changequote({,}) -if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then - INLINE_CFLAGS=`echo $ac_n "$CFLAGS $ac_c" | sed s/-O[0-9s]*//` -else - INLINE_CFLAGS="$CFLAGS" -fi -changequote([,]) - AC_C_INLINE -AC_SUBST(INLINE_CFLAGS) - AC_MSG_CHECKING(target system is Darwin) if echo "$target" | grep "darwin" > /dev/null; then AC_DEFINE([DARWIN], 1, [Define if the target system is darwin]) diff --git a/configure.ac b/configure.ac index 4f291b45d6282..ded516b01f095 100644 --- a/configure.ac +++ b/configure.ac @@ -1371,7 +1371,6 @@ old_CC=$CC if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags" - INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags" CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags" fi @@ -1425,7 +1424,6 @@ PHP_CONFIGURE_PART(Generating files) CXXFLAGS_CLEAN=$CXXFLAGS CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)" CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" -INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then @@ -1470,7 +1468,7 @@ PHP_ADD_SOURCES(Zend, \ zend_execute_API.c zend_highlight.c zend_llist.c \ zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \ zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \ - zend_list.c zend_builtin_functions.c zend_attributes.c \ + zend_list.c zend_builtin_functions.c zend_attributes.c zend_execute.c \ zend_ini.c zend_sort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \ zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \ zend_closures.c zend_weakrefs.c zend_float.c zend_string.c zend_signal.c zend_generators.c \ @@ -1478,16 +1476,6 @@ PHP_ADD_SOURCES(Zend, \ zend_default_classes.c zend_inheritance.c zend_smart_str.c zend_cpuinfo.c zend_gdb.c, \ -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1) -dnl Selectively disable optimization due to high RAM usage during compiling the -dnl executor. -if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then - flag=-O0 -else - flag= -fi - -PHP_ADD_SOURCES_X(Zend, zend_execute.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1,PHP_GLOBAL_OBJS,,$flag) - PHP_ADD_BUILD_DIR(main main/streams) PHP_ADD_BUILD_DIR(TSRM) PHP_ADD_BUILD_DIR(Zend)