Compile zend_execute.c with special CFLAGS. For GCC, INLINE_CFLAGS

contains -O0 to disable optimizations. This can be disabled by using
the appropiate parameter.

diff --git a/Zend/Makefile.am b/Zend/Makefile.am
index 9a78e162d3d23c0f3657cb2b691b6d901e062b2b..190170c728c0ebe92ab618e0a0fd7e8ddf8151b5 100644 (file)
--- a/Zend/Makefile.am
+++ b/Zend/Makefile.am
@@ -20,7 +20,7 @@ libZend_la_SOURCES=\
 libZend_la_LIBADD = $(ZEND_SCANNER)
 libZend_la_LDFLAGS = @EXTRA_LIBS@
 libZend_la_DEPENDENCIES = $(ZEND_SCANNER)
-
+       
 # automake isn't too clever about "non-standard" use of lex and yacc
 
 zend-scanner.l: zend-parser.h
@@ -35,3 +35,5 @@ zend-parser.h: zend-parser.c
 zend-parser.c: zend-parser.y
        $(YACC) -p zend -v -d $(srcdir)/zend-parser.y -o zend-parser.c
 
+zend_execute.lo: $(srcdir)/zend_execute.c
+       $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(INLINE_CFLAGS) -c $(srcdir)/zend_execute.c

diff --git a/Zend/Zend.m4 b/Zend/Zend.m4
index 3234844d88b6ff265ff5b9724658e01a7687ff6f..492185d29924fcd5171e60bf55b6276a70ba126f 100644 (file)
--- a/Zend/Zend.m4
+++ b/Zend/Zend.m4
@@ -111,12 +111,13 @@ AC_ARG_ENABLE(experimental-zts,
 ],[
   ZEND_EXPERIMENTAL_ZTS=no
 ])  
-               
-AC_ARG_ENABLE(inline,
-[  --disable-inline        Disable the inline specifier],[
-  ZEND_INLINE=$enableval
+
+AC_ARG_ENABLE(large-mem,
+[  --enable-inline-optimization   If you have much memory and are using
+                                 gcc, you might try this.],[
+  ZEND_INLINE_OPTIMIZATION=$enableval
 ],[
-  ZEND_INLINE=yes
+  ZEND_INLINE_OPTIMIZATION=no
 ])
 
 AC_ARG_ENABLE(memory-limit,
@@ -129,8 +130,8 @@ AC_ARG_ENABLE(memory-limit,
 AC_MSG_CHECKING(whether to enable experimental ZTS)
 AC_MSG_RESULT($ZEND_EXPERIMENTAL_ZTS)
 
-AC_MSG_CHECKING(whether to enable inline)
-AC_MSG_RESULT($ZEND_INLINE)
+AC_MSG_CHECKING(whether to enable inline optimization for GCC)
+AC_MSG_RESULT($ZEND_INLINE_OPTIMIZATION)
 
 AC_MSG_CHECKING(whether to enable a memory limit)
 AC_MSG_RESULT($ZEND_MEMORY_LIMIT)
@@ -167,12 +168,17 @@ else
   AC_DEFINE(MEMORY_LIMIT, 0, [Memory limit])
 fi
 
-if test "$ZEND_INLINE" = "yes"; then
-  AC_C_INLINE
+changequote({,})
+if test -n "$GCC" && test "$ZEND_INLINE_OPTIMIZATION" != "yes"; then
+  INLINE_CFLAGS="`echo $ac_n "$CFLAGS $ac_c"|sed 's/-O[0-9]*//'` -O0"
 else
-  AC_DEFINE(inline, [])
+  INLINE_CFLAGS="$CFLAGS"
 fi
+changequote([,])
+
+AC_C_INLINE
 
+AC_SUBST(INLINE_CFLAGS)
 
 ])