diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-20 19:49:45 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-20 19:49:45 -0400 |
| commit | aea1f7964ae6cba5eb419a958956deb9016b3341 (patch) | |
| tree | e326d376529ea0be73ab435317709b684bb3f7cf /include | |
| parent | 457f82bac659745f6d5052e4c493d92d62722c9c (diff) | |
| parent | 04e448d9a386640a79a4aa71251aa1cdd314f662 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
vmlinux.lds.h: restructure BSS linker script macros
kconfig: initialize the screen before using curses(3) functions
kconfig: variable argument lists needs `stdarg.h'
kbuild, deb-pkg: fix install scripts for posix sh
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index a553f1041cf1..6ad76bf5fb40 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -30,9 +30,7 @@ | |||
| 30 | * EXCEPTION_TABLE(...) | 30 | * EXCEPTION_TABLE(...) |
| 31 | * NOTES | 31 | * NOTES |
| 32 | * | 32 | * |
| 33 | * __bss_start = .; | 33 | * BSS_SECTION(0, 0, 0) |
| 34 | * BSS_SECTION(0, 0) | ||
| 35 | * __bss_stop = .; | ||
| 36 | * _end = .; | 34 | * _end = .; |
| 37 | * | 35 | * |
| 38 | * /DISCARD/ : { | 36 | * /DISCARD/ : { |
| @@ -489,7 +487,8 @@ | |||
| 489 | * bss (Block Started by Symbol) - uninitialized data | 487 | * bss (Block Started by Symbol) - uninitialized data |
| 490 | * zeroed during startup | 488 | * zeroed during startup |
| 491 | */ | 489 | */ |
| 492 | #define SBSS \ | 490 | #define SBSS(sbss_align) \ |
| 491 | . = ALIGN(sbss_align); \ | ||
| 493 | .sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \ | 492 | .sbss : AT(ADDR(.sbss) - LOAD_OFFSET) { \ |
| 494 | *(.sbss) \ | 493 | *(.sbss) \ |
| 495 | *(.scommon) \ | 494 | *(.scommon) \ |
| @@ -498,12 +497,10 @@ | |||
| 498 | #define BSS(bss_align) \ | 497 | #define BSS(bss_align) \ |
| 499 | . = ALIGN(bss_align); \ | 498 | . = ALIGN(bss_align); \ |
| 500 | .bss : AT(ADDR(.bss) - LOAD_OFFSET) { \ | 499 | .bss : AT(ADDR(.bss) - LOAD_OFFSET) { \ |
| 501 | VMLINUX_SYMBOL(__bss_start) = .; \ | ||
| 502 | *(.bss.page_aligned) \ | 500 | *(.bss.page_aligned) \ |
| 503 | *(.dynbss) \ | 501 | *(.dynbss) \ |
| 504 | *(.bss) \ | 502 | *(.bss) \ |
| 505 | *(COMMON) \ | 503 | *(COMMON) \ |
| 506 | VMLINUX_SYMBOL(__bss_stop) = .; \ | ||
| 507 | } | 504 | } |
| 508 | 505 | ||
| 509 | /* | 506 | /* |
| @@ -735,8 +732,10 @@ | |||
| 735 | INIT_RAM_FS \ | 732 | INIT_RAM_FS \ |
| 736 | } | 733 | } |
| 737 | 734 | ||
| 738 | #define BSS_SECTION(sbss_align, bss_align) \ | 735 | #define BSS_SECTION(sbss_align, bss_align, stop_align) \ |
| 739 | SBSS \ | 736 | . = ALIGN(sbss_align); \ |
| 737 | VMLINUX_SYMBOL(__bss_start) = .; \ | ||
| 738 | SBSS(sbss_align) \ | ||
| 740 | BSS(bss_align) \ | 739 | BSS(bss_align) \ |
| 741 | . = ALIGN(4); | 740 | . = ALIGN(stop_align); \ |
| 742 | 741 | VMLINUX_SYMBOL(__bss_stop) = .; | |