From 0d0a591fca9fadd786f0ccda05cd68c295d6bb21 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 22 Aug 2015 08:52:58 -0700 Subject: mdadm: Upgrade mdadm_3.3.2.bb -> mdadm_3.3.4.bb Drop upstreamed patch for gcc5 compatibility Forward port x32 patch (From OE-Core rev: 2782ae4dfb417ba377f861283792d7d9929f2ae3) Signed-off-by: Khem Raj Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-extended/mdadm/files/inline.patch | 39 -------------------------- 1 file changed, 39 deletions(-) delete mode 100644 meta/recipes-extended/mdadm/files/inline.patch (limited to 'meta/recipes-extended/mdadm/files/inline.patch') diff --git a/meta/recipes-extended/mdadm/files/inline.patch b/meta/recipes-extended/mdadm/files/inline.patch deleted file mode 100644 index 9009f0650c..0000000000 --- a/meta/recipes-extended/mdadm/files/inline.patch +++ /dev/null @@ -1,39 +0,0 @@ -with gnu11 turning on a default with gcc-5 we have to abide by new inline semantics -using 'inline' and using is in same translation unit means an external definition has to exist -same like "external inline" in gnu89, we simply make the functions static inline since they -are just meant to be used in this file - -Upstream-Status: Pending -Signed-off-by: Khem Raj - -Index: mdadm-3.3.2/bitmap.c -=================================================================== ---- mdadm-3.3.2.orig/bitmap.c -+++ mdadm-3.3.2/bitmap.c -@@ -20,7 +20,7 @@ - - #include "mdadm.h" - --inline void sb_le_to_cpu(bitmap_super_t *sb) -+static inline void sb_le_to_cpu(bitmap_super_t *sb) - { - sb->magic = __le32_to_cpu(sb->magic); - sb->version = __le32_to_cpu(sb->version); -@@ -34,7 +34,7 @@ inline void sb_le_to_cpu(bitmap_super_t - sb->write_behind = __le32_to_cpu(sb->write_behind); - } - --inline void sb_cpu_to_le(bitmap_super_t *sb) -+static inline void sb_cpu_to_le(bitmap_super_t *sb) - { - sb_le_to_cpu(sb); /* these are really the same thing */ - } -@@ -74,7 +74,7 @@ typedef struct bitmap_info_s { - } bitmap_info_t; - - /* count the dirty bits in the first num_bits of byte */ --inline int count_dirty_bits_byte(char byte, int num_bits) -+static inline int count_dirty_bits_byte(char byte, int num_bits) - { - int num = 0; - -- cgit 1.2.3-korg