BK Changeset 1.615 - Makefile fix breaks i386...

BK Changeset 1.615 - Makefile fix breaks i386...

Post by Petr Vandrove » Fri, 06 Sep 2002 23:30:09



Hi David,
  after your $ARCH => $(ARCH) fix in main Makefile make system
on my machine now believes that arch/i386/vmlinux.lds should
be built through vmlinux.lds.S => (rule in Makefile) vmlinux.lds.s =>
(default as,ld) => vmlinux.lds, although neither of vmlinux.lds.S nor
vmlinux.lds.s does exist :-( So build fails.

  I was not able to fix problem other way than moving
arch/$(ARCH)/vmlinux.lds.s rule down to arch's Makefiles, but I believe
that there must be some better way to do that...
                                  Thanks,
                                                Petr Vandrovec

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

BK Changeset 1.615 - Makefile fix breaks i386...

Post by Kai Germaschewsk » Sat, 07 Sep 2002 00:20:03


On Thu, 5 Sep 2002, Petr Vandrovec wrote:
> Hi David,
>   after your $ARCH => $(ARCH) fix in main Makefile make system
> on my machine now believes that arch/i386/vmlinux.lds should
> be built through vmlinux.lds.S => (rule in Makefile) vmlinux.lds.s =>
> (default as,ld) => vmlinux.lds, although neither of vmlinux.lds.S nor
> vmlinux.lds.s does exist :-( So build fails.

>   I was not able to fix problem other way than moving
> arch/$(ARCH)/vmlinux.lds.s rule down to arch's Makefiles, but I believe
> that there must be some better way to do that...

Ugh, sorry, that's all my bad - I accidentally included a cset in the
latest merge which I didn't mean to, since it was not tested properly yet
(obviously ;).

Now, since it happened anyway:

The plan is to always feed the linker script through cpp - many archs do
it already anyway, so doing it always makes things more consistent.

Andrew Morton also has a patch which needs preprocessing vmlinux.lds on
i386, which is an additional reason, another one is the building in a
separate objdir (That's for later, though)

So, the attached patch finishes this work at least for i386, un-breaking
it.

Linus, please apply.

--Kai

Pull from http://linux-isdn.bkbits.net/linux-2.5.make

(Merging changesets omitted for clarity)

-----------------------------------------------------------------------------
Change...@1.616, 2002-09-05 10:07:47-05:00, k...@tp1.ruhr-uni-bochum.de
  kbuild: Preprocess vmlinux.lds on i386 as well.

  We want do so on all architectures for consistency, and i386 will need
  the preprocessing soon anyway.

 ----------------------------------------------------------------------------
 arch/i386/vmlinux.lds     |  101 ----------------------------------------------
 b/arch/i386/Makefile      |    4 -
 b/arch/i386/vmlinux.lds.S |  101 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 103 insertions(+), 103 deletions(-)

=============================================================================
unified diffs follow for reference
=============================================================================

-----------------------------------------------------------------------------
Change...@1.616, 2002-09-05 10:07:47-05:00, k...@tp1.ruhr-uni-bochum.de
  kbuild: Preprocess vmlinux.lds on i386 as well.

  We want do so on all architectures for consistency, and i386 will need
  the preprocessing soon anyway.

  ---------------------------------------------------------------------------

diff -Nru a/arch/i386/Makefile b/arch/i386/Makefile
--- a/arch/i386/Makefile        Thu Sep  5 10:08:04 2002
+++ b/arch/i386/Makefile        Thu Sep  5 10:08:04 2002
@@ -18,7 +18,7 @@

 LDFLAGS                := -m elf_i386
 OBJCOPYFLAGS   := -O binary -R .note -R .comment -S
-LDFLAGS_vmlinux := -T arch/i386/vmlinux.lds -e stext
+LDFLAGS_vmlinux := -T arch/i386/vmlinux.lds.s -e stext

 CFLAGS += -pipe

@@ -104,7 +104,7 @@

 MAKEBOOT = +$(MAKE) -C arch/$(ARCH)/boot

-vmlinux: arch/i386/vmlinux.lds
+vmlinux: arch/i386/vmlinux.lds.s

 .PHONY: zImage bzImage compressed zlilo bzlilo zdisk bzdisk install \
                clean archclean archmrproper
diff -Nru a/arch/i386/vmlinux.lds b/arch/i386/vmlinux.lds
--- a/arch/i386/vmlinux.lds     Thu Sep  5 10:08:04 2002
+++ /dev/null   Wed Dec 31 16:00:00 1969
@@ -1,101 +0,0 @@
-/* ld script to make i386 Linux kernel
- * Written by Martin Mares <m...@atrey.karlin.mff.cuni.cz>;
- */
-OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
-OUTPUT_ARCH(i386)
-ENTRY(_start)
-jiffies = jiffies_64;
-SECTIONS
-{
-  . = 0xC0000000 + 0x100000;
-  _text = .;                   /* Text and read-only data */
-  .text : {
-       *(.text)
-       *(.fixup)
-       *(.gnu.warning)
-       } = 0x9090
-
-  _etext = .;                  /* End of text section */
-
-  .rodata : { *(.rodata) *(.rodata.*) }
-  .kstrtab : { *(.kstrtab) }
-
-  . = ALIGN(16);               /* Exception table */
-  __start___ex_table = .;
-  __ex_table : { *(__ex_table) }
-  __stop___ex_table = .;
-
-  __start___ksymtab = .;       /* Kernel symbol table */
-  __ksymtab : { *(__ksymtab) }
-  __stop___ksymtab = .;
-
-  .data : {                    /* Data */
-       *(.data)
-       CONSTRUCTORS
-       }
-
-  _edata = .;                  /* End of data section */
-
-  . = ALIGN(8192);             /* init_task */
-  .data.init_task : { *(.data.init_task) }
-
-  . = ALIGN(4096);             /* Init code and data */
-  __init_begin = .;
-  .text.init : { *(.text.init) }
-  .data.init : { *(.data.init) }
-  . = ALIGN(16);
-  __setup_start = .;
-  .setup.init : { *(.setup.init) }
-  __setup_end = .;
-  __initcall_start = .;
-  .initcall.init : {
-       *(.initcall1.init)
-       *(.initcall2.init)
-       *(.initcall3.init)
-       *(.initcall4.init)
-       *(.initcall5.init)
-       *(.initcall6.init)
-       *(.initcall7.init)
-  }
-  __initcall_end = .;
-  . = ALIGN(32);
-  __per_cpu_start = .;
-  .data.percpu  : { *(.data.percpu) }
-  __per_cpu_end = .;
-  . = ALIGN(4096);
-  __init_end = .;
-
-  . = ALIGN(4096);
-  __nosave_begin = .;
-  .data_nosave : { *(.data.nosave) }
-  . = ALIGN(4096);
-  __nosave_end = .;
-
-  . = ALIGN(4096);
-  .data.page_aligned : { *(.data.idt) }
-
-  . = ALIGN(32);
-  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
-
-  __bss_start = .;             /* BSS */
-  .bss : {
-       *(.bss)
-       }
-  _end = . ;
-
-  /* Sections to be discarded */
-  /DISCARD/ : {
-       *(.text.exit)
-       *(.data.exit)
-       *(.exitcall.exit)
-       }
-
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
-}
diff -Nru a/arch/i386/vmlinux.lds.S b/arch/i386/vmlinux.lds.S
--- /dev/null   Wed Dec 31 16:00:00 1969
+++ b/arch/i386/vmlinux.lds.S   Thu Sep  5 10:08:04 2002
@@ -0,0 +1,101 @@
+/* ld script to make i386 Linux kernel
+ * Written by Martin Mares <m...@atrey.karlin.mff.cuni.cz>;
+ */
+OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386")
+OUTPUT_ARCH(i386)
+ENTRY(_start)
+jiffies = jiffies_64;
+SECTIONS
+{
+  . = 0xC0000000 + 0x100000;
+  _text = .;                   /* Text and read-only data */
+  .text : {
+       *(.text)
+       *(.fixup)
+       *(.gnu.warning)
+       } = 0x9090
+
+  _etext = .;                  /* End of text section */
+
+  .rodata : { *(.rodata) *(.rodata.*) }
+  .kstrtab : { *(.kstrtab) }
+
+  . = ALIGN(16);               /* Exception table */
+  __start___ex_table = .;
+  __ex_table : { *(__ex_table) }
+  __stop___ex_table = .;
+
+  __start___ksymtab = .;       /* Kernel symbol table */
+  __ksymtab : { *(__ksymtab) }
+  __stop___ksymtab = .;
+
+  .data : {                    /* Data */
+       *(.data)
+       CONSTRUCTORS
+       }
+
+  _edata = .;                  /* End of data section */
+
+  . = ALIGN(8192);             /* init_task */
+  .data.init_task : { *(.data.init_task) }
+
+  . = ALIGN(4096);             /* Init code and data */
+  __init_begin = .;
+  .text.init : { *(.text.init) }
+  .data.init : { *(.data.init) }
+  . = ALIGN(16);
+  __setup_start = .;
+  .setup.init : { *(.setup.init) }
+  __setup_end = .;
+  __initcall_start = .;
+  .initcall.init : {
+       *(.initcall1.init)
+       *(.initcall2.init)
+       *(.initcall3.init)
+       *(.initcall4.init)
+       *(.initcall5.init)
+       *(.initcall6.init)
+       *(.initcall7.init)
+  }
+  __initcall_end = .;
+  . = ALIGN(32);
+  __per_cpu_start = .;
+  .data.percpu  : { *(.data.percpu) }
+  __per_cpu_end = .;
+  . = ALIGN(4096);
+  __init_end = .;
+
+  . = ALIGN(4096);
+  __nosave_begin = .;
+  .data_nosave : { *(.data.nosave) }
+  . = ALIGN(4096);
+  __nosave_end = .;
+
+  . = ALIGN(4096);
+  .data.page_aligned : { *(.data.idt) }
+
+  . = ALIGN(32);
+  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
+
+  __bss_start = .;             /* BSS */
+  .bss : {
+       *(.bss)
+       }
+  _end = . ;
+
+  /* Sections to be discarded */
+  /DISCARD/ : {
+       *(.text.exit)
+       *(.data.exit)
+       *(.exitcall.exit)
+       }
+
+  /* Stabs debugging sections.  */
+  .stab 0 : { *(.stab) }
+  .stabstr 0 : { *(.stabstr) }
+  .stab.excl 0 : { *(.stab.excl) }
+  .stab.exclstr 0 : { *(.stab.exclstr) }
+  .stab.index 0 : { *(.stab.index) }
+  .stab.indexstr 0 : { *(.stab.indexstr) }
+  .comment 0 : { *(.comment) }
+}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

 
 
 

1. Need help with BK ChangeSet mail addresses

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

I have difficulties figuring out the real names of the people behind
these addresses (BK linux-2.4, since v2.4.19 to current):

If anyone can tell me the real name behind either of these addresses, or


know, and please don't mangle your name removing umlauts or other
national characters.

The results are meant to become part of my lk-changelog.pl script and
for later merge into bk://gkernel.bkbits.net/BK-kernel-tools/

My sources comprise the lbdb of mails to linux-kernel and a quick
google.com search for the mail address in double quotes

Thanks in advance for any help. Here's the list.


















- --
Matthias Andree
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)

iD8DBQE9xlvvFmbjPHp/pcMRAtSsAJ932i8CelJHwga71QbL4q8Z4RQSJACeNz5A
a9Wv4OEXnaQ4X68mpdhmSDA=
=eqru
-----END PGP SIGNATURE-----
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in

More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

2. dhcpd woes

3. Linus BK: change to asm-i386/thread_info.h causes build failure: no TIF_USEDFPU

4. Connectionless DLPI

5. Downloading RH7...So many types: 7.0-i386...7.0-i386-respin...7.0-ja-i386

6. FIOASYNC

7. 2.5.69 Changes to Kconfig and i386 Makefile to include support for various K7 optimizations

8. AUGH!

9. ypinit problem with makefile on Redhat 5.1 (i386).

10. Makefile: where is arch/i386/boot?

11. USE_STANDARD_AS_RULE in i386 arch Makefiles

12. 2.5.69 Changes to Kconfig and i386 Makefile to include support for various K7 optimizations

13. 2.5.69 Change to i386 Makefile to distinguish athlons.