diff options
| author | Anatol Belski <ab@php.net> | 2018-03-02 20:39:41 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-03-02 20:39:41 +0100 |
| commit | c7dc6cc66b470b744abd422ded87b5ab9b59048c (patch) | |
| tree | 51d64377a1c83b3b1a2cb1ba1bf811268448bd0e /win32 | |
| parent | fd5a635225ceda2826cdb0b49788559825db5a5f (diff) | |
| download | php-git-c7dc6cc66b470b744abd422ded87b5ab9b59048c.tar.gz | |
Reflect native instruction set in snap filename
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/build/Makefile | 22 | ||||
| -rw-r--r-- | win32/build/confutils.js | 6 |
2 files changed, 19 insertions, 9 deletions
diff --git a/win32/build/Makefile b/win32/build/Makefile index 124d7f239d..8c0342901f 100644 --- 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 f4d69d959a..78c9ee0ce2 100644 --- 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. */ |