Reflect native instruction set in snap filename

diff --git a/win32/build/Makefile b/win32/build/Makefile
index 124d7f239d44aafd03b9f89c9b932b7d78750da9..8c0342901f647a31be8e1ac93056a66aefe11dba 100644 (file)
--- a/win32/build/Makefile
+++ b/win32/build/Makefile
@@ -25,15 +25,25 @@ RE2C="$(RE2C)"
 PGOMGR="$(PGOMGR)"
 PHP_BUILD=$(PHP_BUILD)
 
+!if "$(PHP_SIMD_SCALE)" == ""
+SIMD_SUFFIX=""
+!else
+!if "$(PHP_SIMD_SCALE)" == "SSE2"
+SIMD_SUFFIX=""
+!else
+SIMD_SUFFIX=-$(PHP_SIMD_SCALE)
+!endif
+!endif
+
 MCFILE=$(BUILD_DIR)\wsyslog.rc
-BUILD_DIR_DEV_NAME=php-$(PHP_VERSION_STRING)-devel-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)
+BUILD_DIR_DEV_NAME=php-$(PHP_VERSION_STRING)-devel-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)$(SIMD_SUFFIX)
 BUILD_DIR_DEV=$(BUILD_DIR)\$(BUILD_DIR_DEV_NAME)
 
-DIST_ZIP_SNAP=php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-DIST_ZIP_PECL=pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-DIST_ZIP_DEV_PACK=php-devel-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
-DIST_ZIP_TEST_PACK=php-test-pack-$(PHP_VERSION_STRING).zip
-DIST_ZIP_DEBUG_PACK=php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE).zip
+DIST_ZIP_SNAP=php-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)$(SIMD_SUFFIX).zip
+DIST_ZIP_PECL=pecl-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)$(SIMD_SUFFIX).zip
+DIST_ZIP_DEV_PACK=php-devel-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)$(SIMD_SUFFIX).zip
+DIST_ZIP_TEST_PACK=php-test-pack-$(PHP_VERSION_STRING)$(SIMD_SUFFIX).zip
+DIST_ZIP_DEBUG_PACK=php-debug-pack-$(PHP_VERSION_STRING)$(PHP_ZTS_ARCHIVE_POSTFIX)-Win32-$(PHP_COMPILER_SHORT)-$(PHP_ARCHITECTURE)$(SIMD_SUFFIX).zip
 
 !if "$(DEBUGGER)" == "1"
 DEBUGGER_CMD=devenv

diff --git a/win32/build/confutils.js b/win32/build/confutils.js
index f4d69d959a629de455dcf33538736a2b8cf81bec..78c9ee0ce283d9899a7cd84c54f30d23e71f5cd8 100644 (file)
--- a/win32/build/confutils.js
+++ b/win32/build/confutils.js
@@ -1958,7 +1958,7 @@ function write_summary()
        }
        var simd = configure_subst.Item("PHP_SIMD_SCALE");
        if (!!simd) {
-               ar[k++] = ["Native SIMD", simd.toUpperCase()];
+               ar[k++] = ["Native intrinsics", simd];
        }
        if (PHP_ANALYZER == "vs") {
                ar[k++] = ['Static analyzer', 'Visual Studio'];
@@ -3267,7 +3267,7 @@ function toolset_setup_intrinsic_cflags()
 
                        /* All means all. __AVX__ and __AVX2__ are defined by compiler. */
                        ADD_FLAG("CFLAGS","/arch:AVX2");
-                       configure_subst.Add("PHP_SIMD_SCALE", "avx2");
+                       configure_subst.Add("PHP_SIMD_SCALE", "AVX2");
                } else {
                        var list = PHP_NATIVE_INTRINSICS.split(",");
                        var j = 0;
@@ -3289,7 +3289,7 @@ function toolset_setup_intrinsic_cflags()
                                        ADD_FLAG("CFLAGS","/arch:SSE");
                                }
                        }
-                       configure_subst.Add("PHP_SIMD_SCALE", scale[j]);
+                       configure_subst.Add("PHP_SIMD_SCALE", scale[j].toUpperCase());
                        /* There is no explicit way to enable intrinsics between SSE3 and SSE4.2.
                                The declared macros therefore won't affect the code generation,
                                but will enable the guarded code parts. */