diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-12-10 14:04:48 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-16 12:12:17 +0000 |
commit | f065766508e6cc966d0f11e22fb60ef10d9d8fe6 (patch) | |
tree | 16da374ba58ddf36f75907660a5c177cb206c70f /meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch | |
parent | 5d32aebe36281790e43af5434fb7eb4137d7d05d (diff) | |
download | poky-f065766508e6cc966d0f11e22fb60ef10d9d8fe6.tar.gz |
mtd-utils: update to 1.5.2
Drop 0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch,
the problem has been fixed upstream.
Drop backported 0001-mtd-utils-libfec-use-standard-C-type-instead-of-u_lo.patch
Rebase 0001-Fix-build-with-musl.patch (2 out of 3 fixes have been made upstream)
(From OE-Core rev: 3fba41e7f58ba68bb2e215b6f0bc21bae47ca035)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch')
-rw-r--r-- | meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch | 64 |
1 files changed, 0 insertions, 64 deletions
diff --git a/meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch b/meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch deleted file mode 100644 index 2d36158f54..0000000000 --- a/meta/recipes-devtools/mtd/mtd-utils/0001-hashtable-Remove-duplicate-hashtable_iterator_value-.patch +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | From b856ff35c20124ceae40bbc4d32584df47618c96 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 25 Feb 2015 09:28:26 +0000 | ||
4 | Subject: [PATCH] hashtable: Remove duplicate hashtable_iterator_value/hashtable_iterator_key | ||
5 | |||
6 | gcc5 is defaulting to gnu11 instead of gnu89 like previous versions | ||
7 | as a result the semantics of 'extern inline' changes where in gnu89 for 'extern inline' no external | ||
8 | visible function is generated,in c99 'external inline' generates externally visible function | ||
9 | there is no equivalent in c99+ because redefinitions arent allowed | ||
10 | but 'static inline' remains same for for c89 and c99+, thats why we change the semantics | ||
11 | so we make the functions static inline, and achieve the same effect | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | Upstream-Status: pending | ||
15 | |||
16 | --- | ||
17 | mkfs.ubifs/hashtable/hashtable_itr.c | 12 ------------ | ||
18 | 1 file changed, 12 deletions(-) | ||
19 | |||
20 | Index: git/mkfs.ubifs/hashtable/hashtable_itr.h | ||
21 | =================================================================== | ||
22 | --- git.orig/mkfs.ubifs/hashtable/hashtable_itr.h | ||
23 | +++ git/mkfs.ubifs/hashtable/hashtable_itr.h | ||
24 | @@ -28,7 +28,7 @@ hashtable_iterator(struct hashtable *h); | ||
25 | /* hashtable_iterator_key | ||
26 | * - return the value of the (key,value) pair at the current position */ | ||
27 | |||
28 | -extern inline void * | ||
29 | +static inline void * | ||
30 | hashtable_iterator_key(struct hashtable_itr *i) | ||
31 | { | ||
32 | return i->e->k; | ||
33 | @@ -37,7 +37,7 @@ hashtable_iterator_key(struct hashtable_ | ||
34 | /*****************************************************************************/ | ||
35 | /* value - return the value of the (key,value) pair at the current position */ | ||
36 | |||
37 | -extern inline void * | ||
38 | +static inline void * | ||
39 | hashtable_iterator_value(struct hashtable_itr *i) | ||
40 | { | ||
41 | return i->e->v; | ||
42 | Index: git/mkfs.ubifs/hashtable/hashtable_itr.c | ||
43 | =================================================================== | ||
44 | --- git.orig/mkfs.ubifs/hashtable/hashtable_itr.c | ||
45 | +++ git/mkfs.ubifs/hashtable/hashtable_itr.c | ||
46 | @@ -35,18 +35,6 @@ hashtable_iterator(struct hashtable *h) | ||
47 | } | ||
48 | |||
49 | /*****************************************************************************/ | ||
50 | -/* key - return the key of the (key,value) pair at the current position */ | ||
51 | -/* value - return the value of the (key,value) pair at the current position */ | ||
52 | - | ||
53 | -void * | ||
54 | -hashtable_iterator_key(struct hashtable_itr *i) | ||
55 | -{ return i->e->k; } | ||
56 | - | ||
57 | -void * | ||
58 | -hashtable_iterator_value(struct hashtable_itr *i) | ||
59 | -{ return i->e->v; } | ||
60 | - | ||
61 | -/*****************************************************************************/ | ||
62 | /* advance - advance the iterator to the next element | ||
63 | * returns zero if advanced to end of table */ | ||
64 | |||