about summary refs log tree commit diff
path: root/nixpkgs/pkgs/tools/security/john/gcc5.patch
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/tools/security/john/gcc5.patch')
-rw-r--r--nixpkgs/pkgs/tools/security/john/gcc5.patch14
1 files changed, 0 insertions, 14 deletions
diff --git a/nixpkgs/pkgs/tools/security/john/gcc5.patch b/nixpkgs/pkgs/tools/security/john/gcc5.patch
deleted file mode 100644
index 73da83483f90..000000000000
--- a/nixpkgs/pkgs/tools/security/john/gcc5.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/common.h b/src/common.h
---- a/src/common.h
-+++ b/src/common.h
-@@ -31,7 +31,9 @@ typedef unsigned long long ARCH_WORD_64;
- #define is_aligned(PTR, CNT) ((((ARCH_WORD)(const void *)(PTR))&(CNT-1))==0)
- 
- #ifdef __GNUC__
--#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER)
-+#if __GNUC__ >= 5
-+#define MAYBE_INLINE __attribute__((gnu_inline)) inline
-+#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7) || defined(__INTEL_COMPILER)
- #define MAYBE_INLINE __attribute__((always_inline)) inline
- #elif __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
- #define MAYBE_INLINE __attribute__((always_inline))