From 7a5dac1420dbc7128cc43e444fa340cc2b567254 Mon Sep 17 00:00:00 2001 From: Dave Murphy Date: Sun, 17 Feb 2008 09:01:54 +0000 Subject: [PATCH] *** empty log message *** --- dkarm-eabi/patches/newlib-1.15.0.patch | 274 ++++++++++++++++++------- dkppc/scripts/build-crtls.sh | 4 +- dkppc/scripts/build-gcc.sh | 6 +- 3 files changed, 206 insertions(+), 78 deletions(-) diff --git a/dkarm-eabi/patches/newlib-1.15.0.patch b/dkarm-eabi/patches/newlib-1.15.0.patch index ac4cebf..894f2cb 100644 --- a/dkarm-eabi/patches/newlib-1.15.0.patch +++ b/dkarm-eabi/patches/newlib-1.15.0.patch @@ -1,14 +1,3 @@ -diff -Nbaur newlib-1.15.0/Makefile.in newlib-1.15.0-new/Makefile.in ---- newlib-1.15.0/Makefile.in Mon Dec 11 06:47:56 2006 -+++ newlib-1.15.0-new/Makefile.in Tue Jul 31 12:55:09 2007 -@@ -303,6 +303,7 @@ - - FLAGS_FOR_TARGET = @FLAGS_FOR_TARGET@ - -+TARG_INCLUDE_DIR = $$r/$(TARGET_SUBDIR) - AR_FOR_TARGET=@AR_FOR_TARGET@ - AS_FOR_TARGET=@AS_FOR_TARGET@ - CC_FOR_TARGET=$(STAGE_CC_WRAPPER) @CC_FOR_TARGET@ $(FLAGS_FOR_TARGET) diff -Nbaur newlib-1.15.0/libgloss/configure newlib-1.15.0-new/libgloss/configure --- newlib-1.15.0/libgloss/configure Mon Dec 18 21:48:18 2006 +++ newlib-1.15.0-new/libgloss/configure Fri Feb 16 09:13:44 2007 @@ -63,7 +52,7 @@ diff -Nbaur newlib-1.15.0/libgloss/configure.in newlib-1.15.0-new/libgloss/confi i[[3456]]86-*-elf* | i[[3456]]86-*-coff*) diff -Nbaur newlib-1.15.0/libgloss/libsysbase/Makefile.in newlib-1.15.0-new/libgloss/libsysbase/Makefile.in --- newlib-1.15.0/libgloss/libsysbase/Makefile.in Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/Makefile.in Mon Aug 27 11:14:17 2007 ++++ newlib-1.15.0-new/libgloss/libsysbase/Makefile.in Thu Feb 14 02:11:59 2008 @@ -0,0 +1,146 @@ +# Copyright (c) 1998 Cygnus Support +# @@ -134,7 +123,7 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/Makefile.in newlib-1.15.0-new/libg +# object files needed +OBJS = abort.o iosupport.o close.o environ.o execve.o fork.o fstat.o getpid.o gettod.o \ + isatty.o kill.o link.o lseek.o open.o read.o sbrk.o stat.o \ -+ times.o unlink.o wait.o write.o _exit.o malloc_vars.o \ ++ unlink.o wait.o write.o _exit.o malloc_vars.o \ + chdir.o mkdir.o dir.o rename.o build_argv.o statvfs.o + +# Object files specific to particular targets. @@ -4766,8 +4755,8 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/environ.c newlib-1.15.0-new/libglo +char **environ = __env; diff -Nbaur newlib-1.15.0/libgloss/libsysbase/execve.c newlib-1.15.0-new/libgloss/libsysbase/execve.c --- newlib-1.15.0/libgloss/libsysbase/execve.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/execve.c Fri Feb 16 09:13:45 2007 -@@ -0,0 +1,21 @@ ++++ newlib-1.15.0-new/libgloss/libsysbase/execve.c Thu Feb 14 02:11:01 2008 +@@ -0,0 +1,19 @@ +/* + * Stub version of execve. + */ @@ -4776,7 +4765,6 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/execve.c newlib-1.15.0-new/libglos +#include <_ansi.h> +#include <_syslist.h> +#include -+#include "warning.h" + +int +_DEFUN (_execve, (name, argv, env), @@ -4788,7 +4776,6 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/execve.c newlib-1.15.0-new/libglos + return -1; +} + -+stub_warning(_execve) diff -Nbaur newlib-1.15.0/libgloss/libsysbase/fork.c newlib-1.15.0-new/libgloss/libsysbase/fork.c --- newlib-1.15.0/libgloss/libsysbase/fork.c Thu Jan 1 00:00:00 1970 +++ newlib-1.15.0-new/libgloss/libsysbase/fork.c Fri Feb 16 09:13:45 2007 @@ -5032,8 +5019,8 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/isatty.c newlib-1.15.0-new/libglos +} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/kill.c newlib-1.15.0-new/libgloss/libsysbase/kill.c --- newlib-1.15.0/libgloss/libsysbase/kill.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/kill.c Fri Feb 16 09:13:45 2007 -@@ -0,0 +1,24 @@ ++++ newlib-1.15.0-new/libgloss/libsysbase/kill.c Thu Feb 14 02:10:20 2008 +@@ -0,0 +1,23 @@ +/* + * Stub version of kill. + */ @@ -5042,7 +5029,6 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/kill.c newlib-1.15.0-new/libgloss/ +#include <_ansi.h> +#include <_syslist.h> +#include -+#include "warning.h" + +#ifdef REENTRANT_SYSCALLS_PROVIDED +int _DEFUN(_kill_r,(ptr,pid,sig), @@ -5450,58 +5436,6 @@ diff -Nbaur newlib-1.15.0/libgloss/libsysbase/statvfs.c newlib-1.15.0-new/libglo + + return ret; +} -diff -Nbaur newlib-1.15.0/libgloss/libsysbase/times.c newlib-1.15.0-new/libgloss/libsysbase/times.c ---- newlib-1.15.0/libgloss/libsysbase/times.c Thu Jan 1 00:00:00 1970 -+++ newlib-1.15.0-new/libgloss/libsysbase/times.c Sat Nov 3 18:17:36 2007 -@@ -0,0 +1,48 @@ -+#include <_ansi.h> -+#include <_syslist.h> -+#include -+#include -+ -+//--------------------------------------------------------------------------------- -+clock_t _DEFUN (_times, (buf), -+ struct tms *buf) { -+//--------------------------------------------------------------------------------- -+ errno = ENOSYS; -+ return -1; -+} -+ -+#include -+#include -+#include -+#include -+#include <_syslist.h> -+ -+time_t *punixTime; -+ -+clock_t -+_DEFUN (_times_r, (ptr, ptms), -+ struct _reent *ptr _AND -+ struct tms *ptms) -+{ -+ return (clock_t)-1; -+} -+ -+ -+int -+_DEFUN (_gettimeofday_r, (ptr, ptimeval, ptimezone), -+ struct _reent *ptr _AND -+ struct timeval *ptimeval _AND -+ struct timezone *ptimezone) -+{ -+ -+ time_t ret = -1; -+ if ( ptimeval && punixTime ) { -+ ret = 0; -+ ptimeval->tv_sec = ret; -+ ptr->_errno = 0; -+ } else { -+ ptr->_errno = -1; -+ } -+ -+ return ret; -+} diff -Nbaur newlib-1.15.0/libgloss/libsysbase/unlink.c newlib-1.15.0-new/libgloss/libsysbase/unlink.c --- newlib-1.15.0/libgloss/libsysbase/unlink.c Thu Jan 1 00:00:00 1970 +++ newlib-1.15.0-new/libgloss/libsysbase/unlink.c Fri Feb 16 09:13:45 2007 @@ -6032,3 +5966,199 @@ diff -Nbaur newlib-1.15.0/newlib/libc/syscalls/sysunlink.c newlib-1.15.0-new/new { #ifdef REENTRANT_SYSCALLS_PROVIDED return _unlink_r (_REENT, file); +diff -Nbaur newlib-1.15.0/newlib/libc/time/asctime_r.c newlib-1.15.0-new/newlib/libc/time/asctime_r.c +--- newlib-1.15.0/newlib/libc/time/asctime_r.c Wed May 10 18:58:29 2000 ++++ newlib-1.15.0-new/newlib/libc/time/asctime_r.c Sun Feb 10 06:48:03 2008 +@@ -18,7 +18,7 @@ + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" + }; + +- sprintf (result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n", ++ siprintf (result, "%.3s %.3s%3d %.2d:%.2d:%.2d %d\n", + day_name[tim_p->tm_wday], + mon_name[tim_p->tm_mon], + tim_p->tm_mday, tim_p->tm_hour, tim_p->tm_min, +diff -Nbaur newlib-1.15.0/newlib/libc/time/strftime.c newlib-1.15.0-new/newlib/libc/time/strftime.c +--- newlib-1.15.0/newlib/libc/time/strftime.c Fri Feb 25 22:31:21 2005 ++++ newlib-1.15.0-new/newlib/libc/time/strftime.c Sun Feb 10 06:50:43 2008 +@@ -424,7 +424,7 @@ + int century = tim_p->tm_year >= 0 + ? tim_p->tm_year / 100 + YEAR_BASE / 100 + : abs (tim_p->tm_year + YEAR_BASE) / 100; +- count += snprintf (&s[count], maxsize - count, "%s%.*d", ++ count += sniprintf (&s[count], maxsize - count, "%s%.*d", + neg ? "-" : "", 2 - neg, century); + if (count >= maxsize) + return 0; +@@ -434,7 +434,7 @@ + case 'e': + if (count < maxsize - 2) + { +- sprintf (&s[count], *format == 'd' ? "%.2d" : "%2d", ++ siprintf (&s[count], *format == 'd' ? "%.2d" : "%2d", + tim_p->tm_mday); + count += 2; + } +@@ -446,7 +446,7 @@ + /* %m/%d/%y */ + if (count < maxsize - 8) + { +- sprintf (&s[count], "%.2d/%.2d/%.2d", ++ siprintf (&s[count], "%.2d/%.2d/%.2d", + tim_p->tm_mon + 1, tim_p->tm_mday, + tim_p->tm_year >= 0 ? tim_p->tm_year % 100 + : abs (tim_p->tm_year + YEAR_BASE) % 100); +@@ -478,7 +478,7 @@ + adjust = 1; + else if (adjust > 0 && tim_p->tm_year < -YEAR_BASE) + adjust = -1; +- sprintf (&s[count], "%.2d", ++ siprintf (&s[count], "%.2d", + ((year + adjust) % 100 + 100) % 100); + count += 2; + } +@@ -512,7 +512,7 @@ + year = 0; + ++century; + } +- count += snprintf (&s[count], maxsize - count, "%s%.*d%.2d", ++ count += sniprintf (&s[count], maxsize - count, "%s%.*d%.2d", + neg ? "-" : "", 2 - neg, century, year); + if (count >= maxsize) + return 0; +@@ -522,7 +522,7 @@ + case 'k': + if (count < maxsize - 2) + { +- sprintf (&s[count], *format == 'k' ? "%2d" : "%.2d", ++ siprintf (&s[count], *format == 'k' ? "%2d" : "%.2d", + tim_p->tm_hour); + count += 2; + } +@@ -541,7 +541,7 @@ + } + else + { +- sprintf (&s[count], *format == 'I' ? "%.2d" : "%2d", ++ siprintf (&s[count], *format == 'I' ? "%.2d" : "%2d", + tim_p->tm_hour % 12); + count += 2; + } +@@ -552,7 +552,7 @@ + case 'j': + if (count < maxsize - 3) + { +- sprintf (&s[count], "%.3d", ++ siprintf (&s[count], "%.3d", + tim_p->tm_yday + 1); + count += 3; + } +@@ -562,7 +562,7 @@ + case 'm': + if (count < maxsize - 2) + { +- sprintf (&s[count], "%.2d", ++ siprintf (&s[count], "%.2d", + tim_p->tm_mon + 1); + count += 2; + } +@@ -572,7 +572,7 @@ + case 'M': + if (count < maxsize - 2) + { +- sprintf (&s[count], "%.2d", ++ siprintf (&s[count], "%.2d", + tim_p->tm_min); + count += 2; + } +@@ -609,15 +609,15 @@ + } + else + { +- sprintf (&s[count], "%.2d", tim_p->tm_hour % 12); ++ siprintf (&s[count], "%.2d", tim_p->tm_hour % 12); + count += 2; + } + s[count++] = ':'; +- sprintf (&s[count], "%.2d", ++ siprintf (&s[count], "%.2d", + tim_p->tm_min); + count += 2; + s[count++] = ':'; +- sprintf (&s[count], "%.2d", ++ siprintf (&s[count], "%.2d", + tim_p->tm_sec); + count += 2; + s[count++] = ' '; +@@ -634,7 +634,7 @@ + case 'R': + if (count < maxsize - 5) + { +- sprintf (&s[count], "%.2d:%.2d", tim_p->tm_hour, tim_p->tm_min); ++ siprintf (&s[count], "%.2d:%.2d", tim_p->tm_hour, tim_p->tm_min); + count += 5; + } + else +@@ -643,7 +643,7 @@ + case 'S': + if (count < maxsize - 2) + { +- sprintf (&s[count], "%.2d", ++ siprintf (&s[count], "%.2d", + tim_p->tm_sec); + count += 2; + } +@@ -660,7 +660,7 @@ + case 'X': + if (count < maxsize - 8) + { +- sprintf (&s[count], "%.2d:%.2d:%.2d", tim_p->tm_hour, ++ siprintf (&s[count], "%.2d:%.2d:%.2d", tim_p->tm_hour, + tim_p->tm_min, tim_p->tm_sec); + count += 8; + } +@@ -681,7 +681,7 @@ + case 'U': + if (count < maxsize - 2) + { +- sprintf (&s[count], "%.2d", ++ siprintf (&s[count], "%.2d", + (tim_p->tm_yday + 7 - + tim_p->tm_wday) / 7); + count += 2; +@@ -706,7 +706,7 @@ + + (YEAR_BASE - 1 + - (tim_p->tm_year < 0 + ? 0 : 2000))))); +- sprintf (&s[count], "%.2d", week); ++ siprintf (&s[count], "%.2d", week); + count += 2; + } + else +@@ -722,7 +722,7 @@ + if (count < maxsize - 2) + { + int wday = (tim_p->tm_wday) ? tim_p->tm_wday - 1 : 6; +- sprintf (&s[count], "%.2d", ++ siprintf (&s[count], "%.2d", + (tim_p->tm_yday + 7 - wday) / 7); + count += 2; + } +@@ -736,7 +736,7 @@ + the asymmetric range of years. */ + int year = tim_p->tm_year >= 0 ? tim_p->tm_year % 100 + : abs (tim_p->tm_year + YEAR_BASE) % 100; +- sprintf (&s[count], "%.2d", year); ++ siprintf (&s[count], "%.2d", year); + count += 2; + } + else +@@ -766,7 +766,7 @@ + but have to use __tzrule for daylight savings. */ + offset = -tz->__tzrule[tim_p->tm_isdst > 0].offset; + TZ_UNLOCK; +- sprintf (&s[count], "%+03ld%.2ld", offset / SECSPERHOUR, ++ siprintf (&s[count], "%+03ld%.2ld", offset / SECSPERHOUR, + labs (offset / SECSPERMIN) % 60L); + count += 5; + } diff --git a/dkppc/scripts/build-crtls.sh b/dkppc/scripts/build-crtls.sh index 8887958..ffa8200 100644 --- a/dkppc/scripts/build-crtls.sh +++ b/dkppc/scripts/build-crtls.sh @@ -6,8 +6,8 @@ export DEVKITPPC=$TOOLPATH/devkitPPC # Install and build the gamecube crt and libogc #--------------------------------------------------------------------------------- -echo "installing specs ..." -cp `pwd`/dkppc/crtls/gcn* $DEVKITPPC/$target/lib/ +echo "installing linkscripts ..." +cp `pwd`/dkppc/crtls/*.ld $DEVKITPPC/$target/lib/ #--------------------------------------------------------------------------------- # copy base rulesets #--------------------------------------------------------------------------------- diff --git a/dkppc/scripts/build-gcc.sh b/dkppc/scripts/build-gcc.sh index 9e10367..f8ca247 100644 --- a/dkppc/scripts/build-gcc.sh +++ b/dkppc/scripts/build-gcc.sh @@ -81,9 +81,8 @@ then CFLAGS=-D__USE_MINGW_ACCESS ../../$GCC_SRCDIR/configure \ --enable-languages=c,c++ \ --with-cpu=750\ - --with-gcc --with-gnu-ld --with-gnu-as --with-stabs \ - --with-included-gettext --without-headers\ - --disable-nls --disable-shared --enable-threads --disable-multilib --disable-debug\ + --without-headers\ + --disable-nls --disable-shared --enable-threads --disable-multilib \ --disable-win32-registry\ --disable-libstdcxx-pch \ --target=$target \ @@ -118,7 +117,6 @@ then --target=$target \ --prefix=$prefix \ --enable-newlib-mb \ - --disable-debug \ || { echo "Error configuring newlib"; exit 1; } touch configured-newlib fi