mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Michael Olbrich <m.olbrich@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] scripts/compiler.h: inline functions in headers must be static
Date: Fri, 9 Feb 2018 09:37:19 +0100	[thread overview]
Message-ID: <20180209083719.4pf646aqpdllaqun@pengutronix.de> (raw)
In-Reply-To: <20180206104324.21698-1-m.olbrich@pengutronix.de>

On Tue, Feb 06, 2018 at 11:43:24AM +0100, Michael Olbrich wrote:
> Without this building bareboxenv-target with gcc 7.3 fails with:
> 
>   CC      scripts/bareboxenv-target
> /tmp/cc9G2oOY.o: In function `file_action':
> bareboxenv.c:(.text+0x14): undefined reference to `xzalloc'
> /tmp/cc9G2oOY.o: In function `concat_path_file':
> bareboxenv.c:(.text+0xf4): undefined reference to `xmalloc'
> /tmp/cc9G2oOY.o: In function `envfs_save':
> bareboxenv.c:(.text+0x5b4): undefined reference to `xzalloc'
> /tmp/cc9G2oOY.o: In function `envfs_load':
> bareboxenv.c:(.text+0x7d8): undefined reference to `xmalloc'
> collect2: error: ld returned 1 exit status
> 
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> ---
>  scripts/compiler.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied, thanks

Sascha

> 
> diff --git a/scripts/compiler.h b/scripts/compiler.h
> index 0891c3bfa6fa..4cf179bb9b13 100644
> --- a/scripts/compiler.h
> +++ b/scripts/compiler.h
> @@ -113,7 +113,7 @@ typedef uint32_t __u32;
>  	(void) (&_min1 == &_min2);              \
>  	_min1 < _min2 ? _min1 : _min2; })
>  
> -inline void *xmalloc(size_t size)
> +static inline void *xmalloc(size_t size)
>  {
>  	void *p = NULL;
>  
> @@ -125,7 +125,7 @@ inline void *xmalloc(size_t size)
>  	return p;
>  }
>  
> -inline void *xzalloc(size_t size)
> +static inline void *xzalloc(size_t size)
>  {
>  	void *p = xmalloc(size);
>  	memset(p, 0, size);
> -- 
> 2.16.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      reply	other threads:[~2018-02-09  8:37 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-02-06 10:43 Michael Olbrich
2018-02-09  8:37 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180209083719.4pf646aqpdllaqun@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    --cc=m.olbrich@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox