diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-06-26 00:00:58 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-06-26 00:00:58 -0400 |
| commit | ed068b960eeedb92823238783779730319b8ba0e (patch) | |
| tree | 36a4de280458d52520b911b2716eb5cea309fd78 /gnu/packages/patches/glibc-vectorized-strcspn-guards.patch | |
| parent | a9308efec642bfbce480545a22fce848e6212456 (diff) | |
| parent | ffc015bea26f24d862e7e877d907fbe1ab9a9967 (diff) | |
| download | guix-patches-ed068b960eeedb92823238783779730319b8ba0e.tar guix-patches-ed068b960eeedb92823238783779730319b8ba0e.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/patches/glibc-vectorized-strcspn-guards.patch')
| -rw-r--r-- | gnu/packages/patches/glibc-vectorized-strcspn-guards.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/gnu/packages/patches/glibc-vectorized-strcspn-guards.patch b/gnu/packages/patches/glibc-vectorized-strcspn-guards.patch new file mode 100644 index 0000000000..3d6c7749d4 --- /dev/null +++ b/gnu/packages/patches/glibc-vectorized-strcspn-guards.patch @@ -0,0 +1,23 @@ +Copied from Debian. + +2017-06-14 Florian Weimer <fweimer@redhat.com> + + * sysdeps/i386/i686/multiarch/strcspn-c.c: Add IS_IN (libc) guard. + * sysdeps/i386/i686/multiarch/varshift.c: Likewise. + +--- a/sysdeps/i386/i686/multiarch/strcspn-c.c ++++ b/sysdeps/i386/i686/multiarch/strcspn-c.c +@@ -1,2 +1,4 @@ +-#define __strcspn_sse2 __strcspn_ia32 +-#include <sysdeps/x86_64/multiarch/strcspn-c.c> ++#if IS_IN (libc) ++# define __strcspn_sse2 __strcspn_ia32 ++# include <sysdeps/x86_64/multiarch/strcspn-c.c> ++#endif +--- a/sysdeps/i386/i686/multiarch/varshift.c ++++ b/sysdeps/i386/i686/multiarch/varshift.c +@@ -1 +1,3 @@ +-#include <sysdeps/x86_64/multiarch/varshift.c> ++#if IS_IN (libc) ++# include <sysdeps/x86_64/multiarch/varshift.c> ++#endif |