linux-kernel - [PATCH] initramfs: Fix build break on symbol-prefixed archs

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20101019110801.GA4128@linux.vnet.ibm.com>
Date:	Tue, 19 Oct 2010 13:08:03 +0200
From:	Hendrik Brueckner <brueckner@...ux.vnet.ibm.com>
To:	Mike Frysinger <vapier.adi@...il.com>
Cc:	Hendrik Brueckner <brueckner@...ux.vnet.ibm.com>, mmarek@...e.cz,
	Sam Ravnborg <sam@...nborg.org>,
	Michael Holzheu <holzheu@...ux.vnet.ibm.com>,
	tabbott@...lice.com, vda.linux@...glemail.com, hpa@...ux.intel.com,
	akpm@...ux-foundation.org, linux-kernel@...r.kernel.org,
	heiko.carstens@...ibm.com, schwidefsky@...ibm.com
Subject: [PATCH] initramfs: Fix build break on symbol-prefixed archs

Hi Mike,

On Mon, Oct 18, 2010 at 07:07:13PM -0400, Mike Frysinger wrote:
> On Mon, Oct 18, 2010 at 06:37, Hendrik Brueckner wrote:
> > On Sun, Oct 17, 2010 at 02:28:11PM -0400, Mike Frysinger wrote:
> >> On Tue, Aug 31, 2010 at 04:23, Hendrik Brueckner wrote:
> >> i'm pretty sure this breaks on every symbol-prefixed arch.  at least,
> >> it broke every Blackfin board:
> >> init/built-in.o: In function `populate_rootfs':
> >> init/initramfs.c:(.init.text+0x2548): undefined reference to `__initramfs_size'
> >> init/initramfs.c:(.init.text+0x254e): undefined reference to `__initramfs_size'
> >> make: *** [.tmp_vmlinux1] Error 1
> >>
> negative.  same error.  vmlinux.lds.h might need to be switched to
> CONFIG_SYMBOL_PREFIX.

In my previous patch I missed a change regarding the SYMBOL_PREFIX symbol.
The SYMBOL_PREFIX symbol, which is used by VMLINUX_SYMBOL, is derived
from the CONFIG_SYMBOL_PREFIX and must be defined in the Makefile.

Below you can find the updated patch which worked for my blackfin test build.

Thanks and kind regards,
  Hendrik

--- 8< -----------------------
Define the __initramfs_size variable using VMLINUX_SYMBOL() to take
care of symbol-prefixed architectures, for example, blackfin.

Depending on the CONFIG_SYMBOL_PREFIX configuration option, define
the SYMBOL_PREFIX symbol which is evaluated by VMLINUX_SYMBOL().

Signed-off-by: Hendrik Brueckner <brueckner@...ux.vnet.ibm.com>
---
 usr/Makefile         |    3 +++
 usr/initramfs_data.S |    5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

--- a/usr/Makefile
+++ b/usr/Makefile
@@ -19,6 +19,9 @@ suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZ
 suffix_$(CONFIG_INITRAMFS_COMPRESSION_LZO)   = .lzo
 
 AFLAGS_initramfs_data.o += -DINITRAMFS_IMAGE="usr/initramfs_data.cpio$(suffix_y)"
+ifdef CONFIG_SYMBOL_PREFIX
+AFLAGS_initramfs_data.o += -DSYMBOL_PREFIX=$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))
+endif
 
 # Generate builtin.o based on initramfs_data.o
 obj-$(CONFIG_BLK_DEV_INITRD) := initramfs_data.o
--- a/usr/initramfs_data.S
+++ b/usr/initramfs_data.S
@@ -22,14 +22,15 @@
 */
 
 #include <linux/stringify.h>
+#include <asm-generic/vmlinux.lds.h>
 
 .section .init.ramfs,"a"
 __irf_start:
 .incbin __stringify(INITRAMFS_IMAGE)
 __irf_end:
 .section .init.ramfs.info,"a"
-.globl __initramfs_size
-__initramfs_size:
+.globl VMLINUX_SYMBOL(__initramfs_size)
+VMLINUX_SYMBOL(__initramfs_size):
 #ifdef CONFIG_32BIT
 	.long __irf_end - __irf_start
 #else
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/