Merge branch 'dev' into srcPackage
This commit is contained in:
+4
-4
@@ -82,8 +82,8 @@
|
|||||||
ECHO Creating artifacts &&
|
ECHO Creating artifacts &&
|
||||||
ECHO %cd% &&
|
ECHO %cd% &&
|
||||||
lib\dll\example\build_package.bat &&
|
lib\dll\example\build_package.bat &&
|
||||||
cd programs\ && make DEBUGFLAGS= clean zstd &&
|
make -C programs DEBUGFLAGS= clean zstd &&
|
||||||
7z a -tzip -mx9 zstd-win-binary-%PLATFORM%.zip zstd.exe &&
|
cd programs\ && 7z a -tzip -mx9 zstd-win-binary-%PLATFORM%.zip zstd.exe &&
|
||||||
appveyor PushArtifact zstd-win-binary-%PLATFORM%.zip &&
|
appveyor PushArtifact zstd-win-binary-%PLATFORM%.zip &&
|
||||||
cp zstd.exe ..\bin\zstd.exe &&
|
cp zstd.exe ..\bin\zstd.exe &&
|
||||||
git clone --depth 1 --branch master https://github.com/facebook/zstd &&
|
git clone --depth 1 --branch master https://github.com/facebook/zstd &&
|
||||||
@@ -91,8 +91,8 @@
|
|||||||
git archive --format=tar master -o zstd-src.tar &&
|
git archive --format=tar master -o zstd-src.tar &&
|
||||||
..\zstd -19 zstd-src.tar &&
|
..\zstd -19 zstd-src.tar &&
|
||||||
appveyor PushArtifact zstd-src.tar.zst &&
|
appveyor PushArtifact zstd-src.tar.zst &&
|
||||||
certUtil -hashfile zstd-src.tar.zst SHA256 > zstd-src.sig.sha256 &&
|
certUtil -hashfile zstd-src.tar.zst SHA256 > zstd-src.tar.zst.sha256.sig &&
|
||||||
appveyor PushArtifact zstd-src.sig.sha256 &&
|
appveyor PushArtifact zstd-src.tar.zst.sha256.sig &&
|
||||||
cd ..\..\bin\ &&
|
cd ..\..\bin\ &&
|
||||||
7z a -tzip -mx9 zstd-win-release-%PLATFORM%.zip * &&
|
7z a -tzip -mx9 zstd-win-release-%PLATFORM%.zip * &&
|
||||||
appveyor PushArtifact zstd-win-release-%PLATFORM%.zip
|
appveyor PushArtifact zstd-win-release-%PLATFORM%.zip
|
||||||
|
|||||||
Binary file not shown.
|
After Width: | Height: | Size: 104 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 114 KiB |
@@ -64,6 +64,9 @@
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* target attribute */
|
/* target attribute */
|
||||||
|
#ifndef __has_attribute
|
||||||
|
#define __has_attribute(x) 0 /* Compatibility with non-clang compilers. */
|
||||||
|
#endif
|
||||||
#if defined(__GNUC__)
|
#if defined(__GNUC__)
|
||||||
# define TARGET_ATTRIBUTE(target) __attribute__((__target__(target)))
|
# define TARGET_ATTRIBUTE(target) __attribute__((__target__(target)))
|
||||||
#else
|
#else
|
||||||
@@ -74,7 +77,7 @@
|
|||||||
* Enabled for clang & gcc >=4.8 on x86 when BMI2 isn't enabled by default.
|
* Enabled for clang & gcc >=4.8 on x86 when BMI2 isn't enabled by default.
|
||||||
*/
|
*/
|
||||||
#ifndef DYNAMIC_BMI2
|
#ifndef DYNAMIC_BMI2
|
||||||
#if defined(__clang__) \
|
#if (defined(__clang__) && __has_attribute(__target__)) \
|
||||||
|| (defined(__GNUC__) \
|
|| (defined(__GNUC__) \
|
||||||
&& (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) \
|
&& (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))) \
|
||||||
&& (defined(__x86_64__) || defined(_M_X86)) \
|
&& (defined(__x86_64__) || defined(_M_X86)) \
|
||||||
|
|||||||
Reference in New Issue
Block a user