using the older pthread_attr_getstack* interfaces.

calculating the guard_size on freebsd.

Author: devnexen

Zend/Zend.m4

@@ -146,7 +146,7 @@ _LT_AC_TRY_DLOPEN_SELF([
 ])
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS(getpid kill sigsetjmp pthread_getattr_np pthread_attr_get_np pthread_get_stackaddr_np pthread_attr_getstack pthread_stackseg_np gettid)
+AC_CHECK_FUNCS(getpid kill sigsetjmp pthread_getattr_np pthread_attr_get_np pthread_get_stackaddr_np pthread_stackseg_np gettid)
 
 dnl Test whether the stack grows downwards
 dnl Assumes contiguous stack

Zend/zend_call_stack.c

@@ -95,6 +95,11 @@ ZEND_API void zend_call_stack_init(void) {
 	}
 }
 
+#ifdef __GNUC__
+/* pthread_attr_getstackaddr/size is a deprecated interface */
+# pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
 #ifdef __linux__
 static bool zend_call_stack_is_main_thread(void) {
 # ifdef HAVE_GETTID
@@ -121,7 +126,11 @@ static bool zend_call_stack_get_linux_pthread(zend_call_stack *stack)
 		return false;
 	}
 
-	error = pthread_attr_getstack(&attr, &addr, &max_size);
+	error = pthread_attr_getstackaddr(&attr, &addr);
+	if (error) {
+		return false;
+	}
+    error = pthread_attr_getstacksize(&attr, &max_size);
 	if (error) {
 		return false;
 	}
@@ -270,10 +279,21 @@ static bool zend_call_stack_get_freebsd_pthread(zend_call_stack *stack)
 		goto fail;
 	}
 
-	error = pthread_attr_getstack(&attr, &addr, &max_size);
+	error = pthread_attr_getstackaddr(&attr, &addr);
 	if (error) {
-		goto fail;
+		return false;
 	}
+    error = pthread_attr_getstacksize(&attr, &max_size);
+	if (error) {
+		return false;
+	}
+    error = pthread_attr_getguardsize(&attr, &guard_size);
+	if (error) {
+		return false;
+	}
+
+    addr = (char*)addr + guard_size;
+    max_size -= guard_size;
 
 	stack->base = (int8_t*)addr + max_size;
 	stack->max_size = max_size;