vlc | branch: master | Martin Storsjö <[email protected]> | Tue Jun 5 10:07:15 2018 +0300| [76936ce1ab7d3c8f3d9da3f1071a56e0722e49c8] | committer: Martin Storsjö
Revert "contrib: harfbuzz: Skip using the _BitScan intrinsics on mingw" This reverts commit 28f8d6217e1d3e0d3b1806548a5ae36a51288c35. The latest version of mingw-w64 now supports these functions for armv7 and aarch64 as well. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=76936ce1ab7d3c8f3d9da3f1071a56e0722e49c8 --- ...ip-using-the-_BitScan-intrinsics-on-mingw.patch | 39 ---------------------- contrib/src/harfbuzz/rules.mak | 1 - 2 files changed, 40 deletions(-) diff --git a/contrib/src/harfbuzz/0001-Skip-using-the-_BitScan-intrinsics-on-mingw.patch b/contrib/src/harfbuzz/0001-Skip-using-the-_BitScan-intrinsics-on-mingw.patch deleted file mode 100644 index b933f626ee..0000000000 --- a/contrib/src/harfbuzz/0001-Skip-using-the-_BitScan-intrinsics-on-mingw.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 35bda45cd1a96de1802c2174d4c4469c4e204154 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <[email protected]> -Date: Mon, 21 May 2018 14:52:41 +0300 -Subject: [PATCH] Skip using the _BitScan intrinsics on mingw - -In mingw targets, both when using GCC and Clang, the __GNUC__ -intrinsics right above can be used in most cases anyway. - -This fixes building with mingw-w64 for armv7/aarch64, which doesn't -implement the _BitScanForward/_BitScanReverse intrinsics yet. ---- - src/hb-private.hh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/hb-private.hh b/src/hb-private.hh -index daa496e..2fb6e71 100644 ---- a/src/hb-private.hh -+++ b/src/hb-private.hh -@@ -380,7 +380,7 @@ _hb_bit_storage (T v) - return sizeof (unsigned long long) * 8 - __builtin_clzll (v); - #endif - --#if defined(_MSC_VER) || defined(__MINGW32__) -+#if defined(_MSC_VER) - if (sizeof (T) <= sizeof (unsigned int)) - { - unsigned long where; -@@ -453,7 +453,7 @@ _hb_ctz (T v) - return __builtin_ctzll (v); - #endif - --#if defined(_MSC_VER) || defined(__MINGW32__) -+#if defined(_MSC_VER) - if (sizeof (T) <= sizeof (unsigned int)) - { - unsigned long where; --- -2.7.4 - diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak index 7d42bb4021..dc8d7f9a8b 100644 --- a/contrib/src/harfbuzz/rules.mak +++ b/contrib/src/harfbuzz/rules.mak @@ -16,7 +16,6 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz $(UNPACK) $(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch $(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch - $(APPLY) $(SRC)/harfbuzz/0001-Skip-using-the-_BitScan-intrinsics-on-mingw.patch $(APPLY) $(SRC)/harfbuzz/harfbuzz-fix-freetype-detect.patch $(APPLY) $(SRC)/harfbuzz/harfbuzz-no-tests.patch $(APPLY) $(SRC)/harfbuzz/harfbuzz-fix-coretext-detection.patch _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
