commit: efe9c50693cd143ce18e07ec54a5d96a0c5dd437 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sun Jul 8 08:58:04 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Mon Jul 9 16:56:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=efe9c506
app-arch/lzop: remove unused patch(es) Closes: https://github.com/gentoo/gentoo/pull/9125 app-arch/lzop/files/lzop-1.03-gcc6.patch | 26 ---------------------- app-arch/lzop/files/lzop-1.03-x32.patch | 38 -------------------------------- 2 files changed, 64 deletions(-) diff --git a/app-arch/lzop/files/lzop-1.03-gcc6.patch b/app-arch/lzop/files/lzop-1.03-gcc6.patch deleted file mode 100644 index 0826bc1f521..00000000000 --- a/app-arch/lzop/files/lzop-1.03-gcc6.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/miniacc.h -+++ b/src/miniacc.h -@@ -4469,12 +4469,12 @@ - #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) -+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) - #endif - ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) - #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) -+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) - #endif - ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) - #if defined(acc_int16e_t) -@@ -4703,7 +4703,7 @@ - #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) -- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) -+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) - #endif - #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) - # pragma option pop diff --git a/app-arch/lzop/files/lzop-1.03-x32.patch b/app-arch/lzop/files/lzop-1.03-x32.patch deleted file mode 100644 index e261f18123a..00000000000 --- a/app-arch/lzop/files/lzop-1.03-x32.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/575450 - -Fix get of FLAGS register in x32 ABI, - -x32 ABI requires to have 64-bit variable to store FLAGS register -instead of size_t that is 32-bit variable, this fix operand -type mismatch when try to pop previous pushf value. - -Upstream-status: Submitted - -Signed-off-by: Aníbal Limón <anibal.li...@linux.intel.com> - -Index: lzop-1.03/src/miniacc.h -=================================================================== ---- lzop-1.03.orig/src/miniacc.h -+++ lzop-1.03/src/miniacc.h -@@ -754,6 +754,9 @@ - #elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64) - # define ACC_ARCH_AMD64 1 - # define ACC_INFO_ARCH "amd64" -+# if defined(__ILP32__) -+# define ACC_ARCH_AMD64_X32 1 -+# endif - #elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB)) - # define ACC_ARCH_ARM 1 - # define ACC_ARCH_ARM_THUMB 1 -@@ -6787,7 +6790,11 @@ ACCLIB_PUBLIC_NOINLINE(void, acc_debug_n - ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_query) (void) - { - #if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC) -+# if defined(ACC_ARCH_AMD64_X32) -+ unsigned long long r; -+# else - size_t r; -+# endif - __asm__ __volatile__("pushf\n pop %0\n" : "=a" (r) : : __ACC_ASM_CLOBBER); - return (int)(r >> 18) & 1; - #elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC)
