From: u.kleine-koenig@pengutronix.de (Uwe Kleine-König)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2.6.34] ARM: SAMSUNG: Fix build after "ARM: Eliminate decompressor -Dstatic= PIC hack"
Date: Tue, 2 Mar 2010 09:25:37 +0100 [thread overview]
Message-ID: <20100302082537.GA17629@pengutronix.de> (raw)
In-Reply-To: <1267469542-19633-1-git-send-email-broonie@opensource.wolfsonmicro.com>
On Mon, Mar 01, 2010 at 06:52:22PM +0000, Mark Brown wrote:
> Commit 5de813b6 (ARM: Eliminate decompressor -Dstatic= PIC hack) among
> other things changed the declared type of the error() function to an
> extern, conflicting with the forward declartion in the Samsung
declaration --------------------------------^
> plat/uncompress.h which appears to have been relying on the static
> being defined away, causing build failures since error() ends up with
> a GOT relocation but the linker script discards all GOT relocated
> data and functions:
>
> arch/arm/boot/compressed/decompress.o: In function `gunzip':
> /home/broonie/git/linux-2.6/arch/arm/boot/compressed/../../../../lib/decompress_inflate.c:68: undefined reference to `error'
>
> and so on. Fix this with minimal invasiveness by fixing the
> plat/uncompress.h declaration.
>
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
> arch/arm/plat-samsung/include/plat/uncompress.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/plat-samsung/include/plat/uncompress.h b/arch/arm/plat-samsung/include/plat/uncompress.h
> index e87ce8f..e41e6d2 100644
> --- a/arch/arm/plat-samsung/include/plat/uncompress.h
> +++ b/arch/arm/plat-samsung/include/plat/uncompress.h
> @@ -140,7 +140,7 @@ static void arch_decomp_error(const char *x)
> #define arch_error arch_decomp_error
> #endif
>
> -static void error(char *err);
> +extern void error(char *err);
>
> #ifdef CONFIG_S3C_BOOT_UART_FORCE_FIFO
> static inline void arch_enable_uart_fifo(void)
> --
> 1.7.0
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Pengutronix e.K. | Uwe Kleine-K?nig |
Industrial Linux Solutions | http://www.pengutronix.de/ |
next prev parent reply other threads:[~2010-03-02 8:25 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-01 18:52 [PATCH 2.6.34] ARM: SAMSUNG: Fix build after "ARM: Eliminate decompressor -Dstatic= PIC hack" Mark Brown
2010-03-02 8:25 ` Uwe Kleine-König [this message]
2010-03-10 17:17 ` Mark Brown
2010-03-10 17:25 ` Russell King - ARM Linux
2010-03-10 17:42 ` Mark Brown
2010-03-10 17:46 ` Russell King - ARM Linux
2010-03-10 17:56 ` Mark Brown
2010-03-10 18:01 ` Russell King - ARM Linux
2010-03-10 18:16 ` Mark Brown
2010-03-10 18:08 ` [PATCH] ARM: Fix Samsung " Mark Brown
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=20100302082537.GA17629@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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;
as well as URLs for NNTP newsgroup(s).