diff --git a/build-devkit.sh b/build-devkit.sh index 1bf1a04..f313600 100644 --- a/build-devkit.sh +++ b/build-devkit.sh @@ -279,6 +279,11 @@ if [ -f $scriptdir/build-gcc.sh ]; then . $scriptdir/build-gcc.sh ; cd $BUILDSCR if [ -f $scriptdir/build-crtls.sh ]; then . $scriptdir/build-crtls.sh ; cd $BUILDSCRIPTDIR; fi if [ -f $scriptdir/build-tools.sh ]; then . $scriptdir/build-tools.sh ; cd $BUILDSCRIPTDIR; fi +strip $INSTALLDIR\bin\* +strip $INSTALLDIR\$target\bin\* +rm -fr $INSTALLDIR\include\c++\$GCC_VER\$target\bits\stdc++.h.gch + + #--------------------------------------------------------------------------------- # Clean up temporary files and source directories #--------------------------------------------------------------------------------- diff --git a/patches/devkit-newlib-1.12.0.patch b/patches/devkit-newlib-1.12.0.patch index 032fa61..0329ace 100644 --- a/patches/devkit-newlib-1.12.0.patch +++ b/patches/devkit-newlib-1.12.0.patch @@ -1,6 +1,6 @@ diff -Nbaur newlib-1.12.0/config.sub newlib-1.12.0-new/config.sub --- newlib-1.12.0/config.sub Fri Aug 8 11:14:48 2003 -+++ newlib-1.12.0-new/config.sub Thu Jan 20 20:21:39 2005 ++++ newlib-1.12.0-new/config.sub Mon Feb 21 14:59:53 2005 @@ -218,6 +218,9 @@ basic_machine=m68k-atari os=-mint @@ -12,8 +12,8 @@ diff -Nbaur newlib-1.12.0/config.sub newlib-1.12.0-new/config.sub # Decode aliases for certain CPU-COMPANY combinations. diff -Nbaur newlib-1.12.0/newlib/configure.host newlib-1.12.0-new/newlib/configure.host ---- newlib-1.12.0/newlib/configure.host Mon Feb 2 16:59:52 2004 -+++ newlib-1.12.0-new/newlib/configure.host Thu Jan 20 20:21:39 2005 +--- newlib-1.12.0/newlib/configure.host Mon Feb 2 16:59:51 2004 ++++ newlib-1.12.0-new/newlib/configure.host Mon Feb 21 14:59:53 2005 @@ -378,6 +378,9 @@ powerpcle-*-pe) posix_dir=posix @@ -25,8 +25,8 @@ diff -Nbaur newlib-1.12.0/newlib/configure.host newlib-1.12.0-new/newlib/configu sys_dir=sh ;; diff -Nbaur newlib-1.12.0/newlib/libc/sys/arm/Makefile.in newlib-1.12.0-new/newlib/libc/sys/arm/Makefile.in ---- newlib-1.12.0/newlib/libc/sys/arm/Makefile.in Fri Jan 23 21:37:38 2004 -+++ newlib-1.12.0-new/newlib/libc/sys/arm/Makefile.in Thu Jan 20 20:20:38 2005 +--- newlib-1.12.0/newlib/libc/sys/arm/Makefile.in Fri Jan 23 21:37:37 2004 ++++ newlib-1.12.0-new/newlib/libc/sys/arm/Makefile.in Mon Feb 21 14:59:53 2005 @@ -88,7 +88,7 @@ INCLUDES = $(NEWLIB_CFLAGS) $(CROSS_CFLAGS) $(TARGET_CFLAGS) @@ -38,13 +38,13 @@ diff -Nbaur newlib-1.12.0/newlib/libc/sys/arm/Makefile.in newlib-1.12.0-new/newl lib_a_SOURCES = access.c libcfunc.c trap.S setjmp.S diff -Nbaur newlib-1.12.0/newlib/libc/sys/arm/malloc_vars.c newlib-1.12.0-new/newlib/libc/sys/arm/malloc_vars.c --- newlib-1.12.0/newlib/libc/sys/arm/malloc_vars.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.12.0-new/newlib/libc/sys/arm/malloc_vars.c Thu Jan 20 20:20:38 2005 ++++ newlib-1.12.0-new/newlib/libc/sys/arm/malloc_vars.c Mon Feb 21 14:59:53 2005 @@ -0,0 +1,2 @@ +char *fake_heap_end = (char*)0; +char *fake_heap_start = (char*)0; diff -Nbaur newlib-1.12.0/newlib/libc/sys/arm/syscalls.c newlib-1.12.0-new/newlib/libc/sys/arm/syscalls.c ---- newlib-1.12.0/newlib/libc/sys/arm/syscalls.c Tue Jan 6 19:27:22 2004 -+++ newlib-1.12.0-new/newlib/libc/sys/arm/syscalls.c Thu Jan 20 20:20:38 2005 +--- newlib-1.12.0/newlib/libc/sys/arm/syscalls.c Tue Jan 6 19:27:21 2004 ++++ newlib-1.12.0-new/newlib/libc/sys/arm/syscalls.c Mon Feb 21 14:59:53 2005 @@ -474,19 +474,41 @@ n = n; } @@ -90,7 +90,7 @@ diff -Nbaur newlib-1.12.0/newlib/libc/sys/arm/syscalls.c newlib-1.12.0-new/newli out of memory errors, so do not abort here. */ diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/Makefile.am newlib-1.12.0-new/newlib/libc/sys/ppcgekko/Makefile.am --- newlib-1.12.0/newlib/libc/sys/ppcgekko/Makefile.am Thu Jan 1 00:00:00 1970 -+++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/Makefile.am Thu Jan 20 20:21:39 2005 ++++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/Makefile.am Mon Feb 21 14:59:53 2005 @@ -0,0 +1,19 @@ +## Process this file with automake to generate Makefile.in + @@ -113,7 +113,7 @@ diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/Makefile.am newlib-1.12.0-new +CONFIG_STATUS_DEPENDENCIES = $(newlib_basedir)/configure.host diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/Makefile.in newlib-1.12.0-new/newlib/libc/sys/ppcgekko/Makefile.in --- newlib-1.12.0/newlib/libc/sys/ppcgekko/Makefile.in Thu Jan 1 00:00:00 1970 -+++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/Makefile.in Thu Jan 20 20:21:39 2005 ++++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/Makefile.in Mon Feb 21 14:59:53 2005 @@ -0,0 +1,341 @@ +# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am + @@ -458,7 +458,7 @@ diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/Makefile.in newlib-1.12.0-new +.NOEXPORT: diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/aclocal.m4 newlib-1.12.0-new/newlib/libc/sys/ppcgekko/aclocal.m4 --- newlib-1.12.0/newlib/libc/sys/ppcgekko/aclocal.m4 Thu Jan 1 00:00:00 1970 -+++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/aclocal.m4 Thu Jan 20 20:21:39 2005 ++++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/aclocal.m4 Mon Feb 21 14:59:53 2005 @@ -0,0 +1,382 @@ +dnl aclocal.m4 generated automatically by aclocal 1.4-p6 + @@ -844,7 +844,7 @@ diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/aclocal.m4 newlib-1.12.0-new/ + diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/configure newlib-1.12.0-new/newlib/libc/sys/ppcgekko/configure --- newlib-1.12.0/newlib/libc/sys/ppcgekko/configure Thu Jan 1 00:00:00 1970 -+++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/configure Thu Jan 20 20:21:39 2005 ++++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/configure Mon Feb 21 14:59:53 2005 @@ -0,0 +1,1906 @@ +#! /bin/sh + @@ -2754,7 +2754,7 @@ diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/configure newlib-1.12.0-new/n + diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/configure.in newlib-1.12.0-new/newlib/libc/sys/ppcgekko/configure.in --- newlib-1.12.0/newlib/libc/sys/ppcgekko/configure.in Thu Jan 1 00:00:00 1970 -+++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/configure.in Thu Jan 20 20:21:39 2005 ++++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/configure.in Mon Feb 21 14:59:53 2005 @@ -0,0 +1,12 @@ +dnl This is the newlib/libc/sys/ppcgekko configure.in file. +dnl Process this file with autoconf to produce a configure script. @@ -2770,7 +2770,7 @@ diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/configure.in newlib-1.12.0-ne +AC_OUTPUT(Makefile) diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/crt0.c newlib-1.12.0-new/newlib/libc/sys/ppcgekko/crt0.c --- newlib-1.12.0/newlib/libc/sys/ppcgekko/crt0.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/crt0.c Thu Jan 20 20:21:39 2005 ++++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/crt0.c Mon Feb 21 14:59:53 2005 @@ -0,0 +1,4 @@ +/* I have a copy of something that would serve as a NetWare crt0.o, + but it is copyright by Novell. */ @@ -2778,13 +2778,13 @@ diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/crt0.c newlib-1.12.0-new/newl +int _dummy_crt0 = 1; diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/include/newlib.h newlib-1.12.0-new/newlib/libc/sys/ppcgekko/include/newlib.h --- newlib-1.12.0/newlib/libc/sys/ppcgekko/include/newlib.h Thu Jan 1 00:00:00 1970 -+++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/include/newlib.h Thu Jan 20 20:21:39 2005 ++++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/include/newlib.h Mon Feb 21 14:59:53 2005 @@ -0,0 +1,2 @@ +/* dummy file for external tools to use. Real file is created by + newlib configuration. */ diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/machine/malloc.h newlib-1.12.0-new/newlib/libc/sys/ppcgekko/machine/malloc.h --- newlib-1.12.0/newlib/libc/sys/ppcgekko/machine/malloc.h Thu Jan 1 00:00:00 1970 -+++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/machine/malloc.h Thu Jan 20 20:21:39 2005 ++++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/machine/malloc.h Mon Feb 21 14:59:54 2005 @@ -0,0 +1,8 @@ +#ifndef _MACHMALLOC_H_ +#define _MACHMALLOC_H_ @@ -2796,7 +2796,7 @@ diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/machine/malloc.h newlib-1.12. + diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/machine/stdlib.h newlib-1.12.0-new/newlib/libc/sys/ppcgekko/machine/stdlib.h --- newlib-1.12.0/newlib/libc/sys/ppcgekko/machine/stdlib.h Thu Jan 1 00:00:00 1970 -+++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/machine/stdlib.h Thu Jan 20 20:21:39 2005 ++++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/machine/stdlib.h Mon Feb 21 14:59:54 2005 @@ -0,0 +1,8 @@ +#ifndef _MACHSTDLIB_H_ +#define _MACHSTDLIB_H_ @@ -2808,77 +2808,76 @@ diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/machine/stdlib.h newlib-1.12. + diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/sys/lock.h newlib-1.12.0-new/newlib/libc/sys/ppcgekko/sys/lock.h --- newlib-1.12.0/newlib/libc/sys/ppcgekko/sys/lock.h Thu Jan 1 00:00:00 1970 -+++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/sys/lock.h Thu Jan 20 20:21:39 2005 -@@ -0,0 +1,51 @@ ++++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/sys/lock.h Mon Feb 21 13:03:00 2005 +@@ -0,0 +1,42 @@ +#ifndef __SYS_LOCK_H__ +#define __SYS_LOCK_H__ + -+/* dummy lock routines for single-threaded aps */ ++/* lock routines for ogc kernel aps */ + +typedef int _LOCK_T; +typedef int _LOCK_RECURSIVE_T; + +#define __LOCK_INIT(CLASS,NAME) \ -+ CLASS _LOCK_T NAME = -1 -+#define __LOCK_INIT_RECURSIVE(CLASS,NAME) \ -+ CLASS _LOCK_RECURSIVE_T NAME = -2 -+ ++ CLASS _LOCK_T NAME = 0; \ ++ if(!(NAME)) __libc_lock_init(&(NAME),0) ++#define __LOCK_INIT_RECURSIVE(CLASS,NAME) \ ++ CLASS _LOCK_RECURSIVE_T NAME = 0; \ ++ if(!(NAME)) __libc_lock_init(&(NAME),1) +#define __lock_init(NAME) \ + __libc_lock_init(&(NAME),0) -+ +#define __lock_init_recursive(NAME) \ + __libc_lock_init(&(NAME),1) -+ +#define __lock_close(NAME) \ + __libc_lock_close(&(NAME)) -+ +#define __lock_close_recursive(NAME) \ + __libc_lock_close(&(NAME)) -+ -+#define __lock_acquire(NAME) \ ++#define __lock_acquire(NAME) \ + __libc_lock_acquire(&(NAME)) -+ -+#define __lock_acquire_recursive(NAME) \ ++#define __lock_acquire_recursive(NAME) \ + __libc_lock_acquire(&(NAME)) -+ -+#define __lock_try_acquire(NAME) \ ++#define __lock_try_acquire(NAME) \ + __libc_lock_try_acquire(&(NAME)) -+ -+#define __lock_try_acquire_recursive(NAME) \ ++#define __lock_try_acquire_recursive(NAME) \ + __libc_lock_try_acquire(&(NAME)) -+ +#define __lock_release(NAME) \ + __libc_lock_release(&(NAME)) -+ +#define __lock_release_recursive(NAME) \ + __libc_lock_release(&(NAME)) + -+ -+extern int __libc_lock_init(int*,int); -+extern int __libc_lock_close(int*); -+extern int __libc_lock_acquire(int*); -+extern int __libc_lock_try_acquire(int*); -+extern int __libc_lock_release(int*); ++extern int __libc_lock_init(int *lock,int recursive); ++extern int __libc_lock_close(int *lock); ++extern int __libc_lock_acquire(int *lock); ++extern int __libc_lock_try_acquire(int *lock); ++extern int __libc_lock_release(int *lock); + +#endif /* __SYS_LOCK_H__ */ diff -Nbaur newlib-1.12.0/newlib/libc/sys/ppcgekko/sys/stdio.h newlib-1.12.0-new/newlib/libc/sys/ppcgekko/sys/stdio.h --- newlib-1.12.0/newlib/libc/sys/ppcgekko/sys/stdio.h Thu Jan 1 00:00:00 1970 -+++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/sys/stdio.h Thu Jan 20 20:21:40 2005 -@@ -0,0 +1,17 @@ ++++ newlib-1.12.0-new/newlib/libc/sys/ppcgekko/sys/stdio.h Mon Feb 21 13:03:00 2005 +@@ -0,0 +1,25 @@ +#ifndef _NEWLIB_STDIO_H +#define _NEWLIB_STDIO_H + +/* Internal locking macros, used to protect stdio functions. In the + general case, expand to nothing. */ -+#if !defined(__SINGLE_THREAD__) -+# if !defined(_flockfile) -+# define _flockfile(fp) __flockfile(fp) -+ extern void __flockfile(FILE*); ++#if !defined(_flockfile) ++# if !defined(__SINGLE_THREAD__) ++# define _flockfile(fp) { ((fp)->_flags&__SSTR) ? 0 : __flockfile(fp); } ++ extern void __flockfile(FILE *fp); ++# else ++# define _flockfile(fp) +# endif -+# if !defined(_funlockfile) -+# define _funlockfile(fp) __funlockfile(fp) -+ extern void __funlockfile(FILE*); ++#endif /* __SINGLE_THREAD__ */ ++ ++#if !defined(_funlockfile) ++# if !defined(__SINGLE_THREAD__) ++# define _funlockfile(fp) { ((fp)->_flags&__SSTR) ? 0 : __funlockfile(fp); } ++ extern void __funlockfile(FILE *fp); ++# else ++# define _funlockfile(fp) +# endif +#endif /* __SINGLE_THREAD__ */ + +#endif /* _NEWLIB_STDIO_H */ ++