This commit was manufactured by cvs2svn to create tag 'V1_170'.

git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/tags/V1_170@14707 87f5fb63-7c3d-0410-a384-fd976d0f7a62
2025-12-08 14:59:05 +00:00 · 2004-08-14 08:54:26 +00:00
681 changed files with 7321 additions and 11629 deletions
--- a/library/GNUmakefile.68k
+++ b/library/GNUmakefile.68k
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.68k,v 1.26 2005-02-07 10:52:16 obarthel Exp $
+# $Id: GNUmakefile.68k,v 1.5 2004-08-14 08:54:25 obarthel Exp $
 #
 # :ts=8
 #
@@ -9,7 +9,7 @@
 CC = gcc
 AR = ar -q
 RANLIB = ranlib
-COPY = copy clone buf=0
+COPY = copy clone
 DELETE = delete all quiet
 MAKEDIR = makedir
 MAKE = make -f GNUmakefile.68k
@@ -40,7 +40,7 @@ endif

 .c.o:
 	@echo "Compiling $<"
-	@$(CC) -c $(CFLAGS) $<
+	@$(CC) -c $(CFLAGS) -DIEEE_FLOATING_POINT_SUPPORT $<

 $(LIBC_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):c]"
@@ -99,16 +99,14 @@ endif
 ##############################################################################

 WARNINGS = \
-	-Wall -W -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
-	-Wundef -Wbad-function-cast -Wmissing-declarations -Wunused
-
-#	-Wconversion -Wshadow
+	-Wall -W -Wshadow -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
+	-Wundef -Wbad-function-cast -Wmissing-declarations -Wconversion

 INCLUDES = -Iinclude -I. -Inetinclude
- OPTIONS = -DNDEBUG -fno-builtin
+ OPTIONS = -DNDEBUG -fno-builtin -DNO_INLINE_STDARG
 #OPTIONS = -D__MEM_DEBUG -fno-builtin
 #OPTIONS = -DDEBUG -D__MEM_DEBUG -DNO_INLINE_STDARG -fno-builtin
- OPTIMIZE = -O -fomit-frame-pointer -fstrength-reduce -finline-functions
+ OPTIMIZE = -O
 #OPTIMIZE = -O2 -fomit-frame-pointer
 #DEBUG = -g2

@@ -146,9 +144,9 @@ C_LIB = \
 	fcntl_open.o \
 	fcntl_read.o \
 	fcntl_write.o \
-	fcntl_get_default_file.o \
 	libgen_basename.o \
 	libgen_dirname.o \
+	locale_data.o \
 	locale_init_exit.o \
 	locale_localeconv.o \
 	locale_setlocale.o \
@@ -272,7 +270,6 @@ C_LIB = \
 	stdlib_dosbase.o \
 	stdlib_exit.o \
 	stdlib_free.o \
-	stdlib_get_errno.o \
 	stdlib_getdefstacksize.o \
 	stdlib_getenv.o \
 	stdlib_getsp.o \
@@ -289,19 +286,13 @@ C_LIB = \
 	stdlib_modsi3.o \
 	stdlib_mulsi3.o \
 	stdlib_never_free.o \
-	stdlib_osliberror.o \
-	stdlib_oslibversion.o \
-	stdlib_priority.o \
-	stdlib_process_name.o \
 	stdlib_putenv.o \
 	stdlib_qsort.o \
 	stdlib_rand.o \
 	stdlib_realloc.o \
 	stdlib_red_black.o \
 	stdlib_setenv.o \
-	stdlib_set_errno.o \
 	stdlib_setjmp.o \
-	stdlib_set_process_window.o \
 	stdlib_shell_escape.o \
 	stdlib_showerror.o \
 	stdlib_socket.o \
@@ -315,8 +306,6 @@ C_LIB = \
 	stdlib_startup.o \
 	stdlib_strtol.o \
 	stdlib_strtoul.o \
-	stdlib_strtoll.o \
-	stdlib_strtoull.o \
 	stdlib_swapstack.o \
 	stdlib_sysbase.o \
 	stdlib_system.o \
@@ -326,8 +315,8 @@ C_LIB = \
 	stdlib_udivsi4.o \
 	stdlib_umodsi3.o \
 	stdlib_unsetenv.o \
+	stdlib_usergroup.o \
 	stdlib_wildcard_expand.o \
-	stdlib_stdio_window_spec.o \
 	strings_strcasecmp.o \
 	strings_strncasecmp.o \
 	string_bcmp.o \
@@ -348,8 +337,6 @@ C_LIB = \
 	string_strcspn.o \
 	string_strdup.o \
 	string_strerror.o \
-	string_strlcat.o \
-	string_strlcpy.o \
 	string_strlen.o \
 	string_strncat.o \
 	string_strncmp.o \
@@ -359,40 +346,29 @@ C_LIB = \
 	string_strspn.o \
 	string_strstr.o \
 	string_strtok.o \
-	string_strtok_r.o \
 	string_strxfrm.o \
 	time_asctime.o \
-	time_asctime_r.o \
 	time_clock.o \
 	time_converttime.o \
-	time_convert_datestamp.o \
-	time_convert_time.o \
 	time_ctime.o \
-	time_ctime_r.o \
 	time_data.o \
-	time_days_per_date.o \
 	time_gettimeofday.o \
 	time_gmtime.o \
-	time_gmtime_r.o \
 	time_localtime.o \
-	time_localtime_r.o \
 	time_mktime.o \
 	time_numbertostring.o \
 	time_strftime.o \
 	time_time.o \
-	time_weekday.o \
 	unistd_access.o \
 	unistd_chdir.o \
-	unistd_chdir_exit.o \
 	unistd_chown.o \
 	unistd_currentpathname.o \
+	unistd_data.o \
 	unistd_dup.o \
 	unistd_dup2.o \
 	unistd_fchown.o \
-	unistd_fdatasync.o \
 	unistd_fdopen.o \
 	unistd_fileno.o \
-	unistd_fsync.o \
 	unistd_ftruncate.o \
 	unistd_getcwd.o \
 	unistd_getopt.o \
@@ -405,11 +381,8 @@ C_LIB = \
 	unistd_realpath.o \
 	unistd_sleep.o \
 	unistd_symlink.o \
-	unistd_timer.o \
-	unistd_time_delay.o \
 	unistd_truncate.o \
 	unistd_unlink.o \
-	unistd_usleep.o \
 	utime_utime.o

 UNIX_LIB = \
@@ -422,7 +395,6 @@ UNIX_LIB = \
 	fcntl_creat.o \
 	fcntl_fcntl.o \
 	fcntl_open.o \
-	fcntl_get_default_file.o \
 	mount_convertinfo.o \
 	mount_statfs.o \
 	stat_chmod.o \
@@ -434,6 +406,7 @@ UNIX_LIB = \
 	stdio_fdhookentry.o \
 	stdio_fflush.o \
 	stdio_fopen.o \
+	stdio_fopen.o \
 	stdio_init_exit.o \
 	stdio_locksemaphorename.o \
 	stdio_openiob.o \
@@ -442,11 +415,11 @@ UNIX_LIB = \
 	stdio_rename.o \
 	stdlib_mkdtemp.o \
 	stdlib_mkstemp.o \
+	stdlib_mkstemp.o \
 	stdlib_mktemp.o \
 	stdlib_system.o \
 	unistd_access.o \
 	unistd_chdir.o \
-	unistd_chdir_exit.o \
 	unistd_chown.o \
 	unistd_getcwd.o \
 	unistd_lchown.o \
@@ -479,8 +452,6 @@ MATH_LIB = \
 	math_floor.o \
 	math_fmod.o \
 	math_frexp.o \
-	math_huge_val.o \
-	math_hypot.o \
 	math_init_exit.o \
 	math_isinf.o \
 	math_isnan.o \
@@ -509,6 +480,7 @@ MATH_LIB = \
 	stdio_vasprintf.o \
 	stdio_vfprintf.o \
 	stdio_vfscanf.o \
+	stdio_vfscanf.o \
 	stdio_vprintf.o \
 	stdio_vsnprintf.o \
 	stdio_vsprintf.o \
@@ -699,28 +671,17 @@ AMIGA_LIB = \
 	amiga_newlist.o \
 	amiga_rangerand.o \
 	amiga_remtof.o \
-	amiga_rexxvars.o \
 	amiga_setsuperattrs.o \
 	amiga_timedelay.o \
 	amiga_waitbeam.o

-MEMDEBUG_LIB = \
-	stdio_vasprintf_debug.o \
-	stdio_vasprintf_debug.o \
-	stdio_vasprintf_hook_entry_debug.o \
-	stdlib_alloca_debug.o \
-	stdlib_calloc_debug.o \
-	stdlib_free_debug.o \
-	stdlib_malloc_debug.o \
-	string_strdup_debug.o \
-	unistd_getcwd_debug.o
-
 ##############################################################################

 LIBS_68K := $(LIBC_OBJS)/libc.a $(LIBSTACK_OBJS)/libstack.a $(LIBUNIX_OBJS)/libunix.a \
            $(LIBNET_OBJS)/libnet.a $(LIBDEBUG_OBJS)/libdebug.a $(LIBAMIGA_OBJS)/libamiga.a \
            $(LIBM_OBJS)/libm.a
-LIBS_020 := $(LIBM881_OBJS)/libm881.a $(LIBS_68K)
+ LIBS_020 := $(LIBM881_OBJS)/libm881.a $(LIBS_68K)
+#LIBS_020 := $(LIBS_68K)

 ##############################################################################

@@ -746,8 +707,8 @@ all: \
 	lib/mainnb.o \
 	lib/mainb.o \
 	lib/mainb32.o \
-	lib/libm020/libm.a \
 	lib/libm.a \
+	lib/libm020/libm.a \
 	lib/libb/libm.a \
 	lib/libb/libm020/libm.a \
 	lib/libb32/libm020/libm.a
@@ -916,52 +877,6 @@ $(LIBC_OBJS)/stdlib_red_black.o : stdlib_red_black.c stdlib_mem_debug.h

 ##############################################################################

-$(LIBC_OBJS)/stdlib_alloca_debug.o : stdlib_alloca.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_alloca_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_alloca.c
-
-$(LIBC_OBJS)/stdlib_calloc_debug.o : stdlib_calloc.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_calloc_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_calloc.c
-
-$(LIBC_OBJS)/stdlib_free_debug.o : stdlib_free.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_free_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_free.c
-
-$(LIBC_OBJS)/stdlib_malloc_debug.o : stdlib_malloc.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_malloc_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_malloc.c
-
-$(LIBC_OBJS)/stdlib_realloc_debug.o : stdlib_realloc.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_realloc_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_realloc.c
-
-$(LIBC_OBJS)/stdio_vasprintf_hook_entry_debug.o : stdio_vasprintf_hook_entry.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdio_vasprintf_hook_entry_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdio_vasprintf_hook_entry.c
-
-$(LIBC_OBJS)/stdio_vasprintf_debug.o : stdio_vasprintf.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdio_vasprintf_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdio_vasprintf.c
-
-$(LIBM_OBJS)/stdio_vasprintf_debug.o : stdio_vasprintf.c
-	@echo "Compiling $< [$(TYPE):m debug]"
-	@$(CC) -o $(LIBM_OBJS)/stdio_vasprintf_debug.o -c $(CFLAGS) -DIEEE_FLOATING_POINT_SUPPORT -D__USE_MEM_TREES -D__MEM_DEBUG stdio_vasprintf.c
-
-$(LIBC_OBJS)/string_strdup_debug.o : string_strdup.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/string_strdup_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG string_strdup.c
-
-$(LIBC_OBJS)/unistd_getcwd_debug.o : unistd_getcwd.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/unistd_getcwd_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG unistd_getcwd.c
-
-$(LIBUNIX_OBJS)/unistd_getcwd_debug.o : unistd_getcwd.c
-	@echo "Compiling $< [$(TYPE):unix debug]"
-	@$(CC) -o $(LIBUNIX_OBJS)/unistd_getcwd_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG -DUNIX_PATH_SEMANTICS unistd_getcwd.c
-
-##############################################################################
-
 $(LIBC_OBJS) :
 	$(MAKEDIR) $@

@@ -1065,3 +980,28 @@ mainb.o : stdlib_main.c

 mainnb.o : stdlib_main.c
 	$(CC) -o mainnb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -m68000 stdlib_main.c
+
+##############################################################################
+
+#test: test.o ncrt0.o libc.a libunix.a libm.a libdebug.a libamiga.a
+#	$(CC) -Wl,--verbose $(CFLAGS) -DIEEE_FLOATING_POINT_SUPPORT \
+#		-o $@ -nostdlib ncrt0.o test.o -L. -lm -lunix -ldebug -lc -lamiga
+
+#test: test.o ncrt0.o nbcrt0.o nrcrt0.o libc.a libunix.a libm.a libdebug.a libamiga.a
+#	$(CC) -resident -Wl,--verbose $(CFLAGS) -DIEEE_FLOATING_POINT_SUPPORT -fbaserel32 -DSMALL_DATA \
+#		-o $@ -nostdlib nbcrt0.o test.o -L. -lm -lunix -ldebug -lc -lamiga
+
+test : test.c
+	gcc -o test test.c -D__MEM_DEBUG -DFLOATING_POINT_SUPPORT -Llib -lunix -lm
+
+#test: test.o ncrt0.o nbcrt0.o nrcrt0.o libc.a libunix.a libm.a libdebug.a libamiga.a
+#	$(CC) -resident -Wl,--verbose $(CFLAGS) -DIEEE_FLOATING_POINT_SUPPORT -fbaserel -DSMALL_DATA \
+#		-o $@ -nostdlib nrcrt0.o test.o -L. -lm -lunix -ldebug -lc -lamiga
+
+##############################################################################
+
+mkid:
+	mkid -v #?.(c|h|asm|i) include/#?.(c|h|asm|i) include/sys/#?.(c|h|asm|i)
+
+update:
+	mkid -v -u
--- a/library/GNUmakefile.os4
+++ b/library/GNUmakefile.os4
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.os4,v 1.26 2005-02-07 10:52:16 obarthel Exp $
+# $Id: GNUmakefile.os4,v 1.4 2004-08-12 12:31:15 obarthel Exp $
 #
 # :ts=8
 #
@@ -15,7 +15,7 @@ NET_INCLUDE = netinclude
 CC = ppc-amigaos-gcc
 AR = ppc-amigaos-ar -q
 RANLIB = ppc-amigaos-ranlib
-COPY = cp -a
+COPY = cp
 DELETE = rm -r
 MAKEDIR = mkdir

@@ -32,27 +32,28 @@ MAKE = make -f GNUmakefile.os4
 ##############################################################################

 ifeq (,$(TYPE))
-LIBC_OBJS		= libc_objs
-LIBUNIX_OBJS		= libunix_objs
-LIBM_OBJS		= libm_objs
-LIBNET_OBJS		= libnet_objs
-LIBDEBUG_OBJS		= libdebug_objs
-LIBAMIGA_OBJS		= libamiga_objs
+LIBC_OBJS	= libc_objs
+LIBUNIX_OBJS	= libunix_objs
+LIBM_OBJS	= libm_objs
+LIBSTACK_OBJS	= libstack_objs
+LIBNET_OBJS	= libnet_objs
+LIBDEBUG_OBJS	= libdebug_objs
+LIBAMIGA_OBJS	= libamiga_objs
 else
-LIBC_OBJS		= $(TYPE)/libc_objs
-LIBUNIX_OBJS		= $(TYPE)/libunix_objs
-LIBM_OBJS		= $(TYPE)/libm_objs
-LIBNET_OBJS		= $(TYPE)/libnet_objs
-LIBDEBUG_OBJS		= $(TYPE)/libdebug_objs
-LIBAMIGA_OBJS		= $(TYPE)/libamiga_objs
+LIBC_OBJS	= $(TYPE)/libc_objs
+LIBUNIX_OBJS	= $(TYPE)/libunix_objs
+LIBM_OBJS	= $(TYPE)/libm_objs
+LIBSTACK_OBJS	= $(TYPE)/libstack_objs
+LIBNET_OBJS	= $(TYPE)/libnet_objs
+LIBDEBUG_OBJS	= $(TYPE)/libdebug_objs
+LIBAMIGA_OBJS	= $(TYPE)/libamiga_objs
 endif

 ##############################################################################

-# General build rules for all object files and the individual libraries
 %.o : %.c
 	@echo "Compiling $<"
-	@$(CC) -c $(CFLAGS) $<
+	@$(CC) -c $(CFLAGS) -DPPC_FLOATING_POINT_SUPPORT $<

 $(LIBC_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):c]"
@@ -64,7 +65,11 @@ $(LIBUNIX_OBJS)/%.o : %.c

 $(LIBM_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):m]"
-	@$(CC) -o $(LIBM_OBJS)/$*.o -c $(CFLAGS) $(FLOAT_TYPE) $<
+	@$(CC) -o $(LIBM_OBJS)/$*.o -c $(CFLAGS) -DPPC_FLOATING_POINT_SUPPORT $<
+
+$(LIBSTACK_OBJS)/%.o : %.c
+	@echo "Compiling $< [$(TYPE):stack]"
+	@$(CC) -o $(LIBSTACK_OBJS)/$*.o -c $(CFLAGS) $<

 $(LIBNET_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):net]"
@@ -80,46 +85,29 @@ $(LIBAMIGA_OBJS)/%.o : %.c

 ##############################################################################

-# Build options for the individual libraries
 ifeq (small_data,$(TYPE))
 CODE_TYPE := -msdata=sysv -DSMALL_DATA
-FLOAT_TYPE := -DPPC_FLOATING_POINT_SUPPORT
 endif

 ifeq (large_data,$(TYPE))
 CODE_TYPE := -msdata=data
-FLOAT_TYPE := -DPPC_FLOATING_POINT_SUPPORT
 endif

-ifeq (large_data_softfloat,$(TYPE))
-CODE_TYPE := -msdata=data -msoft-float
-FLOAT_TYPE :=
-endif
-
-ifeq (baserel,$(TYPE))
-CODE_TYPE := -mbaserel -DBASEREL_DATA
-FLOAT_TYPE := -DPPC_FLOATING_POINT_SUPPORT
-endif
-
-
 ##############################################################################

 WARNINGS = \
-	-Wall -W -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
-	-Wundef -Wbad-function-cast -Wmissing-declarations -Wunused
-
-#	-Wconversion -Wshadow
+	-Wall -W -Wshadow -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
+	-Wundef -Wbad-function-cast -Wmissing-declarations -Wconversion

 INCLUDES = -Iinclude -I. -I$(SDK_INCLUDE)
-OPTIONS = -DNDEBUG -DUSE_64_BIT_INTS -D__USE_INLINE__ -Wa,-mregnames
-OPTIMIZE = -O -fomit-frame-pointer -funroll-loops
+OPTIONS = -DNDEBUG -DUSE_64_BIT_INTS -fno-builtin -D__USE_INLINE__ -Wa,-mregnames
+OPTIMIZE = -O3 -fomit-frame-pointer -funroll-loops
 #DEBUG = -g

 CFLAGS = $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(CODE_TYPE) $(INCLUDES)

 ##############################################################################

-# All objects files which make up libc.a
 C_LIB = \
 	c.lib_rev.o \
 	ctype_isalnum.o \
@@ -139,9 +127,9 @@ C_LIB = \
 	ctype_table.o \
 	dirent_closedir.o \
 	dirent_data.o \
-	dirent_rewinddir.o \
 	dirent_opendir.o \
 	dirent_readdir.o \
+	dirent_rewinddir.o \
 	errno_data.o \
 	fcntl_close.o \
 	fcntl_creat.o \
@@ -150,9 +138,9 @@ C_LIB = \
 	fcntl_open.o \
 	fcntl_read.o \
 	fcntl_write.o \
-	fcntl_get_default_file.o \
 	libgen_basename.o \
 	libgen_dirname.o \
+	locale_data.o \
 	locale_init_exit.o \
 	locale_localeconv.o \
 	locale_setlocale.o \
@@ -260,78 +248,66 @@ C_LIB = \
 	stdlib_atol.o \
 	stdlib_bsearch.o \
 	stdlib_calloc.o \
-	stdlib_checkdetach.o \
-	stdlib_constructor.o \
-	stdlib_constructor_begin.o \
-	stdlib_constructor_end.o \
 	stdlib_data.o \
 	stdlib_default_pool_size.o \
 	stdlib_default_puddle_size.o \
 	stdlib_destructor.o \
-	stdlib_detach.o \
 	stdlib_disablerequesters.o \
 	stdlib_div.o \
+	stdlib_modsi3.o \
 	stdlib_divsi3.o \
 	stdlib_divsi4.o \
-	stdlib_dosbase.o \
+	stdlib_umodsi3.o \
+	stdlib_udivsi3.o \
+	stdlib_udivsi4.o \
 	stdlib_exit.o \
 	stdlib_free.o \
-	stdlib_getdefstacksize.o \
-	stdlib_get_errno.o \
 	stdlib_getenv.o \
 	stdlib_getsp.o \
 	stdlib_init_exit.o \
-	stdlib_isresident.o \
 	stdlib_labs.o \
 	stdlib_ldiv.o \
+	stdlib_getdefstacksize.o \
+	stdlib_stackargbytes.o \
+	stdlib_stack_usage.o \
+	stdlib_checkdetach.o \
+	stdlib_detach.o \
+	stdlib_isresident.o \
+	stdlib_sysbase.o \
+	stdlib_dosbase.o \
 	stdlib_machine_test.o \
 	stdlib_malloc.o \
 	stdlib_math.o \
 	stdlib_mkdtemp.o \
 	stdlib_mkstemp.o \
 	stdlib_mktemp.o \
-	stdlib_modsi3.o \
 	stdlib_mulsi3.o \
 	stdlib_never_free.o \
-	stdlib_osliberror.o \
-	stdlib_oslibversion.o \
-	stdlib_priority.o \
-	stdlib_process_name.o \
 	stdlib_putenv.o \
 	stdlib_qsort.o \
 	stdlib_rand.o \
 	stdlib_realloc.o \
 	stdlib_red_black.o \
-	stdlib_set_errno.o \
 	stdlib_setenv.o \
 	stdlib_setjmp.o \
-	stdlib_set_process_window.o \
 	stdlib_shell_escape.o \
 	stdlib_showerror.o \
 	stdlib_socket.o \
 	stdlib_srand.o \
-	stdlib_stackargbytes.o \
 	stdlib_stackcheck.o \
 	stdlib_stackoverflow.o \
 	stdlib_stacksafezone.o \
 	stdlib_stacksize.o \
-	stdlib_stack_usage.o \
 	stdlib_startup.o \
 	stdlib_strtol.o \
 	stdlib_strtoul.o \
-	stdlib_strtoll.o \
-	stdlib_strtoull.o \
 	stdlib_swapstack.o \
-	stdlib_sysbase.o \
 	stdlib_system.o \
 	stdlib_termination_message.o \
 	stdlib_threshold.o \
-	stdlib_udivsi3.o \
-	stdlib_udivsi4.o \
-	stdlib_umodsi3.o \
 	stdlib_unsetenv.o \
+	stdlib_usergroup.o \
 	stdlib_wildcard_expand.o \
-	stdlib_stdio_window_spec.o \
 	strings_strcasecmp.o \
 	strings_strncasecmp.o \
 	string_bcmp.o \
@@ -352,8 +328,6 @@ C_LIB = \
 	string_strcspn.o \
 	string_strdup.o \
 	string_strerror.o \
-	string_strlcat.o \
-	string_strlcpy.o \
 	string_strlen.o \
 	string_strncat.o \
 	string_strncmp.o \
@@ -363,40 +337,29 @@ C_LIB = \
 	string_strspn.o \
 	string_strstr.o \
 	string_strtok.o \
-	string_strtok_r.o \
 	string_strxfrm.o \
 	time_asctime.o \
-	time_asctime_r.o \
 	time_clock.o \
 	time_converttime.o \
-	time_convert_datestamp.o \
-	time_convert_time.o \
 	time_ctime.o \
-	time_ctime_r.o \
 	time_data.o \
-	time_days_per_date.o \
 	time_gettimeofday.o \
 	time_gmtime.o \
-	time_gmtime_r.o \
 	time_localtime.o \
-	time_localtime_r.o \
 	time_mktime.o \
 	time_numbertostring.o \
 	time_strftime.o \
 	time_time.o \
-	time_weekday.o \
 	unistd_access.o \
 	unistd_chdir.o \
-	unistd_chdir_exit.o \
 	unistd_chown.o \
 	unistd_currentpathname.o \
+	unistd_data.o \
 	unistd_dup.o \
 	unistd_dup2.o \
 	unistd_fchown.o \
-	unistd_fdatasync.o \
 	unistd_fdopen.o \
 	unistd_fileno.o \
-	unistd_fsync.o \
 	unistd_ftruncate.o \
 	unistd_getcwd.o \
 	unistd_getopt.o \
@@ -409,25 +372,21 @@ C_LIB = \
 	unistd_realpath.o \
 	unistd_sleep.o \
 	unistd_symlink.o \
-	unistd_timer.o \
-	unistd_time_delay.o \
 	unistd_truncate.o \
 	unistd_unlink.o \
-	unistd_usleep.o \
-	utime_utime.o
+	utime_utime.o 
+

-# All objects files which make up libunix.a
 UNIX_LIB = \
 	unix.lib_rev.o \
 	dirent_closedir.o \
 	dirent_data.o \
-	dirent_rewinddir.o \
 	dirent_opendir.o \
 	dirent_readdir.o \
+	dirent_rewinddir.o \
 	fcntl_creat.o \
 	fcntl_fcntl.o \
 	fcntl_open.o \
-	fcntl_get_default_file.o \
 	mount_convertinfo.o \
 	mount_statfs.o \
 	stat_chmod.o \
@@ -437,21 +396,22 @@ UNIX_LIB = \
 	stat_rmdir.o \
 	stat_stat.o \
 	stdio_fdhookentry.o \
-	stdio_fflush.o \
-	stdio_fopen.o \
 	stdio_init_exit.o \
 	stdio_locksemaphorename.o \
 	stdio_openiob.o \
+	stdio_fflush.o \
+	stdio_fopen.o \
+	stdio_fopen.o \
 	stdio_popen.o \
 	stdio_remove.o \
 	stdio_rename.o \
 	stdlib_mkdtemp.o \
 	stdlib_mkstemp.o \
+	stdlib_mkstemp.o \
 	stdlib_mktemp.o \
 	stdlib_system.o \
 	unistd_access.o \
 	unistd_chdir.o \
-	unistd_chdir_exit.o \
 	unistd_chown.o \
 	unistd_getcwd.o \
 	unistd_lchown.o \
@@ -470,7 +430,6 @@ UNIX_LIB = \
 	unistd_wildcard_expand.o \
 	utime_utime.o

-# All objects files which make up libm.a
 MATH_LIB = \
 	math_acos.o \
 	math_asin.o \
@@ -485,8 +444,6 @@ MATH_LIB = \
 	math_floor.o \
 	math_fmod.o \
 	math_frexp.o \
-	math_huge_val.o \
-	math_hypot.o \
 	math_init_exit.o \
 	math_isnan.o \
 	math_isinf.o \
@@ -521,6 +478,7 @@ MATH_LIB = \
 	stdio_vasprintf.o \
 	stdio_vfprintf.o \
 	stdio_vfscanf.o \
+	stdio_vfscanf.o \
 	stdio_vprintf.o \
 	stdio_vsnprintf.o \
 	stdio_vsprintf.o \
@@ -529,7 +487,48 @@ MATH_LIB = \
 	stdlib_strtod.o \
 	time_difftime.o

-# All objects files which make up libnet.a
+MATH_LIB_IEEE = \
+	m.lib_rev.o \
+	$(MATH_LIB) \
+	math_adddf3.o \
+	math_addsf3.o \
+	math_divdf3.o \
+	math_divsf3.o \
+	math_eqdf2.o \
+	math_eqsf2.o \
+	math_extendsfdf2.o \
+	math_fixdfsi.o \
+	math_fixsfsi.o \
+	math_fixunsdfsi.o \
+	math_fixunssfsi.o \
+	math_floatsidf.o \
+	math_floatsisf.o \
+	math_gedf2.o \
+	math_gesf2.o \
+	math_gtdf2.o \
+	math_gtsf2.o \
+	math_ledf2.o \
+	math_lesf2.o \
+	math_ltdf2.o \
+	math_ltsf2.o \
+	math_muldf3.o \
+	math_mulsf3.o \
+	math_nedf2.o \
+	math_negdf2.o \
+	math_negsf2.o \
+	math_nesf2.o \
+	math_subdf3.o \
+	math_subsf3.o \
+	math_truncdfsf2.o
+
+STACK_LIB = \
+	stack.lib_rev.o \
+	stdlib_setjmp.o \
+	stdlib_stackextension.o \
+	stdlib_stackminframe.o \
+	stdlib_stackoverflow.o \
+	stdlib_stacksafezone.o
+
 NET_LIB = \
 	net.lib_rev.o \
 	socket_accept.o \
@@ -573,7 +572,6 @@ NET_LIB = \
 	socket_socket.o \
 	socket_hook_entry.o \
 	socket_hstrerror.o \
-	stat_umask.o \
 	usergroup_crypt.o \
 	usergroup_data.o \
 	usergroup_endgrent.o \
@@ -602,12 +600,13 @@ NET_LIB = \
 	usergroup_setregid.o \
 	usergroup_setreuid.o \
 	usergroup_setsid.o \
-	usergroup_setuid.o
+	usergroup_setuid.o \
+	stat_umask.o

-# All objects files which make up libdebug.a
 DEBUG_LIB = \
 	debug.lib_rev.o \
 	debug.o \
+	debug_level.o \
 	debug_cmpstrexec.o \
 	debug_kcmpstr.o \
 	debug_kdofmt.o \
@@ -633,10 +632,8 @@ DEBUG_LIB = \
 	debug_kputstr1.o \
 	debug_kputstr2.o \
 	debug_kvprintf1.o \
-	debug_kvprintf2.o \
-	debug_level.o
+	debug_kvprintf2.o

-# All objects files which make up libamiga.a
 AMIGA_LIB = \
 	amiga.lib_rev.o \
 	amiga_acrypt.o \
@@ -645,17 +642,10 @@ AMIGA_LIB = \
 	amiga_argarrayinit.o \
 	amiga_argint.o \
 	amiga_argstring.o \
-	amiga_beginio.o \
 	amiga_callhooka.o \
 	amiga_coercemethod.o \
-	amiga_createextio.o \
-	amiga_createport.o \
 	amiga_createstdio.o \
-	amiga_createtask.o \
-	amiga_deleteextio.o \
-	amiga_deleteport.o \
 	amiga_deletestdio.o \
-	amiga_deletetask.o \
 	amiga_domethod.o \
 	amiga_dosupermethod.o \
 	amiga_dotimer.o \
@@ -663,80 +653,49 @@ AMIGA_LIB = \
 	amiga_freeievents.o \
 	amiga_hotkey.o \
 	amiga_invertstring.o \
-	amiga_newlist.o \
 	amiga_rangerand.o \
 	amiga_remtof.o \
-	amiga_rexxvars.o \
 	amiga_setsuperattrs.o \
 	amiga_timedelay.o \
-	amiga_waitbeam.o
-
-MEMDEBUG_LIB = \
-	stdio_vasprintf_debug.o \
-	stdio_vasprintf_hook_entry_debug.o \
-	stdlib_alloca_debug.o \
-	stdlib_calloc_debug.o \
-	stdlib_free_debug.o \
-	stdlib_malloc_debug.o \
-	string_strdup_debug.o \
-	unistd_getcwd_debug.o
+	amiga_waitbeam.o 

 ##############################################################################

-# The libraries to be built, prefixed by the respective path names
-LIBS := \
-	$(LIBC_OBJS)/libc.a \
-	$(LIBUNIX_OBJS)/libunix.a \
-	$(LIBDEBUG_OBJS)/libdebug.a \
-	$(LIBAMIGA_OBJS)/libamiga.a \
-	$(LIBM_OBJS)/libm.a \
-	$(LIBNET_OBJS)/libnet.a
+LIBS := $(LIBC_OBJS)/libc.a $(LIBSTACK_OBJS)/libstack.a $(LIBUNIX_OBJS)/libunix.a \
+            $(LIBDEBUG_OBJS)/libdebug.a $(LIBAMIGA_OBJS)/libamiga.a \
+            $(LIBM_OBJS)/libm.a $(LIBNET_OBJS)/libnet.a

 ##############################################################################

-# The startup object files to be built
-STARTUPS := bcrt0.o bcrtbegin.o bcrtend.o crt0.o crtbegin.o crtend.o mainb.o mainnb.o

 ##############################################################################

-# This is the first target: it creates the necessary directories, then proceeds
-# to build the startup object files and finally the libraries
+STARTUPS := crt0.o crtbegin.o crtend.o mainnb.o
+
+##############################################################################
+
 all: \
-	lib \
-	lib/soft-float \
-	lib/small-data \
-	lib/baserel \
-	small_data \
-	large_data \
-	large_data_softfloat \
-	baserel \
-	lib/bcrt0.o \
-	lib/bcrtbegin.o \
-	lib/bcrtend.o \
 	lib/crt0.o \
 	lib/crtbegin.o \
 	lib/crtend.o \
-	lib/mainb.o \
 	lib/mainnb.o \
-	lib/libm.a \
-	lib/small-data/libm.a \
-	lib/soft-float/libm.a \
-	lib/baserel/crt0.o \
-	lib/baserel/crtbegin.o \
-	lib/baserel/crtend.o \
-	lib/baserel/mainb.o \
-	lib/baserel/mainnb.o \
-	lib/baserel/libm.a
+	lib/libm.a
+
+copy:
+	$(COPY) $(foreach file,$(LIBS),large_data/$(file)) lib

 ##############################################################################

-# Delete all object files and libraries
 clean:
-	-$(DELETE) $(STARTUPS) lib small_data large_data large_data_softfloat baserel
+	-$(DELETE) $(TYPE)  $(STARTUPS) \
+		$(LIBC_OBJS) $(LIBUNIX_OBJS) $(LIBM_OBJS) $(LIBSTACK_OBJS) $(LIBNET_OBJS) $(LIBDEBUG_OBJS) $(LIBAMIGA_OBJS)
+
+realclean:
+	$(MAKE) clean
+	-$(DELETE) lib small_data large_data

 ##############################################################################

-# Update the version numbers bound to the individual libraries
 version:
 	cp c.lib_rev.rev amiga.lib_rev.rev
 	cp c.lib_rev.rev debug.lib_rev.rev
@@ -756,90 +715,33 @@ version:

 ##############################################################################

-# Tag all files with a certain version number
 cvs-tag:
 	cvs -q tag V1_`cat c.lib_rev.rev`

 ##############################################################################

-# This target first creates a directory to store the object files in, then
-# proceeds to build the libraries from the code. It is invoked by the
-# individual library build targets below.
-all_libraries: $(TYPE) $(LIBS)
+kitchen_sink: $(TYPE) $(LIBS) $(STARTUPS)
+
+##############################################################################
+
+ifneq (,$(TYPE))
+$(TYPE):
+	$(MAKEDIR) $@
+endif

 ##############################################################################

-# These create the required subdirectories to store object files and
-# libraries in
 lib:
 	-$(MAKEDIR) $@

-lib/small-data: lib
-	-$(MAKEDIR) $@
-
-lib/soft-float: lib
-	-$(MAKEDIR) $@
-
-lib/baserel: lib
-	-$(MAKEDIR) $@
-
-small_data:
-	-$(MAKEDIR) $@
-
-large_data:
-	-$(MAKEDIR) $@
-
-large_data_softfloat:
-	-$(MAKEDIR) $@
-
-baserel:
-	-$(MAKEDIR) $@
-
-##############################################################################
-
-# Dependencies for libm.a (large data variant with hardware floating point code
-# support): this actually ends up building all the libraries rather than just
-# libm.a
-lib/libm.a: large_data large_data/libm.a
-
-large_data/libm.a:
-	$(MAKE) TYPE=large_data all_libraries
+lib/libm.a: lib
+	$(MAKE) TYPE=large_data kitchen_sink
 	$(COPY) $(foreach file,$(LIBS),large_data/$(file)) lib

-##############################################################################
-
-# Dependencies for libm.a (large data variant with software floating point code
-# support): this actually ends up building all the libraries rather than just
-# libm.a
-lib/soft-float/libm.a: large_data_softfloat large_data_softfloat/libm.a
-
-large_data_softfloat/libm.a:
-	$(MAKE) TYPE=large_data_softfloat all_libraries
-	$(COPY) $(foreach file,$(LIBS),large_data_softfloat/$(file)) lib/soft-float
-
-##############################################################################
-
-# Dependencies for libm.a (small data variant): this actually ends up building all
-# the libraries rather than just libm.a
-lib/small-data/libm.a: small_data small_data/libm.a
-
-small_data/libm.a:
-	$(MAKE) TYPE=small_data all_libraries
+lib/small-data/libm.a: lib lib/small-data
+	$(MAKE) TYPE=small_data kitchen_sink
 	$(COPY) $(foreach file,$(LIBS),small_data/$(file)) lib/small-data

-##############################################################################
-
-# Dependencies for libm.a (baserel variant)
-
-lib/baserel/libm.a: baserel baserel/libm.a
-
-baserel/libm.a:
-	$(MAKE) TYPE=baserel all_libraries
-	$(COPY) $(foreach file,$(LIBS),baserel/$(file)) lib/baserel
-
-##############################################################################
-
-# Rules to build and move the startup code
 lib/crt0.o : lib crt0.o
 	$(COPY) crt0.o lib

@@ -855,62 +757,24 @@ lib/mainnb.o : lib mainnb.o
 lib/mainb.o : lib mainb.o
 	$(COPY) mainb.o lib

-lib/bcrt0.o : lib bcrt0.o
-	$(COPY) bcrt0.o lib
-
-lib/bcrtbegin.o : lib bcrtbegin.o
-	$(COPY) bcrtbegin.o lib
-
-lib/bcrtend.o : lib bcrtend.o
-	$(COPY) bcrtend.o lib
-
-lib/baserel/crt0.o : lib baserel/crt0.o
-	$(COPY) baserel/crt0.o lib/baserel
-
-lib/baserel/crtbegin.o : lib baserel/crtbegin.o
-	$(COPY) baserel/crtbegin.o lib/baserel
-
-lib/baserel/crtend.o : lib baserel/crtend.o
-	$(COPY) baserel/crtend.o lib/baserel
-
-lib/baserel/mainnb.o : lib baserel/mainnb.o
-	$(COPY) baserel/mainnb.o lib/baserel
-
-lib/baserel/mainb.o : lib baserel/mainb.o
-	$(COPY) baserel/mainb.o lib/baserel
-
-
 ##############################################################################

-# Individual dependencies which tell make to build the object files from
-# 'C' source files rather than the assembly language source files of the
-# same name (e.g. stdlib_getsp.c instead of stdlib_getsp.asm).
+$(LIBAMIGA_OBJS)/amiga_hookentry.o : amiga_hookentry.c
+
 $(LIBC_OBJS)/stdlib_getsp.o : stdlib_getsp.c

 $(LIBC_OBJS)/stdlib_swapstack.o : stdlib_swapstack.c

 $(LIBC_OBJS)/stdlib_setjmp.o : stdlib_setjmp.c

-##############################################################################
-
-# Build rules for version information that goes into each library
-$(LIBC_OBJS)/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
-
-$(LIBUNIX_OBJS)/unix.lib_rev.o : unix.lib_rev.c unix.lib_rev.h
-
-$(LIBM_OBJS)/m.lib_rev.o : m.lib_rev.c m.lib_rev.h
-
-$(LIBNET_OBJS)/net.lib_rev.o : net.lib_rev.c net.lib_rev.h
-
-$(LIBDEBUG_OBJS)/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
-
-$(LIBAMIGA_OBJS)/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h
+$(LIBSTACK_OBJS)/stdlib_setjmp.o : stdlib_setjmp.c

 ##############################################################################

-# Build rules for the debug version of the library which has special
-# memory allocation debugging code, controlled by the contents of
-# the stdlib_mem_debug.h file.
+$(LIBC_OBJS)/stdlib_stacksize.o : stdlib_stacksize.c stdlib_gcc_help.h
+
+$(LIBC_OBJS)/stdlib_shell_escape.o : stdlib_shell_escape.c stdlib_gcc_help.h
+
 $(LIBC_OBJS)/stdlib_alloca.o : stdlib_alloca.c stdlib_mem_debug.h

 $(LIBC_OBJS)/stdlib_calloc.o : stdlib_calloc.c stdlib_mem_debug.h
@@ -927,55 +791,6 @@ $(LIBC_OBJS)/stdlib_red_black.o : stdlib_red_black.c stdlib_mem_debug.h

 ##############################################################################

-# Peculiar build rules for the debug versions of memory allocation functions,
-# or at least those which use memory allocation functionality.
-$(LIBC_OBJS)/stdlib_alloca_debug.o : stdlib_alloca.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_alloca_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_alloca.c
-
-$(LIBC_OBJS)/stdlib_calloc_debug.o : stdlib_calloc.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_calloc_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_calloc.c
-
-$(LIBC_OBJS)/stdlib_free_debug.o : stdlib_free.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_free_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_free.c
-
-$(LIBC_OBJS)/stdlib_malloc_debug.o : stdlib_malloc.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_malloc_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_malloc.c
-
-$(LIBC_OBJS)/stdlib_realloc_debug.o : stdlib_realloc.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_realloc_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdlib_realloc.c
-
-$(LIBC_OBJS)/stdio_vasprintf_hook_entry_debug.o : stdio_vasprintf_hook_entry.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdio_vasprintf_hook_entry_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdio_vasprintf_hook_entry.c
-
-$(LIBC_OBJS)/stdio_vasprintf_debug.o : stdio_vasprintf.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/stdio_vasprintf_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG stdio_vasprintf.c
-
-$(LIBM_OBJS)/stdio_vasprintf_debug.o : stdio_vasprintf.c
-	@echo "Compiling $< [$(TYPE):m debug]"
-	@$(CC) -o $(LIBM_OBJS)/stdio_vasprintf_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG $(FLOAT_TYPE) stdio_vasprintf.c
-
-$(LIBC_OBJS)/string_strdup_debug.o : string_strdup.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/string_strdup_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG string_strdup.c
-
-$(LIBC_OBJS)/unistd_getcwd_debug.o : unistd_getcwd.c
-	@echo "Compiling $< [$(TYPE):c debug]"
-	@$(CC) -o $(LIBC_OBJS)/unistd_getcwd_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG unistd_getcwd.c
-
-$(LIBUNIX_OBJS)/unistd_getcwd_debug.o : unistd_getcwd.c
-	@echo "Compiling $< [$(TYPE):unix debug]"
-	@$(CC) -o $(LIBUNIX_OBJS)/unistd_getcwd_debug.o -c $(CFLAGS) -D__USE_MEM_TREES -D__MEM_DEBUG -DUNIX_PATH_SEMANTICS unistd_getcwd.c
-
-##############################################################################
-
-# Individual build rules for libc.a
 $(LIBC_OBJS) :
 	$(MAKEDIR) $@

@@ -986,7 +801,6 @@ $(LIBC_OBJS)/libc.a : $(LIBC_OBJS) $(foreach file,$(C_LIB),$(LIBC_OBJS)/$(file))

 ##############################################################################

-# Individual build rules for libunix.a
 $(LIBUNIX_OBJS) :
 	$(MAKEDIR) $@

@@ -997,18 +811,26 @@ $(LIBUNIX_OBJS)/libunix.a : $(LIBUNIX_OBJS) $(foreach file,$(UNIX_LIB),$(LIBUNIX

 ##############################################################################

-# Individual build rules for libm.a
 $(LIBM_OBJS) :
 	$(MAKEDIR) $@

-$(LIBM_OBJS)/libm.a : $(LIBM_OBJS) $(foreach file,$(MATH_LIB),$(LIBM_OBJS)/$(file))
+$(LIBM_OBJS)/libm.a : $(LIBM_OBJS) $(foreach file,$(MATH_LIB_IEEE),$(LIBM_OBJS)/$(file))
 	-$(DELETE) $@
-	@$(AR) $@ $(foreach file,$(MATH_LIB),$(LIBM_OBJS)/$(file))
+	@$(AR) $@ $(foreach file,$(MATH_LIB_IEEE),$(LIBM_OBJS)/$(file))
+	$(RANLIB) $@
+
+##############################################################################
+
+$(LIBSTACK_OBJS) :
+	$(MAKEDIR) $@
+
+$(LIBSTACK_OBJS)/libstack.a : $(LIBSTACK_OBJS) $(foreach file,$(STACK_LIB),$(LIBSTACK_OBJS)/$(file))
+	-$(DELETE) $@
+	@$(AR) $@ $(foreach file,$(STACK_LIB),$(LIBSTACK_OBJS)/$(file))
 	$(RANLIB) $@

 ##############################################################################

-# Individual build rules for libnet.a
 $(LIBNET_OBJS) :
 	$(MAKEDIR) $@

@@ -1019,7 +841,6 @@ $(LIBNET_OBJS)/libnet.a : $(LIBNET_OBJS) $(foreach file,$(NET_LIB),$(LIBNET_OBJS

 ##############################################################################

-# Individual build rules for libdebug.a
 $(LIBDEBUG_OBJS) :
 	$(MAKEDIR) $@

@@ -1030,7 +851,6 @@ $(LIBDEBUG_OBJS)/libdebug.a : $(LIBDEBUG_OBJS) $(foreach file,$(DEBUG_LIB),$(LIB

 ##############################################################################

-# Individual build rules for libamiga.a
 $(LIBAMIGA_OBJS) :
 	$(MAKEDIR) $@

@@ -1041,7 +861,6 @@ $(LIBAMIGA_OBJS)/libamiga.a : $(LIBAMIGA_OBJS) $(foreach file,$(AMIGA_LIB),$(LIB

 ##############################################################################

-# Individual build rules for the startup code.
 crt0.o : crt0.S
 	@echo "Assembling $<"
 	@$(CC) -Wa,-mregnames -o crt0.o -c crt0.S
@@ -1058,26 +877,11 @@ mainb.o : stdlib_main.c
 	@echo "Compiling $<"
 	@$(CC) -o mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA stdlib_main.c

-bcrtbegin.o : crtbegin.c
-	$(CC) -o bcrtbegin.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtbegin.c
+##############################################################################

-bcrtend.o : crtend.c
-	$(CC) -o bcrtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA crtend.c
+mkid:
+#	mkid -v #?.(c|h|asm|i) include/#?.(c|h|asm|i) include/sys/#?.(c|h|asm|i)
+	mkid *.[ch] include/*.h include/sys/*.h

-baserel/crt0.o : crt0.S
-	@echo "Assembling $<"
-	@$(CC) -Wa,-mregnames -o baserel/crt0.o -mbaserel -DBASEREL_DATA -c crt0.S
-
-baserel/mainnb.o : stdlib_main.c
-	@echo "Compiling $<"
-	@$(CC) -o baserel/mainnb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA stdlib_main.c
-
-baserel/mainb.o : stdlib_main.c
-	@echo "Compiling $<"
-	@$(CC) -o baserel/mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA stdlib_main.c
-
-baserel/crtbegin.o : crtbegin.c
-	$(CC) -o baserel/crtbegin.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA crtbegin.c
-
-baserel/crtend.o : crtend.c
-	$(CC) -o baserel/crtend.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -mbaserel -DBASEREL_DATA crtend.c
+update:
+	mkid -v -u
--- a/library/amiga.lib_rev.c
+++ b/library/amiga.lib_rev.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga.lib_rev.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga.lib_rev.c,v 1.1.1.1 2004-07-26 16:30:15 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga.lib_rev.h
+++ b/library/amiga.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	188
-#define DATE		"7.2.2005"
-#define VERS		"amiga.lib 1.188"
-#define VSTRING		"amiga.lib 1.188 (7.2.2005)\r\n"
-#define VERSTAG		"\0$VER: amiga.lib 1.188 (7.2.2005)"
+#define REVISION	170
+#define DATE		"14.8.2004"
+#define VERS		"amiga.lib 1.170"
+#define VSTRING		"amiga.lib 1.170 (14.8.2004)\r\n"
+#define VERSTAG		"\0$VER: amiga.lib 1.170 (14.8.2004)"
--- a/library/amiga.lib_rev.rev
+++ b/library/amiga.lib_rev.rev
@@ -1 +1 @@
-188
+170
--- a/library/amiga_acrypt.c
+++ b/library/amiga_acrypt.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_acrypt.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_acrypt.c,v 1.1.1.1 2004-07-26 16:30:16 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_addtof.c
+++ b/library/amiga_addtof.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_addtof.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_addtof.c,v 1.1.1.1 2004-07-26 16:30:16 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_argarraydone.c
+++ b/library/amiga_argarraydone.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argarraydone.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_argarraydone.c,v 1.1.1.1 2004-07-26 16:30:16 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_argarrayinit.c
+++ b/library/amiga_argarrayinit.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argarrayinit.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_argarrayinit.c,v 1.1.1.1 2004-07-26 16:30:16 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_argint.c
+++ b/library/amiga_argint.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argint.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_argint.c,v 1.1.1.1 2004-07-26 16:30:16 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_argstring.c
+++ b/library/amiga_argstring.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argstring.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_argstring.c,v 1.1.1.1 2004-07-26 16:30:16 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_beginio.c
+++ b/library/amiga_beginio.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_beginio.c,v 1.3 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_beginio.c,v 1.1.1.1 2004-07-26 16:30:17 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -37,14 +37,6 @@

 /****************************************************************************/

-#include "debug.h"
-
-/****************************************************************************/
-
-#ifndef __PPC__
-
-/****************************************************************************/
-
 #if defined(__SASC)

 VOID __begin_io(struct IORequest * ior);
@@ -72,6 +64,10 @@ VOID __begin_io(struct IORequest * ior);

 /****************************************************************************/

+#include "debug.h"
+
+/****************************************************************************/
+
 VOID
 BeginIO(struct IORequest *ior)
 {
@@ -86,35 +82,3 @@ BeginIO(struct IORequest *ior)

 	LEAVE();
 }
-
-/****************************************************************************/
-
-#else
-
-/****************************************************************************/
-
-#include <proto/exec.h>
-
-/****************************************************************************/
-
-#if defined(BeginIO)
-#undef BeginIO
-#endif /* BeginIO */
-
-/****************************************************************************/
-
-VOID
-BeginIO(struct IORequest *ior)
-{
-	ENTER();
-
-	assert( ior != NULL && ior->io_Device != NULL );
-
-	IExec->BeginIO(ior);
-
-	LEAVE();
-}
-
-/****************************************************************************/
-
-#endif /* __PPC__ */
--- a/library/amiga_callhook.c
+++ b/library/amiga_callhook.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_callhook.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_callhook.c,v 1.1.1.1 2004-07-26 16:30:17 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_callhooka.asm
+++ b/library/amiga_callhooka.asm
@@ -1,10 +1,10 @@
 *
-*	$Id: amiga_callhooka.asm,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+*	$Id: amiga_callhooka.asm,v 1.1.1.1 2004-07-26 16:30:17 obarthel Exp $
 *
 *	:ts=8
 *
 *	Portable ISO 'C' (1994) runtime library for the Amiga computer
-*	Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+*	Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 *	All rights reserved.
 *
 *	Redistribution and use in source and binary forms, with or without
--- a/library/amiga_callhooka.c
+++ b/library/amiga_callhooka.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_callhooka.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_callhooka.c,v 1.1.1.1 2004-07-26 16:30:17 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_coercemethod.c
+++ b/library/amiga_coercemethod.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_coercemethod.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_coercemethod.c,v 1.1.1.1 2004-07-26 16:30:17 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_createextio.c
+++ b/library/amiga_createextio.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createextio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_createextio.c,v 1.1.1.1 2004-07-26 16:30:18 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -44,12 +44,6 @@

 /****************************************************************************/

-#if defined(CreateExtIO)
-#undef CreateExtIO
-#endif /* CreateExtIO */
-
-/****************************************************************************/
-
 struct IORequest *
 CreateExtIO(CONST struct MsgPort * port, LONG io_size)
 {
--- a/library/amiga_createport.c
+++ b/library/amiga_createport.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createport.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_createport.c,v 1.1.1.1 2004-07-26 16:30:18 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -44,12 +44,6 @@

 /****************************************************************************/

-#if defined(CreatePort)
-#undef CreatePort
-#endif /* CreatePort */
-
-/****************************************************************************/
-
 struct MsgPort *
 CreatePort(CONST_STRPTR name, LONG pri)
 {
--- a/library/amiga_createstdio.c
+++ b/library/amiga_createstdio.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createstdio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_createstdio.c,v 1.1.1.1 2004-07-26 16:30:18 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -44,12 +44,6 @@

 /****************************************************************************/

-#if defined(CreateStdIO)
-#undef CreateStdIO
-#endif /* CreateStdIO */
-
-/****************************************************************************/
-
 struct IOStdReq *
 CreateStdIO(CONST struct MsgPort * port)
 {
--- a/library/amiga_createtask.c
+++ b/library/amiga_createtask.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createtask.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_createtask.c,v 1.1.1.1 2004-07-26 16:30:18 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -31,6 +31,8 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

+#ifndef __PPC__
+
 /****************************************************************************/

 #include <exec/libraries.h>
@@ -51,10 +53,6 @@

 /****************************************************************************/

-#ifndef __PPC__
-
-/****************************************************************************/
-
 /*
 *  Create a task with given name, priority, and stack size.
 *  It will use the default exception and trap handlers for now.
@@ -193,44 +191,4 @@ CreateTask(CONST_STRPTR name,LONG pri,CONST APTR init_pc,ULONG stack_size)

 /****************************************************************************/

-#else
-
-/****************************************************************************/
-
-#if defined(CreateTask)
-#undef CreateTask
-#endif /* CreateTask */
-
-/****************************************************************************/
-
-struct Task *
-CreateTask(CONST_STRPTR name,LONG pri,CONST APTR init_pc,ULONG stack_size)
-{
-	struct Task * result = NULL;
-
-	ENTER();
-
-	SHOWSTRING(name);
-	SHOWVALUE(pri);
-	SHOWPOINTER(init_pc);
-	SHOWVALUE(stack_size);
-
-	assert( name != NULL && (-128 <= pri && pri <= 127) && init_pc != NULL && stack_size > 0 );
-
-	if(name == NULL || pri < -128 || pri > 127 || init_pc == NULL || stack_size == 0)
-	{
-		SHOWMSG("invalid parameters");
-		goto out;
-	}
-
-	result = IExec->CreateTask(name,pri,init_pc,stack_size,NULL);
-
- out:
-
-	RETURN(result);
-	return(result);
-}
-
-/****************************************************************************/
-
 #endif /* __PPC__ */
--- a/library/amiga_deleteextio.c
+++ b/library/amiga_deleteextio.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deleteextio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_deleteextio.c,v 1.1.1.1 2004-07-26 16:30:18 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -44,12 +44,6 @@

 /****************************************************************************/

-#if defined(DeleteExtIO)
-#undef DeleteExtIO
-#endif /* DeleteExtIO */
-
-/****************************************************************************/
-
 VOID
 DeleteExtIO(struct IORequest * io)
 {
--- a/library/amiga_deleteport.c
+++ b/library/amiga_deleteport.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deleteport.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_deleteport.c,v 1.1.1.1 2004-07-26 16:30:19 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -44,12 +44,6 @@

 /****************************************************************************/

-#if defined(DeletePort)
-#undef DeletePort
-#endif /* DeletePort */
-
-/****************************************************************************/
-
 VOID
 DeletePort(struct MsgPort * port)
 {
--- a/library/amiga_deletestdio.c
+++ b/library/amiga_deletestdio.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deletestdio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_deletestdio.c,v 1.1.1.1 2004-07-26 16:30:19 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -44,12 +44,6 @@

 /****************************************************************************/

-#if defined(DeleteStdIO)
-#undef DeleteStdIO
-#endif /* DeleteStdIO */
-
-/****************************************************************************/
-
 VOID
 DeleteStdIO(struct IOStdReq * io)
 {
--- a/library/amiga_deletetask.c
+++ b/library/amiga_deletetask.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deletetask.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_deletetask.c,v 1.1.1.1 2004-07-26 16:30:19 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -41,34 +41,8 @@

 /****************************************************************************/

-#ifndef __PPC__
-
-/****************************************************************************/
-
 VOID
 DeleteTask(struct Task *tc)
 {
 	RemTask(tc);
 }
-
-/****************************************************************************/
-
-#else
-
-/****************************************************************************/
-
-#if defined(DeleteTask)
-#undef DeleteTask
-#endif /* DeleteTask */
-
-/****************************************************************************/
-
-VOID
-DeleteTask(struct Task *tc)
-{
-	IExec->DeleteTask(tc);
-}
-
-/****************************************************************************/
-
-#endif /* __PPC__ */
--- a/library/amiga_domethod.c
+++ b/library/amiga_domethod.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_domethod.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_domethod.c,v 1.1.1.1 2004-07-26 16:30:19 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_dosupermethod.c
+++ b/library/amiga_dosupermethod.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_dosupermethod.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_dosupermethod.c,v 1.1.1.1 2004-07-26 16:30:19 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_dotimer.c
+++ b/library/amiga_dotimer.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_dotimer.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_dotimer.c,v 1.1.1.1 2004-07-26 16:30:19 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_fastrand.c
+++ b/library/amiga_fastrand.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_fastrand.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_fastrand.c,v 1.1.1.1 2004-07-26 16:30:20 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_freeievents.c
+++ b/library/amiga_freeievents.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_freeievents.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_freeievents.c,v 1.1.1.1 2004-07-26 16:30:20 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_hookentry.asm
+++ b/library/amiga_hookentry.asm
@@ -1,10 +1,10 @@
 *
-*	$Id: amiga_hookentry.asm,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+*	$Id: amiga_hookentry.asm,v 1.1.1.1 2004-07-26 16:30:20 obarthel Exp $
 *
 *	:ts=8
 *
 *	Portable ISO 'C' (1994) runtime library for the Amiga computer
-*	Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+*	Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 *	All rights reserved.
 *
 *	Redistribution and use in source and binary forms, with or without
--- a/library/amiga_hookentry.c
+++ b/library/amiga_hookentry.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_hookentry.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_hookentry.c,v 1.1.1.1 2004-07-26 16:30:20 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_hotkey.c
+++ b/library/amiga_hotkey.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_hotkey.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_hotkey.c,v 1.1.1.1 2004-07-26 16:30:20 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_invertstring.c
+++ b/library/amiga_invertstring.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_invertstring.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_invertstring.c,v 1.1.1.1 2004-07-26 16:30:20 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_newlist.c
+++ b/library/amiga_newlist.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_newlist.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_newlist.c,v 1.1.1.1 2004-07-26 16:30:21 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_rangerand.c
+++ b/library/amiga_rangerand.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_rangerand.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_rangerand.c,v 1.1.1.1 2004-07-26 16:30:21 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_remtof.c
+++ b/library/amiga_remtof.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_remtof.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_remtof.c,v 1.1.1.1 2004-07-26 16:30:21 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_rexxvars.c
+++ b/library/amiga_rexxvars.c
@@ -1,193 +0,0 @@
-/*
- * $Id: amiga_rexxvars.c,v 1.3 2005-01-09 10:10:40 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *   - Redistributions of source code must retain the above copyright
- *     notice, this list of conditions and the following disclaimer.
- *
- *   - Neither the name of Olaf Barthel nor the names of contributors
- *     may be used to endorse or promote products derived from this
- *     software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/* We don't want to pull in <clib/alib_protos.h> */
-#define CLIB_ALIB_PROTOS_H
-
-#ifndef _STDLIB_HEADERS_H
-#include "stdlib_headers.h"
-#endif /* _STDLIB_HEADERS_H */
-
-/****************************************************************************/
-
-#include <rexx/rxslib.h>
-#include <rexx/errors.h>
-
-/****************************************************************************/
-
-#define __NOLIBBASE__
-#include <proto/rexxsyslib.h>
-
-/****************************************************************************/
-
-static struct Library * RexxSysBase;
-
-/****************************************************************************/
-
-#if defined(__amigaos4__)
-static struct RexxSysIFace * IRexxSys;
-#endif /* __amigaos4__ */
-
-/****************************************************************************/
-
-CLIB_CONSTRUCTOR(__rexxvars_init)
-{
-	ENTER();
-
-	RexxSysBase = OpenLibrary(RXSNAME,0);
-
-	#if defined(__amigaos4__)
-	{
-		if(RexxSysBase != NULL)
-		{
-			IRexxSys = (struct RexxSysIFace *)GetInterface(RexxSysBase, "main", 1, 0);
-			if(IRexxSys == NULL)
-			{
-				CloseLibrary(RexxSysBase);
-				RexxSysBase = NULL;
-			}
-		}
-	}
-	#endif /* __amigaos4__ */
-
-	CONSTRUCTOR_SUCCEED();
-}
-
-/****************************************************************************/
-
-CLIB_DESTRUCTOR(__rexxvars_exit)
-{
-	ENTER();
-
-	#if defined(__amigaos4__)
-	{
-		if(IRexxSys != NULL)
-			DropInterface((struct Interface *)IRexxSys);
-
-		IRexxSys = NULL;
-	}
-	#endif /* __amigaos4__ */
-
-	if(RexxSysBase != NULL)
-	{
-		CloseLibrary(RexxSysBase);
-		RexxSysBase = NULL;
-	}
-
-	LEAVE();
-}
-
-/****************************************************************************/
-
-/* This is modeled after the original assembly language code. Except for the
-   fact that we compare the library base against a local, static variable
-   rather then opening the library for each check. */
-BOOL
-CheckRexxMsg(struct RexxMsg *message)
-{
-	BOOL result = FALSE;
-
-	if(RexxSysBase == NULL)
-		goto out;
-
-	if(message->rm_LibBase != RexxSysBase)
-		goto out;
-
-	if(message->rm_TaskBlock == NULL)
-		goto out;
-
-	if(NOT IsRexxMsg(message))
-		goto out;
-
-	result = TRUE;
-
- out:
-
-	return(result);
-}
-
-/****************************************************************************/
-
-/* The following function works in about like the original, except that it's
-   not reentrant, does not fill in a pointer to the variable itself and
-   requires rexxsyslib.library V45. */
-LONG
-GetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR *buffer_pointer)
-{
-	static UBYTE buffer[256];
-	LONG result;
-
-	/* The following uses a function which was added to rexxsyslib.library V45.
-	   We therefore have a minimum library version requirement. */
-	if(RexxSysBase == NULL || RexxSysBase->lib_Version < 45 || NOT IsRexxMsg(message))
-	{
-		result = ERR10_010; /* invalid message packet */
-		goto out;
-	}
-
-	/* The 256 character limit isn't good. This should be done differently. */
-	result = GetRexxVarFromMsg(variable_name,buffer,message);
-	if(result != 0)
-		goto out;
-
-	(*buffer_pointer) = buffer;
-
- out:
-
-	return(result);
-}
-
-/****************************************************************************/
-
-/* The following function works in about like the original, except that it
-   ignores the length parameter (the value needs to be a NUL-terminated string)
-   and requires rexxsyslib.library V45. */
-LONG
-SetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR value,ULONG length)
-{
-	LONG result;
-
-	/* The following uses a function which was added to rexxsyslib.library V45.
-	   We therefore have a minimum library version requirement. */
-	if(RexxSysBase == NULL || RexxSysBase->lib_Version < 45 || NOT IsRexxMsg(message))
-	{
-		result = ERR10_010; /* invalid message packet */
-		goto out;
-	}
-
-	result = SetRexxVarFromMsg(variable_name,value,message);
-
- out:
-
-	return(result);
-}
--- a/library/amiga_setsuperattrs.c
+++ b/library/amiga_setsuperattrs.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_setsuperattrs.c,v 1.3 2005-01-09 10:10:41 obarthel Exp $
+ * $Id: amiga_setsuperattrs.c,v 1.1.1.1 2004-07-26 16:30:21 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -46,7 +46,7 @@

 /****************************************************************************/

-static ULONG
+STATIC ULONG
 SetSuperAttrsA(Class * cl,Object * obj,struct TagItem * tags)
 {
 	ULONG result = 0;
--- a/library/amiga_timedelay.c
+++ b/library/amiga_timedelay.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_timedelay.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_timedelay.c,v 1.1.1.1 2004-07-26 16:30:21 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/amiga_waitbeam.c
+++ b/library/amiga_waitbeam.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_waitbeam.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_waitbeam.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/c.lib_rev.c
+++ b/library/c.lib_rev.c
@@ -1,10 +1,10 @@
 /*
- * $Id: c.lib_rev.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: c.lib_rev.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/c.lib_rev.h
+++ b/library/c.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	188
-#define DATE		"7.2.2005"
-#define VERS		"c.lib 1.188"
-#define VSTRING		"c.lib 1.188 (7.2.2005)\r\n"
-#define VERSTAG		"\0$VER: c.lib 1.188 (7.2.2005)"
+#define REVISION	170
+#define DATE		"14.8.2004"
+#define VERS		"c.lib 1.170"
+#define VSTRING		"c.lib 1.170 (14.8.2004)\r\n"
+#define VERSTAG		"\0$VER: c.lib 1.170 (14.8.2004)"
--- a/library/c.lib_rev.rev
+++ b/library/c.lib_rev.rev
@@ -1 +1 @@
-188
+170
--- a/library/changes
+++ b/library/changes
--- a/library/crt0.S
+++ b/library/crt0.S
@@ -1,5 +1,5 @@
 //
-//	$Id: crt0.S,v 1.2 2004-11-28 12:31:27 tfrieden Exp $
+//	$Id: crt0.S,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
 //
 //	:ts=4
 //
@@ -18,23 +18,5 @@ _start:
 	addi r13, r13, _SDA_BASE_@l
 #endif

-#if defined(BASEREL_DATA)
-	/* We also need to set up the data segment pointer */
-	lis r2, _DATA_BASE_@ha
-	addi r2, r2, _DATA_BASE_@l
-#endif
-
 	b	_main

-#if defined(BASEREL_DATA)
-	.section .rodata
-
-	.globl __data_segment_descriptor
-__data_segment_descriptor:
-	.long __data_start
-	.long __data_end
-	.long _DATA_BASE_
-
-	.section .dend, "wa", @nobits
-	.space 	4
-#endif
--- a/library/crtbegin.c
+++ b/library/crtbegin.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: crtbegin.c,v 1.3 2004-09-29 16:54:54 obarthel Exp $
+ * $Id: crtbegin.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
 *
 * :ts=4
 *
--- a/library/ctype_headers.h
+++ b/library/ctype_headers.h
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_headers.h,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_headers.h,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_isalnum.c
+++ b/library/ctype_isalnum.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isalnum.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isalnum.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_isalpha.c
+++ b/library/ctype_isalpha.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isalpha.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isalpha.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_isascii.c
+++ b/library/ctype_isascii.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isascii.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isascii.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_iscntrl.c
+++ b/library/ctype_iscntrl.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_iscntrl.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_iscntrl.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_isdigit.c
+++ b/library/ctype_isdigit.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isdigit.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isdigit.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_isgraph.c
+++ b/library/ctype_isgraph.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isgraph.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isgraph.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_islower.c
+++ b/library/ctype_islower.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_islower.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_islower.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_isprint.c
+++ b/library/ctype_isprint.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isprint.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isprint.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_ispunct.c
+++ b/library/ctype_ispunct.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_ispunct.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_ispunct.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_isspace.c
+++ b/library/ctype_isspace.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isspace.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isspace.c,v 1.1.1.1 2004-07-26 16:30:23 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_isupper.c
+++ b/library/ctype_isupper.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isupper.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isupper.c,v 1.1.1.1 2004-07-26 16:30:24 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_isxdigit.c
+++ b/library/ctype_isxdigit.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isxdigit.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isxdigit.c,v 1.1.1.1 2004-07-26 16:30:24 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_table.c
+++ b/library/ctype_table.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_table.c,v 1.3 2005-01-09 15:20:31 obarthel Exp $
+ * $Id: ctype_table.c,v 1.1.1.1 2004-07-26 16:30:24 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,22 @@

 /****************************************************************************/

-const unsigned char __ctype_table[2 * 128] =
+/* The construction of this table is rather peculiar. The assumption is that
+   the table index from which a flag value could be fetched is in the range
+   -128..255 since the character to be tested could be a signed or unsigned
+   8 bit value. The table access pointer (declared below) therefore points
+   to the 128th byte of '__ctype_data[]'. */
+static const unsigned char __ctype_data[3 * 128] =
 {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+
 	/*   0      */ __CTYPE_CONTROL,
 	/*   1      */ __CTYPE_CONTROL,
 	/*   2      */ __CTYPE_CONTROL,
@@ -176,3 +190,7 @@ const unsigned char __ctype_table[2 * 128] =
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
+
+/****************************************************************************/
+
+const unsigned char * const __ctype_table = &__ctype_data[128];
--- a/library/ctype_tolower.c
+++ b/library/ctype_tolower.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_tolower.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_tolower.c,v 1.1.1.1 2004-07-26 16:30:25 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/ctype_toupper.c
+++ b/library/ctype_toupper.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_toupper.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_toupper.c,v 1.1.1.1 2004-07-26 16:30:25 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug.c
+++ b/library/debug.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug.c,v 1.1.1.1 2004-07-26 16:30:25 obarthel Exp $
 *
 * :ts=8
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug.h
+++ b/library/debug.h
@@ -1,10 +1,10 @@
 /*
- * $Id: debug.h,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug.h,v 1.1.1.1 2004-07-26 16:30:26 obarthel Exp $
 *
 * :ts=8
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -57,17 +57,9 @@

 /****************************************************************************/

-#ifndef _STDLIB_H
-#include <stdlib.h>
-#endif /* _STDLIB_H */
-
-#ifndef _DOS_H
-#include <dos.h>
-#endif /* _DOS_H */
-
-/****************************************************************************/
-
 extern void kprintf(const char *format,...);
+extern void abort(void);
+extern char * __program_name;

 /****************************************************************************/

--- a/library/debug.lib_rev.c
+++ b/library/debug.lib_rev.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug.lib_rev.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug.lib_rev.c,v 1.1.1.1 2004-07-26 16:30:26 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug.lib_rev.h
+++ b/library/debug.lib_rev.h
@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	188
-#define DATE		"7.2.2005"
-#define VERS		"debug.lib 1.188"
-#define VSTRING		"debug.lib 1.188 (7.2.2005)\r\n"
-#define VERSTAG		"\0$VER: debug.lib 1.188 (7.2.2005)"
+#define REVISION	170
+#define DATE		"14.8.2004"
+#define VERS		"debug.lib 1.170"
+#define VSTRING		"debug.lib 1.170 (14.8.2004)\r\n"
+#define VERSTAG		"\0$VER: debug.lib 1.170 (14.8.2004)"
--- a/library/debug.lib_rev.rev
+++ b/library/debug.lib_rev.rev
@@ -1 +1 @@
-188
+170
--- a/library/debug_cmpstrexec.c
+++ b/library/debug_cmpstrexec.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_cmpstrexec.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_cmpstrexec.c,v 1.1.1.1 2004-07-26 16:30:26 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_headers.h
+++ b/library/debug_headers.h
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_headers.h,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_headers.h,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kcmpstr.c
+++ b/library/debug_kcmpstr.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kcmpstr.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kcmpstr.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kdofmt.c
+++ b/library/debug_kdofmt.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kdofmt.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kdofmt.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kgetc.c
+++ b/library/debug_kgetc.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetc.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetc.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kgetch1.c
+++ b/library/debug_kgetch1.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetch1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetch1.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kgetch2.c
+++ b/library/debug_kgetch2.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetch2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetch2.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kgetchar1.c
+++ b/library/debug_kgetchar1.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetchar1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetchar1.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kgetchar2.c
+++ b/library/debug_kgetchar2.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetchar2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetchar2.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kgetnum1.c
+++ b/library/debug_kgetnum1.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetnum1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetnum1.c,v 1.1.1.1 2004-07-26 16:30:27 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kgetnum2.c
+++ b/library/debug_kgetnum2.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kgetnum2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kgetnum2.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kmaygetch.c
+++ b/library/debug_kmaygetch.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kmaygetch.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kmaygetch.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kmaygetchar.c
+++ b/library/debug_kmaygetchar.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kmaygetchar.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kmaygetchar.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kprintf1.c
+++ b/library/debug_kprintf1.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kprintf1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kprintf1.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kprintf2.c
+++ b/library/debug_kprintf2.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kprintf2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kprintf2.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kputc.c
+++ b/library/debug_kputc.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputc.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputc.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kputch1.c
+++ b/library/debug_kputch1.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputch1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputch1.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kputch2.c
+++ b/library/debug_kputch2.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputch2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputch2.c,v 1.1.1.1 2004-07-26 16:30:28 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kputchar1.c
+++ b/library/debug_kputchar1.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputchar1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputchar1.c,v 1.1.1.1 2004-07-26 16:30:29 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kputchar2.c
+++ b/library/debug_kputchar2.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputchar2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputchar2.c,v 1.1.1.1 2004-07-26 16:30:29 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kputfmt.c
+++ b/library/debug_kputfmt.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputfmt.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputfmt.c,v 1.1.1.1 2004-07-26 16:30:29 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kputs1.c
+++ b/library/debug_kputs1.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputs1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputs1.c,v 1.1.1.1 2004-07-26 16:30:29 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kputs2.c
+++ b/library/debug_kputs2.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputs2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputs2.c,v 1.1.1.1 2004-07-26 16:30:29 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kputstr1.c
+++ b/library/debug_kputstr1.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputstr1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputstr1.c,v 1.1.1.1 2004-07-26 16:30:30 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kputstr2.c
+++ b/library/debug_kputstr2.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kputstr2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kputstr2.c,v 1.1.1.1 2004-07-26 16:30:30 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kvprintf1.c
+++ b/library/debug_kvprintf1.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kvprintf1.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kvprintf1.c,v 1.1.1.1 2004-07-26 16:30:30 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_kvprintf2.c
+++ b/library/debug_kvprintf2.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_kvprintf2.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_kvprintf2.c,v 1.1.1.1 2004-07-26 16:30:30 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/debug_level.c
+++ b/library/debug_level.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_level.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_level.c,v 1.1.1.1 2004-07-26 16:30:30 obarthel Exp $
 *
 * :ts=8
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
--- a/library/dirent_closedir.c
+++ b/library/dirent_closedir.c
@@ -1,10 +1,10 @@
 /*
- * $Id: dirent_closedir.c,v 1.5 2005-02-03 16:56:15 obarthel Exp $
+ * $Id: dirent_closedir.c,v 1.2 2004-08-07 09:15:32 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -63,7 +63,7 @@ closedir(DIR * directory_pointer)

 	if(directory_pointer == NULL)
 	{
-		__set_errno(EBADF);
+		errno = EBADF;
 		goto out;
 	}

@@ -84,7 +84,7 @@ closedir(DIR * directory_pointer)

 		if(NOT directory_pointer_is_valid)
 		{
-			__set_errno(EBADF);
+			errno = EBADF;
 			goto out;
 		}
 	}
@@ -94,12 +94,8 @@ closedir(DIR * directory_pointer)

 	Remove((struct Node *)dh);

-	#if defined(UNIX_PATH_SEMANTICS)
-	{
-		while((node = RemHead((struct List *)&dh->dh_VolumeList)) != NULL)
-			free(node);
-	}
-	#endif /* UNIX_PATH_SEMANTICS */
+	while((node = RemHead(&dh->dh_VolumeList)) != NULL)
+		free(node);

 	PROFILE_OFF();
 	UnLock(dh->dh_DirLock);
--- a/library/dirent_data.c
+++ b/library/dirent_data.c
@@ -1,10 +1,10 @@
 /*
- * $Id: dirent_data.c,v 1.5 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: dirent_data.c,v 1.3 2004-08-07 10:24:04 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@
 /****************************************************************************/

 /* Directories being scanned whose locks need to be freed when shutting down. */
-struct MinList NOCOMMON __directory_list;
+struct MinList __directory_list;

 /****************************************************************************/

--- a/library/dirent_headers.h
+++ b/library/dirent_headers.h
@@ -1,10 +1,10 @@
 /*
- * $Id: dirent_headers.h,v 1.5 2005-02-03 16:56:15 obarthel Exp $
+ * $Id: dirent_headers.h,v 1.1.1.1 2004-07-26 16:30:30 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -42,34 +42,21 @@

 /****************************************************************************/

-#ifndef _STDLIB_HEADERS_H
-#include "stdlib_headers.h"
-#endif /* _STDLIB_HEADERS_H */
-
-/****************************************************************************/
-
-#ifndef _MACROS_H
-#include "macros.h"
-#endif /* _MACROS_H */
-
-/****************************************************************************/
-
 struct DirectoryHandle
 {
 	struct MinNode			dh_MinNode;
 	BPTR					dh_DirLock;
 	struct FileInfoBlock	dh_FileInfo;
 	struct dirent			dh_DirectoryEntry;
-
 	int						dh_Position;
 	struct Node *			dh_VolumeNode;
-	struct MinList			dh_VolumeList;
+	struct List				dh_VolumeList;
 	BOOL					dh_ScanVolumeList;
 };

 /****************************************************************************/

-extern struct MinList NOCOMMON __directory_list;
+extern struct MinList __directory_list;

 /****************************************************************************/

--- a/library/dirent_opendir.c
+++ b/library/dirent_opendir.c
@@ -1,10 +1,10 @@
 /*
- * $Id: dirent_opendir.c,v 1.5 2005-02-03 16:56:15 obarthel Exp $
+ * $Id: dirent_opendir.c,v 1.2 2004-08-07 09:15:32 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -106,7 +106,7 @@ opendir(const char * path_name)
 		{
 			SHOWMSG("invalid parameter");

-			__set_errno(EFAULT);
+			errno = EFAULT;
 			goto out;
 		}
 	}
@@ -121,10 +121,10 @@ opendir(const char * path_name)

 	memset(dh,0,sizeof(*dh));

+	NewList(&dh->dh_VolumeList);
+
 	#if defined(UNIX_PATH_SEMANTICS)
 	{
-		NewList((struct List *)&dh->dh_VolumeList);
-
 		if(__unix_path_semantics)
 		{
 			if(__translate_unix_to_amiga_path_name(&path_name,&path_name_nti) != 0)
@@ -159,7 +159,7 @@ opendir(const char * path_name)
 						{
 							UnLockDosList(LDF_VOLUMES|LDF_READ);

-							__set_errno(ENOMEM);
+							errno = ENOMEM;
 							goto out;
 						}

@@ -172,7 +172,7 @@ opendir(const char * path_name)
 						/* Check if the name is already on the list. Mind you,
 						   this is not the most sophisticated algorithm but then
 						   the number of volumes should be small. */
-						if(find_by_name((struct List *)&dh->dh_VolumeList,node->ln_Name) != NULL)
+						if(find_by_name(&dh->dh_VolumeList,node->ln_Name) != NULL)
 						{
 							free(node);
 							continue;
@@ -180,16 +180,16 @@ opendir(const char * path_name)

 						D(("adding '%s'",node->ln_Name));

-						AddTail((struct List *)&dh->dh_VolumeList,node);
+						AddTail(&dh->dh_VolumeList,node);
 					}
 				}

 				UnLockDosList(LDF_VOLUMES|LDF_READ);

 				/* Bail out if we cannot present anything. */
-				if(IsListEmpty((struct List *)&dh->dh_VolumeList))
+				if(IsListEmpty(&dh->dh_VolumeList))
 				{
-					__set_errno(ENOMEM);
+					errno = ENOMEM;
 					goto out;
 				}
 			}
@@ -212,7 +212,7 @@ opendir(const char * path_name)
 		{
 			SHOWMSG("couldn't get a lock on it");

-			__set_errno(__translate_access_io_error_to_errno(IoErr()));
+			__translate_access_io_error_to_errno(IoErr(),&errno);
 			goto out;
 		}

@@ -226,7 +226,7 @@ opendir(const char * path_name)
 		{
 			SHOWMSG("couldn't examine it");

-			__set_errno(__translate_io_error_to_errno(IoErr()));
+			__translate_io_error_to_errno(IoErr(),&errno);
 			goto out;
 		}

@@ -234,7 +234,7 @@ opendir(const char * path_name)
 		{
 			SHOWMSG("this isn't a directory");

-			__set_errno(ENOTDIR);
+			errno = ENOTDIR;
 			goto out;
 		}
 	}
@@ -254,12 +254,8 @@ opendir(const char * path_name)
 	{
 		SHOWMSG("ouch. cleaning up");

-		#if defined(UNIX_PATH_SEMANTICS)
-		{
-			while((node = RemHead((struct List *)&dh->dh_VolumeList)) != NULL)
-				free(node);
-		}
-		#endif /* UNIX_PATH_SEMANTICS */
+		while((node = RemHead(&dh->dh_VolumeList)) != NULL)
+			free(node);

 		PROFILE_OFF();
 		UnLock(dh->dh_DirLock);
--- a/library/dirent_readdir.c
+++ b/library/dirent_readdir.c
@@ -1,10 +1,10 @@
 /*
- * $Id: dirent_readdir.c,v 1.7 2005-02-03 16:56:15 obarthel Exp $
+ * $Id: dirent_readdir.c,v 1.2 2004-08-07 09:15:32 obarthel Exp $
 *
 * :ts=4
 *
 * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2004 by Olaf Barthel <olsen@sourcery.han.de>
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -61,7 +61,7 @@ readdir(DIR * directory_pointer)
 	{
 		SHOWMSG("ouch. invalid parameter");

-		__set_errno(EBADF);
+		errno = EBADF;
 		goto out;
 	}

@@ -87,27 +87,25 @@ readdir(DIR * directory_pointer)
 			else
 			{
 				D_S(struct FileInfoBlock,fib);
-				D_S(struct bcpl_name,bcpl_name);
-				UBYTE * name = bcpl_name->name;
+				struct MsgPort * port;
+				UBYTE * bcpl_name;
 				BPTR dir_lock;
+				UBYTE name[8];

-				assert( (((ULONG)name) & 3) == 0 );
+				if(dh->dh_VolumeNode == NULL && NOT IsListEmpty(&dh->dh_VolumeList))
+					dh->dh_VolumeNode = dh->dh_VolumeList.lh_Head;

-				if(dh->dh_VolumeNode == NULL && NOT IsListEmpty((struct List *)&dh->dh_VolumeList))
-					dh->dh_VolumeNode = (struct Node *)dh->dh_VolumeList.mlh_Head;
-
-				strcpy(name,"\1:"); /* BSTR for ":" */
+				bcpl_name = (STRPTR)((((ULONG)&name[0]) + 3UL) & ~3UL);
+				strcpy(bcpl_name,"\1:"); /* BSTR for ":" */

 				while(result == NULL && dh->dh_VolumeNode != NULL && dh->dh_VolumeNode->ln_Succ != NULL)
 				{
 					if(IsFileSystem(dh->dh_VolumeNode->ln_Name))
 					{
-						struct DevProc * dvp;
-
-						dvp = GetDeviceProc(dh->dh_VolumeNode->ln_Name,NULL);
-						if(dvp != NULL)
+						port = DeviceProc(dh->dh_VolumeNode->ln_Name);
+						if(port != NULL)
 						{
-							dir_lock = DoPkt(dvp->dvp_Port,ACTION_LOCATE_OBJECT,ZERO,MKBADDR(name),SHARED_LOCK,	0,0);
+							dir_lock = DoPkt(port,ACTION_LOCATE_OBJECT,ZERO,MKBADDR(bcpl_name),SHARED_LOCK,	0,0);
 							if(dir_lock != ZERO)
 							{
 								if(Examine(dir_lock,fib))
@@ -123,8 +121,6 @@ readdir(DIR * directory_pointer)

 								UnLock(dir_lock);
 							}
-
-							FreeDeviceProc(dvp);
 						}
 					}

@@ -164,7 +160,7 @@ readdir(DIR * directory_pointer)
 					{
 						if(CANNOT Examine(parent_directory,fib))
 						{
-							__set_errno(__translate_io_error_to_errno(IoErr()));
+							__translate_io_error_to_errno(IoErr(),&errno);
 							goto out;
 						}
 					}
@@ -206,7 +202,7 @@ readdir(DIR * directory_pointer)
 				{
 					SHOWMSG("error scanning directory");

-					__set_errno(__translate_io_error_to_errno(IoErr()));
+					__translate_io_error_to_errno(IoErr(),&errno);
 					goto out;
 				}

--- a/Show More
+++ b/Show More