diff -ru pistachio-0.4-release/user/contrib/elf-loader/platform/u4600/linker.lds pistachio-0.4/user/contrib/elf-loader/platform/u4600/linker.lds --- pistachio-0.4-release/user/contrib/elf-loader/platform/u4600/linker.lds 2003-05-01 03:20:18.000000000 +1000 +++ pistachio-0.4/user/contrib/elf-loader/platform/u4600/linker.lds 2004-07-29 15:42:49.000000000 +1000 @@ -5,7 +5,7 @@ SECTIONS { /* Read-only sections, merged into text segment: */ - . = 0xffffffff80800000; + . = 0xffffffff80400000; _text = .; .text : { *(.text.start) diff -ru pistachio-0.4-release/user/contrib/elf-loader/platform/u4600/main.cc pistachio-0.4/user/contrib/elf-loader/platform/u4600/main.cc --- pistachio-0.4-release/user/contrib/elf-loader/platform/u4600/main.cc 2004-05-14 15:15:32.000000000 +1000 +++ pistachio-0.4/user/contrib/elf-loader/platform/u4600/main.cc 2004-07-29 16:15:41.000000000 +1000 @@ -133,7 +133,7 @@ void (*func)(unsigned long) = (void (*)(unsigned long)) (bootaddr | PHYS_OFFSET); /* XXX - Get this from boot loader */ - kip->MainMem.high = 64UL * 1024 * 1024; + kip->MainMem.high = 8UL * 1024 * 1024; kip->MemoryInfo.n = 0; diff -ru pistachio-0.4-release/user/lib/io/print.cc pistachio-0.4/user/lib/io/print.cc --- pistachio-0.4-release/user/lib/io/print.cc 2003-11-25 03:48:52.000000000 +1100 +++ pistachio-0.4/user/lib/io/print.cc 2004-07-29 15:34:04.000000000 +1000 @@ -42,35 +42,23 @@ * symbols that aliases these functions. */ -extern "C" int __l4_printf (const char *fmt, ...); -extern "C" int printf (const char *fmt, ...) - __attribute__ ((weak, alias ("__l4_printf"))); -extern "C" int __l4_snprintf (char *str, int size, const char *fmt, ...); -extern "C" int snprintf (char *str, int size, const char *fmt, ...) - __attribute__ ((weak, alias ("__l4_snprintf"))); -extern "C" int __l4_vsnprintf (char *str, int size, const char *fmt, va_list); -extern "C" int vsnprintf (char *str, int size, const char *fmt, va_list) - __attribute__ ((weak, alias ("__l4_vsnprintf"))); -extern "C" int __l4_puts (const char * str); -extern "C" int puts (const char * str) - __attribute__ ((weak, alias ("__l4_puts"))); -extern "C" int __l4_putchar (int c); -extern "C" int putchar (int c) - __attribute__ ((weak, alias ("__l4_putchar"))); - - +extern "C" int printf (const char *fmt, ...); +extern "C" int snprintf (char *str, int size, const char *fmt, ...); +extern "C" int vsnprintf (char *str, int size, const char *fmt, va_list); +extern "C" int puts (const char * str); +extern "C" int putchar (int c); static int strlen (const char * s); static void print_string (const char * s); -int __l4_puts (const char * str) +int puts (const char * str) { print_string (str); putc ('\n'); return strlen (str); } -int __l4_putchar (int c) +int putchar (int c) { putc (c); return c; @@ -120,7 +108,7 @@ * conversions; e, E, g, and G which are not supported. * */ -int __l4_vsnprintf(char *str, int size, const char *fmt, va_list ap) +int vsnprintf(char *str, int size, const char *fmt, va_list ap) { char convert[64]; int f_left, f_sign, f_space, f_zero, f_alternate; @@ -593,7 +581,7 @@ * Print formated string to a string like snprintf(3). * */ -int __l4_snprintf(char *str, int size, const char *fmt, ...) +int snprintf(char *str, int size, const char *fmt, ...) { va_list ap; int r; @@ -620,7 +608,7 @@ * Print formated string to terminal like printf(3). * */ -int __l4_printf(const char *fmt, ...) +int printf(const char *fmt, ...) { char outbuf[256]; va_list ap;