[vlc-commits] contrib: gnutls: Remove one unnecessary level of ifdefs

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Wed May 22 13:06:44 2019 +0300| [38eda60a65b3d91a2da29b7b648163fe09961fd0] | committer: Hugo Beauzée-Luyssen

contrib: gnutls: Remove one unnecessary level of ifdefs

The aarch64 assembly in gnutls still needs to be disabled on windows
in general though; the issue is that it unconditionally uses ELF
specific directives (.type, .size, .section), so the disabling isn't
related to any specific issue in clang, but only that gnutls' assembly
for this architecture isn't portable.

Add a comment to clarify the issue.

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

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

diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 8e5101272a..0a3c0b55d9 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -65,12 +65,11 @@ endif
 endif
 ifdef HAVE_WIN32
 	GNUTLS_CONF += --without-idn
-ifdef HAVE_CLANG
 ifeq ($(ARCH),aarch64)
+	# Gnutls' aarch64 assembly unconditionally uses ELF specific directives
 	GNUTLS_CONF += --disable-hardware-acceleration
 endif
 endif
-endif
 
 ifdef HAVE_NACL
 	GNUTLS_CONF += --disable-hardware-acceleration