UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Greg Ungerer 2009-10-30 14:58:58 +10:00 committed by Greg Ungerer
parent c23b6538d0
commit 10f204e5ad
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/m68knommu/kernel/vmlinux.lds.S
View File

@ -15,7 +15,7 @@
#define TEXT ram #define TEXT ram
#define DATA ram #define DATA ram
#define INIT ram #define INIT ram
#define BSS ram #define BSSS ram
#endif #endif
#if defined(CONFIG_ROMKERNEL) || defined(CONFIG_HIMEMKERNEL) #if defined(CONFIG_ROMKERNEL) || defined(CONFIG_HIMEMKERNEL)
#define RAM_START CONFIG_RAMBASE #define RAM_START CONFIG_RAMBASE
@ -27,7 +27,7 @@
#define TEXT rom #define TEXT rom
#define DATA ram #define DATA ram
#define INIT ram #define INIT ram
#define BSS ram #define BSSS ram
#endif #endif
#ifndef DATA_ADDR #ifndef DATA_ADDR
@ -192,7 +192,7 @@ SECTIONS {
. = ALIGN(4) ; . = ALIGN(4) ;
_ebss = . ; _ebss = . ;
_end = . ; _end = . ;
} > BSS } > BSSS
DISCARDS DISCARDS
} }