forked from luck/tmp_suning_uos_patched
m68knommu: rename BSS define in linker script
The "BSS" define name now used in asm-generic/vmlinux.lds.h
(introduced in commit ef53dae865
)
clashes with the internal "BSS" define in the m68knommu vmlinux.lds.S
linker script. So rename it.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
This commit is contained in:
parent
c23b6538d0
commit
10f204e5ad
@ -15,7 +15,7 @@
|
||||
#define TEXT ram
|
||||
#define DATA ram
|
||||
#define INIT ram
|
||||
#define BSS ram
|
||||
#define BSSS ram
|
||||
#endif
|
||||
#if defined(CONFIG_ROMKERNEL) || defined(CONFIG_HIMEMKERNEL)
|
||||
#define RAM_START CONFIG_RAMBASE
|
||||
@ -27,7 +27,7 @@
|
||||
#define TEXT rom
|
||||
#define DATA ram
|
||||
#define INIT ram
|
||||
#define BSS ram
|
||||
#define BSSS ram
|
||||
#endif
|
||||
|
||||
#ifndef DATA_ADDR
|
||||
@ -192,7 +192,7 @@ SECTIONS {
|
||||
. = ALIGN(4) ;
|
||||
_ebss = . ;
|
||||
_end = . ;
|
||||
} > BSS
|
||||
} > BSSS
|
||||
|
||||
DISCARDS
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user