use ZEND_TLS to define thread local storage

Author: withinboredom

Zend/zend_max_execution_timer.c

@@ -26,15 +26,14 @@
 
 #include "zend.h"
 #include "zend_globals.h"
-#include "zend_portability.h"
 
 // Musl Libc defines this macro, glibc does not
 // According to "man 2 timer_create" this field should always be available, but it's not: https://sourceware.org/bugzilla/show_bug.cgi?id=27417
 # ifndef sigev_notify_thread_id
 # define sigev_notify_thread_id _sigev_un._tid
 # endif
 
-ZEND_THREAD_LOCAL bool is_handler_set = false; // whether we have set up a timer in this thread
+ZEND_TLS bool is_handler_set = false; // whether we have set up a timer in this thread
 
 ZEND_API void zend_max_execution_timer_init(void) /* {{{ */
 {

Zend/zend_portability.h

@@ -307,24 +307,6 @@ char *alloca();
 # define ZEND_NORETURN
 #endif
 
-#if !defined(__STDC_NO_THREADS__)
-# if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 9))
-/* GCC supported _Thread_local keyword since version 4.8.0 */
-#  define ZEND_THREAD_LOCAL
-# else
-#  define ZEND_THREAD_LOCAL _Thread_local
-# endif
-#else
-#  if defined(_MSC_VER) && _MSC_VER >= 1900
-#   define ZEND_THREAD_LOCAL __declspec(thread)
-#  elif defined(__GNUC__) || defined(__clang__)
-#   define ZEND_THREAD_LOCAL __thread
-#  else
-/* TODO: add support for more compilers */
-#   define ZEND_THREAD_LOCAL
-#  endif
-#endif
-
 #if __has_attribute(force_align_arg_pointer)
 # define ZEND_STACK_ALIGNED __attribute__((force_align_arg_pointer))
 #else