From: tip-bot for Ingo Molnar <mingo@elte.hu>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
sam@ravnborg.org, torvalds@linux-foundation.org,
roland@redhat.com, tglx@linutronix.de, mingo@elte.hu
Subject: [tip:x86/urgent] x86: Document linker script ASSERT() quirk
Date: Fri, 16 Oct 2009 05:28:16 GMT [thread overview]
Message-ID: <tip-a5912f6b3e20c137172460e6d4dd180866c00963@git.kernel.org> (raw)
In-Reply-To: <4AD6523D.5030909@zytor.com>
Commit-ID: a5912f6b3e20c137172460e6d4dd180866c00963
Gitweb: http://git.kernel.org/tip/a5912f6b3e20c137172460e6d4dd180866c00963
Author: Ingo Molnar <mingo@elte.hu>
AuthorDate: Fri, 16 Oct 2009 07:18:46 +0200
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 16 Oct 2009 07:18:46 +0200
x86: Document linker script ASSERT() quirk
Older binutils breaks if ASSERT() is used without a sink
for the output.
For example 2.14.90.0.6 is known to be broken, the link
fails with:
LD .tmp_vmlinux1
ld:arch/x86/kernel/vmlinux.lds:678: parse error
Document this quirk in all three files that use it.
See: http://marc.info/?l=linux-kbuild&m=124930110427870&w=2
See[2]: d2ba8b2 ("x86: Fix assert syntax in vmlinux.lds.S")
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Roland McGrath <roland@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
LKML-Reference: <4AD6523D.5030909@zytor.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/boot/setup.ld | 3 +++
arch/x86/kernel/acpi/realmode/wakeup.lds.S | 3 +++
arch/x86/kernel/vmlinux.lds.S | 3 +++
3 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/x86/boot/setup.ld b/arch/x86/boot/setup.ld
index 0f6ec45..03c0683 100644
--- a/arch/x86/boot/setup.ld
+++ b/arch/x86/boot/setup.ld
@@ -53,6 +53,9 @@ SECTIONS
/DISCARD/ : { *(.note*) }
+ /*
+ * The ASSERT() sink to . is intentional, for binutils 2.14 compatibility:
+ */
. = ASSERT(_end <= 0x8000, "Setup too big!");
. = ASSERT(hdr == 0x1f1, "The setup header has the wrong offset!");
/* Necessary for the very-old-loader check to work... */
diff --git a/arch/x86/kernel/acpi/realmode/wakeup.lds.S b/arch/x86/kernel/acpi/realmode/wakeup.lds.S
index 7da00b7..060fff8 100644
--- a/arch/x86/kernel/acpi/realmode/wakeup.lds.S
+++ b/arch/x86/kernel/acpi/realmode/wakeup.lds.S
@@ -57,5 +57,8 @@ SECTIONS
*(.note*)
}
+ /*
+ * The ASSERT() sink to . is intentional, for binutils 2.14 compatibility:
+ */
. = ASSERT(_end <= WAKEUP_SIZE, "Wakeup too big!");
}
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 92929fb..3c68fe2 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -305,6 +305,9 @@ SECTIONS
#ifdef CONFIG_X86_32
+/*
+ * The ASSERT() sink to . is intentional, for binutils 2.14 compatibility:
+ */
. = ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),
"kernel image bigger than KERNEL_IMAGE_SIZE");
#else
next prev parent reply other threads:[~2009-10-16 5:29 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-14 22:10 [PATCH] x86: linker script syntax nits Roland McGrath
2009-10-14 22:35 ` H. Peter Anvin
2009-10-15 6:13 ` [tip:x86/urgent] Revert "x86: linker script syntax nits" tip-bot for Ingo Molnar
2009-10-16 5:28 ` tip-bot for Ingo Molnar [this message]
2009-10-15 3:30 ` [PATCH] x86: linker script syntax nits Sam Ravnborg
2009-10-15 6:38 ` Ingo Molnar
2009-10-15 17:17 ` H. Peter Anvin
2009-10-15 18:26 ` Roland McGrath
2009-10-15 18:30 ` H. Peter Anvin
2009-10-15 19:27 ` Sam Ravnborg
2009-10-15 6:18 ` Ingo Molnar
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=tip-a5912f6b3e20c137172460e6d4dd180866c00963@git.kernel.org \
--to=mingo@elte.hu \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=roland@redhat.com \
--cc=sam@ravnborg.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.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
all inboxes | Powered by JetHome®