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

[Martin Storsjö]

vlc/vlc-3.0 | branch: master | Martin Storsjö <martin at martin.st> | Wed May 22 13:06:44 2019 +0300| [57f13db6b1346c13e0e2bb7375108fca18aac766] | committer: Steve Lhomme

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.

(cherry picked from commit 38eda60a65b3d91a2da29b7b648163fe09961fd0) (rebased)

rebased:
- this branch doesn't have the NACL fixes (0d4d18e7a1158359fe9bc5fa98b919b484cfbcdc)

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>

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

 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 d837038926..cbe42571e4 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
 
 .gnutls: gnutls
 	cd $< && $(GNUTLS_ENV) ./configure $(GNUTLS_CONF)