Improved PHP binary size and startup speed with GCC4 visibility contr…

…ol (Nuno)
php · Jan 30, 2008 · 240fa24 · 240fa24
1 parent 71efa39
commit 240fa24
Show file tree

Hide file tree

Showing 25 changed files with 175 additions and 86 deletions.
diff --git a/NEWS b/NEWS
@@ -57,6 +57,8 @@ PHP                                                                        NEWS
 
 - Removed the experimental RPL (master/slave) functions from mysqli. (Andrey)
 
+- Improved PHP binary size and startup speed with GCC4 visibility control.
+  (Nuno)
 - Improved engine stack implementation for better performance and stability.
   (Dmitry)
 - Improved php.ini handling: (Jani)

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
@@ -22,10 +22,12 @@
 
 #ifdef TSRM_WIN32
 #	ifdef TSRM_EXPORTS
-#	define TSRM_API __declspec(dllexport)
+#		define TSRM_API __declspec(dllexport)
 #	else
-#	define TSRM_API __declspec(dllimport)
+#		define TSRM_API __declspec(dllimport)
 #	endif
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define TSRM_API __attribute__ ((visibility("default")))
 #else
 #	define TSRM_API
 #endif

diff --git a/TSRM/tsrm_virtual_cwd.h b/TSRM/tsrm_virtual_cwd.h
@@ -117,13 +117,15 @@ typedef unsigned short mode_t;
 #endif
 
 #ifdef TSRM_WIN32
-#       ifdef CWD_EXPORTS
+#	ifdef CWD_EXPORTS
-#       define CWD_API __declspec(dllexport)
+#		define CWD_API __declspec(dllexport)
-#       else
+#	else
-#       define CWD_API __declspec(dllimport)
+#		define CWD_API __declspec(dllimport)
-#       endif
+#	endif
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define CWD_API __attribute__ ((visibility("default")))
 #else
-#define CWD_API
+#	define CWD_API
 #endif
 
 #ifdef TSRM_WIN32

diff --git a/Zend/acconfig.h b/Zend/acconfig.h
@@ -19,8 +19,14 @@
 
 /* $Id$ */
 
-#define ZEND_API
+#if defined(__GNUC__) && __GNUC__ >= 4
-#define ZEND_DLEXPORT
+# define ZEND_API __attribute__ ((visibility("default")))
+# define ZEND_DLEXPORT __attribute__ ((visibility("default")))
+#else
+# define ZEND_API
+# define ZEND_DLEXPORT
+#endif
+
 #define ZEND_DLIMPORT
 
 @TOP@

diff --git a/configure.in b/configure.in
@@ -165,6 +165,14 @@ alpha*)
     ;;
 esac
 
+dnl activate some gcc specific optimizations for gcc >= 4
+if test "$GCC" = "yes"; then
+  GCC_MAJOR_VERSION=`$CC --version | $SED -n '1s/[[^0-9]]*\([[0-9]]\+\)\.[[0-9]]\+\..*/\1/;1p'`
+  if test $GCC_MAJOR_VERSION -ge 4; then
+    CFLAGS="$CFLAGS -fvisibility=hidden"
+  fi
+fi
+
 case $host_alias in
 *solaris*)
     CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"

diff --git a/ext/bz2/php_bz2.h b/ext/bz2/php_bz2.h
@@ -34,15 +34,17 @@ extern zend_module_entry bz2_module_entry;
 #endif
 
 #ifdef PHP_WIN32
-# ifdef PHP_BZ2_EXPORTS
+#	ifdef PHP_BZ2_EXPORTS
-#  define PHP_BZ2_API __declspec(dllexport)
+#		define PHP_BZ2_API __declspec(dllexport)
-# elif defined(COMPILE_DL_BZ2)
+#	elif defined(COMPILE_DL_BZ2)
-#  define PHP_BZ2_API __declspec(dllimport)
+#		define PHP_BZ2_API __declspec(dllimport)
-# else
+#	else
-#  define PHP_BZ2_API /* nothing special */
+#		define PHP_BZ2_API /* nothing special */
-# endif
+#	endif
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define PHP_BZ2_API __attribute__ ((visibility("default")))
 #else
-# define PHP_BZ2_API
+#	define PHP_BZ2_API
 #endif
 
 PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC);

diff --git a/ext/dom/xml_common.h b/ext/dom/xml_common.h
@@ -35,14 +35,19 @@ typedef struct _dom_object {
 } dom_object;
 
 #ifdef PHP_WIN32
-#ifdef PHPAPI
+#	ifdef PHPAPI
-#undef PHPAPI
+#		undef PHPAPI
-#endif
+#	endif
-#ifdef DOM_EXPORTS
+#	ifdef DOM_EXPORTS
-#define PHPAPI __declspec(dllexport)
+#		define PHPAPI __declspec(dllexport)
-#else
+#	else
-#define PHPAPI __declspec(dllimport)
+#		define PHPAPI __declspec(dllimport)
-#endif /* DOM_EXPORTS */
+#	endif /* DOM_EXPORTS */
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	ifdef PHPAPI
+#		undef PHPAPI
+#	endif
+#	define PHPAPI __attribute__ ((visibility("default")))
 #endif /* PHP_WIN32 */
 
 #define PHP_DOM_EXPORT PHPAPI

diff --git a/ext/gd/php_gd.h b/ext/gd/php_gd.h
@@ -51,9 +51,11 @@
 #define PHP_GDIMG_TYPE_GD2PART 10
 
 #ifdef PHP_WIN32
-#define PHP_GD_API __declspec(dllexport)
+#	define PHP_GD_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define PHP_GD_API __attribute__ ((visibility("default")))
 #else
-#define PHP_GD_API
+#	define PHP_GD_API
 #endif
 
 PHPAPI extern const char php_sig_gif[3];

diff --git a/ext/hash/php_hash.h b/ext/hash/php_hash.h
@@ -100,9 +100,11 @@ extern zend_module_entry hash_module_entry;
 #define phpext_hash_ptr &hash_module_entry
 
 #ifdef PHP_WIN32
-#define PHP_HASH_API __declspec(dllexport)
+#	define PHP_HASH_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define PHP_HASH_API __attribute__ ((visibility("default")))
 #else
-#define PHP_HASH_API
+#	define PHP_HASH_API
 #endif
 
 #ifdef ZTS

diff --git a/ext/iconv/php_iconv.h b/ext/iconv/php_iconv.h
@@ -23,13 +23,15 @@
 #define PHP_ICONV_H
 
 #ifdef PHP_WIN32
-#ifdef PHP_ICONV_EXPORTS
+#	ifdef PHP_ICONV_EXPORTS
-#define PHP_ICONV_API __declspec(dllexport)
+#		define PHP_ICONV_API __declspec(dllexport)
+#	else
+#		define PHP_ICONV_API __declspec(dllimport)
+#	endif 
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define PHP_ICONV_API __attribute__ ((visibility("default")))
 #else
-#define PHP_ICONV_API __declspec(dllimport)
+#	define PHP_ICONV_API
-#endif 
-#else
-#define PHP_ICONV_API
 #endif
 
 #ifdef PHP_ATOM_INC

diff --git a/ext/libxml/php_libxml.h b/ext/libxml/php_libxml.h
@@ -27,9 +27,11 @@ extern zend_module_entry libxml_module_entry;
 #define libxml_module_ptr &libxml_module_entry
 
 #ifdef PHP_WIN32
-#define PHP_LIBXML_API __declspec(dllexport)
+#	define PHP_LIBXML_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define PHP_LIBXML_API __attribute__ ((visibility("default")))
 #else
-#define PHP_LIBXML_API
+#	define PHP_LIBXML_API
 #endif
 
 #include "ext/standard/php_smart_str.h"

diff --git a/ext/mbstring/mbstring.h b/ext/mbstring/mbstring.h
@@ -52,17 +52,20 @@
 #endif
 
 #ifdef PHP_WIN32
-# undef MBSTRING_API
+#	undef MBSTRING_API
-# ifdef MBSTRING_EXPORTS
+#	ifdef MBSTRING_EXPORTS
-#  define MBSTRING_API __declspec(dllexport)
+#		define MBSTRING_API __declspec(dllexport)
-# elif defined(COMPILE_DL_MBSTRING)
+#	elif defined(COMPILE_DL_MBSTRING)
-#  define MBSTRING_API __declspec(dllimport)
+#		define MBSTRING_API __declspec(dllimport)
-# else
+#	else
-#  define MBSTRING_API /* nothing special */
+#		define MBSTRING_API /* nothing special */
-# endif
+#	endif
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	undef MBSTRING_API
+#	define MBSTRING_API __attribute__ ((visibility("default")))
 #else
-# undef MBSTRING_API
+#	undef MBSTRING_API
-# define MBSTRING_API /* nothing special */
+#	define MBSTRING_API /* nothing special */
 #endif
 
 

diff --git a/ext/mysqli/php_mysqli_structs.h b/ext/mysqli/php_mysqli_structs.h
@@ -145,7 +145,11 @@ typedef struct {
 #define L64(x) x##i64
 typedef __int64 my_longlong;
 #else
-#define PHP_MYSQLI_API
+# if defined(__GNUC__) && __GNUC__ >= 4
+#  define PHP_MYSQLI_API __attribute__ ((visibility("default")))
+# else
+#  define PHP_MYSQLI_API
+# endif
 #define MYSQLI_LLU_SPEC "%llu"
 #define MYSQLI_LL_SPEC "%lld"
 #define L64(x) x##LL

diff --git a/ext/pdo/php_pdo.h b/ext/pdo/php_pdo.h
@@ -31,15 +31,17 @@ extern zend_module_entry pdo_module_entry;
 #define phpext_pdo_ptr &pdo_module_entry
 
 #ifdef PHP_WIN32
-# if defined(PDO_EXPORTS) || (!defined(COMPILE_DL_PDO))
+#	if defined(PDO_EXPORTS) || (!defined(COMPILE_DL_PDO))
-#  define PDO_API __declspec(dllexport)
+#		define PDO_API __declspec(dllexport)
-# elif defined(COMPILE_DL_PDO)
+#	elif defined(COMPILE_DL_PDO)
-#  define PDO_API __declspec(dllimport)
+#		define PDO_API __declspec(dllimport)
-# else
+#	else
-#  define PDO_API /* nothing special */
+#		define PDO_API /* nothing special */
-# endif
+#	endif
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define PDO_API __attribute__ ((visibility("default")))
 #else
-# define PDO_API /* nothing special */
+#	define PDO_API /* nothing special */
 #endif
 
 #ifdef ZTS

diff --git a/ext/pgsql/php_pgsql.h b/ext/pgsql/php_pgsql.h
@@ -42,7 +42,11 @@ extern zend_module_entry pgsql_module_entry;
 #endif
 #else
 #include <libpq/libpq-fs.h>
-#define PHP_PGSQL_API /* nothing special */
+# if defined(__GNUC__) && __GNUC__ >= 4
+#  define PHP_PGSQL_API __attribute__ ((visibility("default")))
+# else
+#  define PHP_PGSQL_API
+# endif
 #endif
 
 #ifdef HAVE_PG_CONFIG_H

diff --git a/ext/skeleton/php_skeleton.h b/ext/skeleton/php_skeleton.h
@@ -7,9 +7,11 @@ extern zend_module_entry extname_module_entry;
 #define phpext_extname_ptr &extname_module_entry
 
 #ifdef PHP_WIN32
-#define PHP_EXTNAME_API __declspec(dllexport)
+#	define PHP_EXTNAME_API __declspec(dllexport)
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define PHP_EXTNAME_API __attribute__ ((visibility("default")))
 #else
-#define PHP_EXTNAME_API
+#	define PHP_EXTNAME_API
 #endif
 
 #ifdef ZTS

diff --git a/ext/spl/php_spl.h b/ext/spl/php_spl.h
@@ -32,15 +32,17 @@ extern zend_module_entry spl_module_entry;
 #define phpext_spl_ptr &spl_module_entry
 
 #ifdef PHP_WIN32
-# ifdef SPL_EXPORTS
+#	ifdef SPL_EXPORTS
-#  define SPL_API __declspec(dllexport)
+#		define SPL_API __declspec(dllexport)
-# elif defined(COMPILE_DL_SPL)
+#	elif defined(COMPILE_DL_SPL)
-#  define SPL_API __declspec(dllimport)
+#		define SPL_API __declspec(dllimport)
-# else
+#	else
-#  define SPL_API /* nothing */
+#		define SPL_API /* nothing */
-# endif
+#	endif
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define SPL_API __attribute__ ((visibility("default")))
 #else
-# define SPL_API
+#	define SPL_API
 #endif
 
 #if defined(PHP_WIN32) && !defined(COMPILE_DL_SPL)

diff --git a/ext/zip/lib/zip.h b/ext/zip/lib/zip.h
@@ -41,14 +41,16 @@
 /* #defines that rename all zip_ functions and structs */
 #include "zip_alias.h"
 #ifdef PHP_WIN32
-#include "zip_win32.h"
+#	include "zip_win32.h"
-# ifdef PHP_ZIP_EXPORTS
+#	ifdef PHP_ZIP_EXPORTS
-#  define PHPZIPAPI __declspec(dllexport)
+#		define PHPZIPAPI __declspec(dllexport)
-# else
+#	else
-#  define PHPZIPAPI
+#		define PHPZIPAPI
-# endif
+#	endif
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define PHPZIPAPI __attribute__ ((visibility("default")))
 #else
-#define PHPZIPAPI
+#	define PHPZIPAPI
 #endif
 BEGIN_EXTERN_C()
 #include <sys/types.h>

diff --git a/main/SAPI.h b/main/SAPI.h
@@ -35,12 +35,14 @@
 
 #ifdef PHP_WIN32
 #	ifdef SAPI_EXPORTS
-#	define SAPI_API __declspec(dllexport) 
+#		define SAPI_API __declspec(dllexport) 
 #	else
-#	define SAPI_API __declspec(dllimport) 
+#		define SAPI_API __declspec(dllimport) 
 #	endif
+#elif defined(__GNUC__) && __GNUC__ >= 4
+#	define SAPI_API __attribute__ ((visibility("default")))
 #else
-#define SAPI_API
+#	define SAPI_API
 #endif
 
 #undef shutdown

diff --git a/main/php.h b/main/php.h
@@ -45,17 +45,22 @@
 #define PHP_DEBUG ZEND_DEBUG
 
 #ifdef PHP_WIN32
-#include "tsrm_win32.h"
+#	include "tsrm_win32.h"
-#include "win95nt.h"
+#	include "win95nt.h"
 #	ifdef PHP_EXPORTS
-#	define PHPAPI __declspec(dllexport)
+#		define PHPAPI __declspec(dllexport)
 #	else
-#	define PHPAPI __declspec(dllimport)
+#		define PHPAPI __declspec(dllimport)
 #	endif
-#define PHP_DIR_SEPARATOR '\\'
+#	define PHP_DIR_SEPARATOR '\\'
-#define PHP_EOL "\r\n"
+#	define PHP_EOL "\r\n"
 #else
-#define PHPAPI
+#	if defined(__GNUC__) && __GNUC__ >= 4
+#		define PHPAPI __attribute__ ((visibility("default")))
+#	else
+#		define PHPAPI
+#	endif
+
 #define THREAD_LS
 #define PHP_DIR_SEPARATOR '/'
 #if defined(__MacOSX__)