diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2016-08-10 14:35:03 +0800 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-08-10 14:35:03 +0800 |
| commit | 2583f482d99f4fb199ff32062c4ac6b7761bcbea (patch) | |
| tree | bcb306ba8a61992aa5f7154d669d2965e6d3da10 | |
| parent | app-arch/lzop: upgrade to EAPI=6 (diff) | |
| download | gentoo-2583f482d99f4fb199ff32062c4ac6b7761bcbea.tar.gz gentoo-2583f482d99f4fb199ff32062c4ac6b7761bcbea.tar.bz2 gentoo-2583f482d99f4fb199ff32062c4ac6b7761bcbea.zip | |
app-arch/lzop: add patch from OE for building on x32 #575450
| -rw-r--r-- | app-arch/lzop/files/lzop-1.03-x32.patch | 38 | ||||
| -rw-r--r-- | app-arch/lzop/lzop-1.03.ebuild | 4 |
2 files changed, 42 insertions, 0 deletions
diff --git a/app-arch/lzop/files/lzop-1.03-x32.patch b/app-arch/lzop/files/lzop-1.03-x32.patch new file mode 100644 index 000000000000..e261f18123a1 --- /dev/null +++ b/app-arch/lzop/files/lzop-1.03-x32.patch @@ -0,0 +1,38 @@ +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.limon@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) diff --git a/app-arch/lzop/lzop-1.03.ebuild b/app-arch/lzop/lzop-1.03.ebuild index cec129db66b7..1416bab8ac26 100644 --- a/app-arch/lzop/lzop-1.03.ebuild +++ b/app-arch/lzop/lzop-1.03.ebuild @@ -15,6 +15,10 @@ IUSE="" RDEPEND=">=dev-libs/lzo-2" DEPEND="${RDEPEND}" +PATCHES=( + "${FILESDIR}"/${P}-x32.patch #575450 +) + src_test() { einfo "compressing config.status to test" src/lzop config.status || die 'compression failed' |