summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2019-02-18 17:49:05 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-19 16:14:57 +0000
commita25637e7e6be1d4e40db8085b654a5beeed7fbc1 (patch)
treec0c8a6c1f3109978aa3730d187dd0cd92326bd59 /meta
parent290e68af72086647fa984a797354dab7afc996d6 (diff)
downloadpoky-a25637e7e6be1d4e40db8085b654a5beeed7fbc1.tar.gz
lzop: upgrade 1.03 -> 1.04
License checksum changed due to updated copyright year and cleanup. 3 patches for miniacc.h were incorporated upstream. Build-tested on qemu targets, including x32. (From OE-Core rev: e243edc0456858d26b21a5b643ea9c0ae143fa4b) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch100
-rw-r--r--meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch37
-rw-r--r--meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch36
-rw-r--r--meta/recipes-support/lzop/lzop_1.04.bb (renamed from meta/recipes-support/lzop/lzop_1.03.bb)11
4 files changed, 4 insertions, 180 deletions
diff --git a/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch b/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
deleted file mode 100644
index 867b88b308..0000000000
--- a/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch
+++ /dev/null
@@ -1,100 +0,0 @@
1From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 16 Aug 2015 10:35:47 -0700
4Subject: [PATCH] use static inlines as the external inline definition has
5 changed with gcc5
6
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8---
9Upstream-Status: Pending
10
11 src/miniacc.h | 24 ++++++++----------------
12 1 file changed, 8 insertions(+), 16 deletions(-)
13
14diff --git a/src/miniacc.h b/src/miniacc.h
15index 09e6f0c..cae98d1 100644
16--- a/src/miniacc.h
17+++ b/src/miniacc.h
18@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
19 #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
20 #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
21 #if !defined(ACC_UA_GET_LE16)
22-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp);
23-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
24+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
25 __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp;
26 unsigned long v;
27 __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
28@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const
29 #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p)
30 #endif
31 #if !defined(ACC_UA_SET_LE16)
32-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v);
33-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
34+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
35 __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp;
36 __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
37 }
38@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi
39 #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
40 #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
41 #if !defined(ACC_UA_GET_LE32)
42-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp);
43-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
44+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
45 __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp;
46 unsigned long v;
47 __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
48@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const
49 #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p)
50 #endif
51 #if !defined(ACC_UA_SET_LE32)
52-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v);
53-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
54+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
55 __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp;
56 __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
57 }
58@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t);
59 #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
60 #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
61 #if !defined(ACC_UA_GET_LE16)
62-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp);
63-extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
64+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) {
65 __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp;
66 unsigned long v;
67 __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
68@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const
69 #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p)
70 #endif
71 #if !defined(ACC_UA_SET_LE16)
72-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v);
73-extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
74+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) {
75 __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp;
76 __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
77 }
78@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi
79 #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline)
80 #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC)
81 #if !defined(ACC_UA_GET_LE32)
82-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp);
83-extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
84+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) {
85 __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp;
86 unsigned long v;
87 __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p));
88@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const
89 #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p)
90 #endif
91 #if !defined(ACC_UA_SET_LE32)
92-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v);
93-extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
94+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) {
95 __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp;
96 __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v));
97 }
98--
992.5.0
100
diff --git a/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch b/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch
deleted file mode 100644
index 72b33970e2..0000000000
--- a/meta/recipes-support/lzop/lzop/lzop-1.03-gcc6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1gcc-6 has additional errors e.g.
2
3./test.c:1:12: error: variably modified '__acc_cta' at file scope
4 extern int __acc_cta[1-2*!((1l << (8*8 -1)) < 0)];
5 ^~~~~~~~~
6
7This is rightly pointed out since that index is undefined
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10Upstream-Status: Pending
11
12--- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100
13+++ a/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100
14@@ -4469,12 +4469,12 @@
15 #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150)
16 #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
17 #else
18- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0)
19+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0)
20 #endif
21 ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0)
22 #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
23 #else
24- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0)
25+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0)
26 #endif
27 ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0)
28 #if defined(acc_int16e_t)
29@@ -4703,7 +4703,7 @@
30 #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC)
31 #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC)
32 #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1)
33- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
34+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0)
35 #endif
36 #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560))
37 # pragma option pop
diff --git a/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch b/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
deleted file mode 100644
index 739be82311..0000000000
--- a/meta/recipes-support/lzop/lzop/x32_abi_miniacc_h.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1Fix get of FLAGS register in x32 ABI,
2
3x32 ABI requires to have 64-bit variable to store FLAGS register
4instead of size_t that is 32-bit variable, this fix operand
5type mismatch when try to pop previous pushf value.
6
7Upstream-Status: Submitted
8
9Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
10
11Index: lzop-1.03/src/miniacc.h
12===================================================================
13--- lzop-1.03.orig/src/miniacc.h
14+++ lzop-1.03/src/miniacc.h
15@@ -754,6 +754,9 @@
16 #elif defined(__amd64__) || defined(__x86_64__) || defined(_M_AMD64)
17 # define ACC_ARCH_AMD64 1
18 # define ACC_INFO_ARCH "amd64"
19+# if defined(__ILP32__)
20+# define ACC_ARCH_AMD64_X32 1
21+# endif
22 #elif defined(__thumb__) || (defined(_M_ARM) && defined(_M_THUMB))
23 # define ACC_ARCH_ARM 1
24 # define ACC_ARCH_ARM_THUMB 1
25@@ -6787,7 +6790,11 @@ ACCLIB_PUBLIC_NOINLINE(void, acc_debug_n
26 ACCLIB_PUBLIC_NOINLINE(int, acc_debug_align_check_query) (void)
27 {
28 #if (ACC_ARCH_AMD64 || ACC_ARCH_I386) && (ACC_ASM_SYNTAX_GNUC)
29+# if defined(ACC_ARCH_AMD64_X32)
30+ unsigned long long r;
31+# else
32 size_t r;
33+# endif
34 __asm__ __volatile__("pushf\n pop %0\n" : "=a" (r) : : __ACC_ASM_CLOBBER);
35 return (int)(r >> 18) & 1;
36 #elif (ACC_ARCH_I386) && (ACC_ASM_SYNTAX_MSC)
diff --git a/meta/recipes-support/lzop/lzop_1.03.bb b/meta/recipes-support/lzop/lzop_1.04.bb
index 6f09002f55..b50c230437 100644
--- a/meta/recipes-support/lzop/lzop_1.03.bb
+++ b/meta/recipes-support/lzop/lzop_1.04.bb
@@ -8,17 +8,14 @@ to gzip."
8DEPENDS += "lzo" 8DEPENDS += "lzo"
9 9
10LICENSE = "GPLv2+" 10LICENSE = "GPLv2+"
11LIC_FILES_CHKSUM = "file://COPYING;md5=dfeaf3dc4beef4f5a7bdbc35b197f39e \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12 file://src/lzop.c;beginline=5;endline=21;md5=6797bd3ed0a1a49327b7ebf9366ebd86" 12 file://src/lzop.c;beginline=5;endline=21;md5=23d767de7754eb24b9e900b025cf7fc8"
13 13
14SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \ 14SRC_URI = "http://www.lzop.org/download/${BP}.tar.gz \
15 file://acinclude.m4 \ 15 file://acinclude.m4 \
16 file://x32_abi_miniacc_h.patch \
17 file://0001-use-static-inlines-as-the-external-inline-definition.patch \
18 file://lzop-1.03-gcc6.patch \
19 " 16 "
20SRC_URI[md5sum] = "006c5e27fb78cdd14a628fdfa5aa1905" 17SRC_URI[md5sum] = "271eb10fde77a0a96b9cbf745e719ddf"
21SRC_URI[sha256sum] = "c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9" 18SRC_URI[sha256sum] = "7e72b62a8a60aff5200a047eea0773a8fb205caf7acbe1774d95147f305a2f41"
22 19
23inherit autotools 20inherit autotools
24 21
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 02:53:51 +0000