[vlc-commits] contrib: gnutls: Don't disable assembly for x86_64 with clang/windows

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Tue Oct 16 12:24:37 2018 +0300| [e1e18166ad153c3f726bea5aa948b9759a2376bb] | committer: Hugo Beauzée-Luyssen

contrib: gnutls: Don't disable assembly for x86_64 with clang/windows

Since some time, clang supports all the necessary assembler directives
for building the gnutls x86_64 assembly.

The aarch64 assembly isn't ready to be built on windows yet, though;
it unconditionally tries to use .size and .type and GNU stack notes.

(cherry picked from commit 024b3189d0ee66fd25b1760d08c324e833982ba7)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=e1e18166ad153c3f726bea5aa948b9759a2376bb
---

 contrib/src/gnutls/rules.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 71e68bf0a8..546561fe6a 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -76,7 +76,7 @@ endif
 endif
 ifdef HAVE_WIN32
 ifdef HAVE_CLANG
-ifneq ($(findstring $(ARCH), x86_64 aarch64),)
+ifeq ($(ARCH),aarch64)
 	GNUTLS_CONF += --disable-hardware-acceleration
 endif
 endif