1 |
commit: efe9c50693cd143ce18e07ec54a5d96a0c5dd437 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Jul 8 08:58:04 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 9 16:56:58 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe9c506 |
7 |
|
8 |
app-arch/lzop: remove unused patch(es) |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/9125 |
11 |
|
12 |
app-arch/lzop/files/lzop-1.03-gcc6.patch | 26 ---------------------- |
13 |
app-arch/lzop/files/lzop-1.03-x32.patch | 38 -------------------------------- |
14 |
2 files changed, 64 deletions(-) |
15 |
|
16 |
diff --git a/app-arch/lzop/files/lzop-1.03-gcc6.patch b/app-arch/lzop/files/lzop-1.03-gcc6.patch |
17 |
deleted file mode 100644 |
18 |
index 0826bc1f521..00000000000 |
19 |
--- a/app-arch/lzop/files/lzop-1.03-gcc6.patch |
20 |
+++ /dev/null |
21 |
@@ -1,26 +0,0 @@ |
22 |
---- a/src/miniacc.h |
23 |
-+++ b/src/miniacc.h |
24 |
-@@ -4469,12 +4469,12 @@ |
25 |
- #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) |
26 |
- #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) |
27 |
- #else |
28 |
-- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) |
29 |
-+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) |
30 |
- #endif |
31 |
- ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) |
32 |
- #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) |
33 |
- #else |
34 |
-- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) |
35 |
-+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) |
36 |
- #endif |
37 |
- ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) |
38 |
- #if defined(acc_int16e_t) |
39 |
-@@ -4703,7 +4703,7 @@ |
40 |
- #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) |
41 |
- #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) |
42 |
- #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) |
43 |
-- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) |
44 |
-+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) |
45 |
- #endif |
46 |
- #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) |
47 |
- # pragma option pop |
48 |
|
49 |
diff --git a/app-arch/lzop/files/lzop-1.03-x32.patch b/app-arch/lzop/files/lzop-1.03-x32.patch |
50 |
deleted file mode 100644 |
51 |
index e261f18123a..00000000000 |
52 |
--- a/app-arch/lzop/files/lzop-1.03-x32.patch |
53 |
+++ /dev/null |
54 |
@@ -1,38 +0,0 @@ |
55 |
-https://bugs.gentoo.org/575450 |
56 |
- |
57 |
-Fix get of FLAGS register in x32 ABI, |
58 |
- |
59 |
-x32 ABI requires to have 64-bit variable to store FLAGS register |
60 |
-instead of size_t that is 32-bit variable, this fix operand |
61 |
-type mismatch when try to pop previous pushf value. |
62 |
- |
63 |
-Upstream-status: Submitted |
64 |
- |
65 |
-Signed-off-by: Aníbal Limón <anibal.limon@×××××××××××.com> |
66 |
- |
67 |
-Index: lzop-1.03/src/miniacc.h |
68 |
-=================================================================== |
69 |
---- lzop-1.03.orig/src/miniacc.h |
70 |
-+++ lzop-1.03/src/miniacc.h |
71 |
-@@ -754,6 +754,9 @@ |
72 |
- #elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) |
73 |
- # define ACC_ARCH_AMD64 1 |
74 |
- # define ACC_INFO_ARCH "amd64" |
75 |
-+# if defined(__ILP32__) |
76 |
-+# define ACC_ARCH_AMD64_X32 1 |
77 |
-+# endif |
78 |
- #elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB)) |
79 |
- # define ACC_ARCH_ARM 1 |
80 |
- # define ACC_ARCH_ARM_THUMB 1 |
81 |
-@@ -6787,7 +6790,11 @@ ACCLIB_PUBLIC_NOINLINE(void, acc_debug_n |
82 |
- ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_query) (void) |
83 |
- { |
84 |
- #if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC) |
85 |
-+# if defined(ACC_ARCH_AMD64_X32) |
86 |
-+ unsigned long long r; |
87 |
-+# else |
88 |
- size_t r; |
89 |
-+# endif |
90 |
- __asm__ __volatile__("pushf\n pop %0\n" : "=a" (r) : : __ACC_ASM_CLOBBER); |
91 |
- return (int)(r >> 18) & 1; |
92 |
- #elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC) |