cvs: ZendEngine2 / Zend.m4 zend.h zend_execute.c php-src configure.in

moriyoshi Wed Nov 3 18:05:21 2004 EDT Modified files: /php-src configure.in /ZendEngine2 Zend.m4 zend.h zend_execute.c Log: - Checks for Darwin'ish systems that uses Mach-O, which apparently doesn't support weak symbol aliasing at this time. http://cvs.php.net/diff.php/php-src/configure.in?r1=1.523&r2=1.524&ty=u Index: php-src/configure.in diff -u php-src/configure.in:1.523 php-src/configure.in:1.524 --- php-src/configure.in:1.523 Wed Nov 3 09:07:09 2004 +++ php-src/configure.in Wed Nov 3 18:05:15 2004 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.523 2004/11/03 14:07:09 jorton Exp $ -*- autoconf -*- +dnl ## $Id: configure.in,v 1.524 2004/11/03 23:05:15 moriyoshi Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -36,6 +36,8 @@ done AC_CANONICAL_HOST +AC_CANONICAL_TARGET + AC_CONFIG_HEADER(main/php_config.h) MAJOR_VERSION=5 http://cvs.php.net/diff.php/ZendEngine2/Zend.m4?r1=1.44&r2=1.45&ty=u Index: ZendEngine2/Zend.m4 diff -u ZendEngine2/Zend.m4:1.44 ZendEngine2/Zend.m4:1.45 --- ZendEngine2/Zend.m4:1.44 Mon Oct 4 15:54:34 2004 +++ ZendEngine2/Zend.m4 Wed Nov 3 18:05:17 2004 @@ -1,5 +1,5 @@ dnl -dnl $Id: Zend.m4,v 1.44 2004/10/04 19:54:34 andi Exp $ +dnl $Id: Zend.m4,v 1.45 2004/11/03 23:05:17 moriyoshi Exp $ dnl dnl This file contains Zend specific autoconf functions. dnl @@ -211,6 +211,13 @@ AC_SUBST(INLINE_CFLAGS) +AC_MSG_CHECKING(target system is Darwin) +if echo "$target" | grep "darwin"; then + AC_DEFINE([DARWIN], 1, [Define if the target system is darwin]) + AC_MSG_RESULT(yes) +else + AC_MSG_RESULT(no) +fi dnl test and set the alignment define for ZEND_MM dnl this also does the logarithmic test for ZEND_MM. http://cvs.php.net/diff.php/ZendEngine2/zend.h?r1=1.265&r2=1.266&ty=u Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.265 ZendEngine2/zend.h:1.266 --- ZendEngine2/zend.h:1.265 Sat Oct 30 18:56:59 2004 +++ ZendEngine2/zend.h Wed Nov 3 18:05:17 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.h,v 1.265 2004/10/30 22:56:59 helly Exp $ */ +/* $Id: zend.h,v 1.266 2004/11/03 23:05:17 moriyoshi Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -177,7 +177,7 @@ #endif -#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(__darwin__) && !defined(__APPLE__) +#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) # define do_alloca(p) alloca(p) # define free_alloca(p) #else http://cvs.php.net/diff.php/ZendEngine2/zend_execute.c?r1=1.684&r2=1.685&ty=u Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.684 ZendEngine2/zend_execute.c:1.685 --- ZendEngine2/zend_execute.c:1.684 Fri Oct 22 17:42:14 2004 +++ ZendEngine2/zend_execute.c Wed Nov 3 18:05:18 2004 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.684 2004/10/22 21:42:14 andi Exp $ */ +/* $Id: zend_execute.c,v 1.685 2004/11/03 23:05:18 moriyoshi Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -42,7 +42,7 @@ #define _UNUSED_CODE 3 #define _CV_CODE 4 -#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(ZEND_VM_OLD_EXECUTOR) +#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(DARWIN) && !defined(ZEND_VM_OLD_EXECUTOR) # define ZEND_VM_ALWAYS_INLINE __attribute__ ((always_inline)) void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((alias("zend_error"),noreturn)); /*extern void zend_error_noreturn(int type, const char *format, ...) __asm__("zend_error") __attribute__ ((noreturn));*/