Commit 8ff7f282 authored by Anton Blanchard's avatar Anton Blanchard

Merge samba.org:/scratch/anton/linux-2.5

into samba.org:/scratch/anton/linux-2.5_ppc64_work
parents a0f3a291 b2bcd587
...@@ -29,9 +29,22 @@ BOOTLD = $(CROSS32_COMPILE)ld ...@@ -29,9 +29,22 @@ BOOTLD = $(CROSS32_COMPILE)ld
BOOTAS = $(CROSS32_COMPILE)as BOOTAS = $(CROSS32_COMPILE)as
BOOTAFLAGS = -D__ASSEMBLY__ $(HOSTCFLAGS) BOOTAFLAGS = -D__ASSEMBLY__ $(HOSTCFLAGS)
.c.o: $(obj)/start.o: $(obj)/start.c
$(BOOTCC) $(BOOTCFLAGS) -c -o $*.o $< $(BOOTCC) $(BOOTCFLAGS) -c -o $*.o $<
.S.o:
$(obj)/main.o: $(obj)/main.c
$(BOOTCC) $(BOOTCFLAGS) -c -o $*.o $<
$(obj)/zlib.o: $(obj)/zlib.c
$(BOOTCC) $(BOOTCFLAGS) -c -o $*.o $<
$(obj)/imagesize.o: $(obj)/imagesize.c
$(BOOTCC) $(BOOTCFLAGS) -c -o $*.o $<
$(obj)/no_initrd.o: $(obj)/no_initrd.c
$(BOOTCC) $(BOOTCFLAGS) -c -o $*.o $<
$(obj)/crt0.o: $(obj)/crt0.S
$(BOOTCC) $(BOOTAFLAGS) -traditional -c -o $*.o $< $(BOOTCC) $(BOOTAFLAGS) -traditional -c -o $*.o $<
CFLAGS = $(CPPFLAGS) -O -fno-builtin -DSTDC_HEADERS CFLAGS = $(CPPFLAGS) -O -fno-builtin -DSTDC_HEADERS
......
This diff is collapsed.
OUTPUT_ARCH(powerpc:common64) OUTPUT_ARCH(powerpc:common64)
SEARCH_DIR(/lib); SEARCH_DIR(/usr/lib); SEARCH_DIR(/usr/local/lib); SEARCH_DIR(/usr/local/powerpc-any-elf/lib);
/* Do we need any of these for elf? /* Do we need any of these for elf?
__DYNAMIC = 0; */ __DYNAMIC = 0; */
jiffies = jiffies_64; jiffies = jiffies_64;
...@@ -62,7 +61,6 @@ SECTIONS ...@@ -62,7 +61,6 @@ SECTIONS
_edata = .; _edata = .;
PROVIDE (edata = .); PROVIDE (edata = .);
.fixup : { *(.fixup) }
__start___ex_table = .; __start___ex_table = .;
__ex_table : { *(__ex_table) } __ex_table : { *(__ex_table) }
__stop___ex_table = .; __stop___ex_table = .;
...@@ -70,6 +68,7 @@ SECTIONS ...@@ -70,6 +68,7 @@ SECTIONS
__start___ksymtab = .; /* Kernel symbol table */ __start___ksymtab = .; /* Kernel symbol table */
__ksymtab : { *(__ksymtab) } __ksymtab : { *(__ksymtab) }
__stop___ksymtab = .; __stop___ksymtab = .;
__start___kallsyms = .; /* All kernel symbols */ __start___kallsyms = .; /* All kernel symbols */
__kallsyms : { *(__kallsyms) } __kallsyms : { *(__kallsyms) }
__stop___kallsyms = .; __stop___kallsyms = .;
...@@ -83,21 +82,14 @@ SECTIONS ...@@ -83,21 +82,14 @@ SECTIONS
. = ALIGN(128); . = ALIGN(128);
.data.cacheline_aligned : { *(.data.cacheline_aligned) } .data.cacheline_aligned : { *(.data.cacheline_aligned) }
/* will be freed after init */
. = ALIGN(4096); . = ALIGN(4096);
__init_begin = .; __init_begin = .;
.text.init : { *(.text.init) } .init.text : { *(.init.text) }
.data.init : { .init.data : { *(.init.data) }
*(.data.init);
__vtop_table_begin = .;
*(.vtop_fixup);
__vtop_table_end = .;
__ptov_table_begin = .;
*(.ptov_fixup);
__ptov_table_end = .;
}
. = ALIGN(16); . = ALIGN(16);
__setup_start = .; __setup_start = .;
.setup.init : { *(.setup.init) } .init.setup : { *(.init.setup) }
__setup_end = .; __setup_end = .;
__initcall_start = .; __initcall_start = .;
.initcall.init : { .initcall.init : {
...@@ -116,23 +108,16 @@ SECTIONS ...@@ -116,23 +108,16 @@ SECTIONS
__per_cpu_end = .; __per_cpu_end = .;
. = ALIGN(4096); . = ALIGN(4096);
__init_end = .; __init_end = .;
/* freed after init ends here */
__toc_start = .; __toc_start = .;
.toc : .toc : { *(.toc) }
{
*(.toc)
}
. = ALIGN(4096); . = ALIGN(4096);
__toc_end = .; __toc_end = .;
__bss_start = .; __bss_start = .;
.bss : .bss : { *(.bss) }
{ __bss_stop = .;
*(.sbss) *(.scommon)
*(.dynbss)
*(.bss)
*(COMMON)
}
. = ALIGN(4096); . = ALIGN(4096);
_end = . ; _end = . ;
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define POLLWRNORM 0x0100 #define POLLWRNORM 0x0100
#define POLLWRBAND 0x0200 #define POLLWRBAND 0x0200
#define POLLMSG 0x0400 #define POLLMSG 0x0400
#define POLLREMOVE 0x1000
struct pollfd { struct pollfd {
int fd; int fd;
......
...@@ -450,6 +450,6 @@ static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options) ...@@ -450,6 +450,6 @@ static inline _syscall3(pid_t,waitpid,pid_t,pid,int *,wait_stat,int,options)
* What we want is __attribute__((weak,alias("sys_ni_syscall"))), * What we want is __attribute__((weak,alias("sys_ni_syscall"))),
* but it doesn't work on all toolchains, so we just do it by hand * but it doesn't work on all toolchains, so we just do it by hand
*/ */
#define cond_syscall(x) asm(".weak\t." #x "\n\t.set\t." #x ",sys_ni_syscall"); #define cond_syscall(x) asm(".weak\t." #x "\n\t.set\t." #x ",.sys_ni_syscall");
#endif /* _ASM_PPC_UNISTD_H_ */ #endif /* _ASM_PPC_UNISTD_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment