[U-Boot] fs/jffs2/mini_inflate.c: use "static inline" instead of "inline"

Message ID 20171010164239.25453-1-vagrant@debian.org
State Accepted
Delegated to: Tom Rini
Headers show
Series
  • [U-Boot] fs/jffs2/mini_inflate.c: use "static inline" instead of "inline"
Related show

Commit Message

Vagrant Cascadian Oct. 10, 2017, 4:42 p.m.
This makes gcc no longer expect an out-of-line version of the
functions being present elsewhere.

This fixes a failure to build on several marvell targets with gcc-7 on
Debian:

  https://bugs.debian.org/877963

Signed-off-by: Adrian Bunk <bunk@debian.org>
Signed-off-by: Vagrant Cascadian <vagrant@debian.org>
---

 fs/jffs2/mini_inflate.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Tom Rini Oct. 17, 2017, 12:47 a.m. | #1
On Tue, Oct 10, 2017 at 09:42:39AM -0700, Vagrant Cascadian wrote:

> This makes gcc no longer expect an out-of-line version of the
> functions being present elsewhere.
> 
> This fixes a failure to build on several marvell targets with gcc-7 on
> Debian:
> 
>   https://bugs.debian.org/877963
> 
> Signed-off-by: Adrian Bunk <bunk@debian.org>
> Signed-off-by: Vagrant Cascadian <vagrant@debian.org>

Applied to u-boot/master, thanks!

Patch

diff --git a/fs/jffs2/mini_inflate.c b/fs/jffs2/mini_inflate.c
index 2f13412f98..7bfbdb6801 100644
--- a/fs/jffs2/mini_inflate.c
+++ b/fs/jffs2/mini_inflate.c
@@ -16,7 +16,7 @@ 
 static unsigned char huffman_order[] = {16, 17, 18,  0,  8,  7,  9,  6, 10,  5,
 					11,  4, 12,  3, 13,  2, 14,  1, 15};
 
-inline void cramfs_memset(int *s, const int c, size n)
+static inline void cramfs_memset(int *s, const int c, size n)
 {
 	n--;
 	for (;n > 0; n--) s[n] = c;
@@ -65,8 +65,8 @@  static void init_stream(struct bitstream *stream, unsigned char *data,
 /* pull 'bits' bits out of the stream. The last bit pulled it returned as the
  * msb. (section 3.1.1)
  */
-inline unsigned long pull_bits(struct bitstream *stream,
-			       const unsigned int bits)
+static inline unsigned long pull_bits(struct bitstream *stream,
+				      const unsigned int bits)
 {
 	unsigned long ret;
 	int i;
@@ -85,7 +85,7 @@  inline unsigned long pull_bits(struct bitstream *stream,
 	return ret;
 }
 
-inline int pull_bit(struct bitstream *stream)
+static inline int pull_bit(struct bitstream *stream)
 {
 	int ret = ((*(stream->data) >> stream->bit) & 1);
 	if (stream->bit++ == 7) {