Skip to content

Commit 7c1e093

Browse files
committed
Remove TSRM_CHECK_GCC_ARG and LIBZEND_CPLUSPLUS_CHECKS
This removes two old Autoconf macro definitions since they are not used anymore.
1 parent b719aa4 commit 7c1e093

File tree

4 files changed

+2
-29
lines changed

4 files changed

+2
-29
lines changed

TSRM/tsrm.m4

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,5 @@
11
m4_include([TSRM/m4/ax_func_which_gethostbyname_r.m4])
22

3-
dnl TSRM_CHECK_GCC_ARG(ARG, ACTION-IF-FOUND, ACTION-IF-NOT_FOUND)
4-
AC_DEFUN([TSRM_CHECK_GCC_ARG],[
5-
gcc_arg_name=[ac_cv_gcc_arg]translit($1,A-Z-,a-z_)
6-
AC_CACHE_CHECK([whether $CC supports $1], [ac_cv_gcc_arg]translit($1,A-Z-,a-z_), [
7-
echo 'void somefunc() { };' > conftest.c
8-
cmd='$CC $1 -c conftest.c'
9-
if eval $cmd 2>&1 | egrep -e $1 >/dev/null ; then
10-
ac_result=no
11-
else
12-
ac_result=yes
13-
fi
14-
eval $gcc_arg_name=$ac_result
15-
rm -f conftest.*
16-
])
17-
if eval test "\$$gcc_arg_name" = "yes"; then
18-
$2
19-
else
20-
:
21-
$3
22-
fi
23-
])
24-
253
AC_DEFUN([TSRM_BASIC_CHECKS],[
264
275
AC_REQUIRE([AC_PROG_CC])dnl

UPGRADING.INTERNALS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ PHP 7.3 INTERNALS UPGRADE NOTES
179179
========================
180180

181181
a. Unix build system changes
182-
- PHP_PROG_LEX macro has been removed.
182+
- PHP_PROG_LEX, TSRM_CHECK_GCC_ARG, and LIBZEND_CPLUSPLUS_CHECKS Autoconf
183+
macros have been removed.
183184

184185
b. Windows build system changes
185186
- ZEND_WIN32_FORCE_INLINE doesn't affect C++ anymore. zend_always_inline is

Zend/Zend.m4

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLAGS $DEBUG_CFLAGS"
192192
if test "$ZEND_MAINTAINER_ZTS" = "yes"; then
193193
AC_DEFINE(ZTS,1,[ ])
194194
CFLAGS="$CFLAGS -DZTS"
195-
LIBZEND_CPLUSPLUS_CHECKS
196195
fi
197196
198197
changequote({,})
@@ -388,10 +387,6 @@ AC_MSG_RESULT($ZEND_SIGNALS)
388387
389388
])
390389

391-
AC_DEFUN([LIBZEND_CPLUSPLUS_CHECKS],[
392-
393-
])
394-
395390
AC_MSG_CHECKING(whether /dev/urandom exists)
396391
if test -r "/dev/urandom" && test -c "/dev/urandom"; then
397392
AC_DEFINE([HAVE_DEV_URANDOM], 1, [Define if the target system has /dev/urandom device])

acinclude.m4

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,6 @@ dnl If successful, adds -rdynamic to PHP_LDFLAGS.
283283
dnl
284284
AC_DEFUN([PHP_TARGET_RDYNAMIC],[
285285
if test -n "$GCC"; then
286-
dnl we should use a PHP-specific macro here
287286
PHP_CHECK_GCC_ARG(-rdynamic, gcc_rdynamic=yes)
288287
if test "$gcc_rdynamic" = "yes"; then
289288
PHP_LDFLAGS="$PHP_LDFLAGS -rdynamic"

0 commit comments

Comments
 (0)