diff options
| author | jperkin <jperkin> | 2017-04-10 10:43:49 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2017-04-10 10:43:49 +0000 |
| commit | 8df68bdc7e1aa7aff8a9644a19014fc61194347e (patch) | |
| tree | 3a98592f3fd51c1a36097a1afe5ef891a3ab9875 /security | |
| parent | 22ef77ff8cf593971a882164f98b039d0570c032 (diff) | |
| download | pkgsrc-8df68bdc7e1aa7aff8a9644a19014fc61194347e.tar.gz | |
Avoid unsupported xgetbv instruction on older Darwin assemblers.
Diffstat (limited to 'security')
| -rw-r--r-- | security/gnutls/distinfo | 3 | ||||
| -rw-r--r-- | security/gnutls/patches/patch-lib_accelerated_x86_x86-common.c | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/security/gnutls/distinfo b/security/gnutls/distinfo index db885a8e561..d49394e736b 100644 --- a/security/gnutls/distinfo +++ b/security/gnutls/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.123 2017/02/26 09:19:56 adam Exp $ +$NetBSD: distinfo,v 1.124 2017/04/10 10:43:49 jperkin Exp $ SHA1 (gnutls-3.5.9.tar.xz) = f3f184a92f128af1c2fb29b29a4d325af65694a5 RMD160 (gnutls-3.5.9.tar.xz) = a200b078cf9204f70dfaae7c045fc2f762a22809 @@ -6,6 +6,7 @@ SHA512 (gnutls-3.5.9.tar.xz) = 17a05143eaa70ee61b149a5f09ae7a688cb3f314ad1e67ce4 Size (gnutls-3.5.9.tar.xz) = 7166932 bytes SHA1 (patch-ae) = 5e020483ac14ef6ccc45a53e351242ab16c860f1 SHA1 (patch-lib_Makefile.in) = d0e292e632a91a9f19e39bd2c2d205a086ba5588 +SHA1 (patch-lib_accelerated_x86_x86-common.c) = 7a46ef6892b3a06ff4c949a965073c720a2491a4 SHA1 (patch-src_libopts_autoopts_options.h) = 9202c55314fe8764ac82c95bbfabfa1b031e9ba4 SHA1 (patch-src_libopts_compat_compat.h) = 240fbfc0ba20af35e0634ba873fe9e34bfbcc921 SHA1 (patch-src_libopts_libopts.c) = ce5e7681def882e95ed5ab770564d1f999b97039 diff --git a/security/gnutls/patches/patch-lib_accelerated_x86_x86-common.c b/security/gnutls/patches/patch-lib_accelerated_x86_x86-common.c new file mode 100644 index 00000000000..95595f96ed5 --- /dev/null +++ b/security/gnutls/patches/patch-lib_accelerated_x86_x86-common.c @@ -0,0 +1,15 @@ +$NetBSD: patch-lib_accelerated_x86_x86-common.c,v 1.1 2017/04/10 10:43:49 jperkin Exp $ + +Avoid unsupported xgetbv instruction on older Darwin assemblers. + +--- lib/accelerated/x86/x86-common.c.orig 2017-01-22 00:00:30.000000000 +0000 ++++ lib/accelerated/x86/x86-common.c +@@ -101,6 +101,8 @@ static unsigned check_4th_gen_intel_feat + + #if defined(_MSC_VER) + xcr0 = _xgetbv(0); ++#elif defined(__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1070 ++ return 0; + #else + __asm__ ("xgetbv" : "=a" (xcr0) : "c" (0) : "%edx"); + #endif |