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
896 changed files with 14504 additions and 45433 deletions
--- a/library/GNUmakefile.68k
+++ b/library/GNUmakefile.68k
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.68k,v 1.73 2005-10-20 07:19:15 obarthel Exp $
+# $Id: GNUmakefile.68k,v 1.5 2004-08-14 08:54:25 obarthel Exp $
 #
 # :ts=8
 #
@@ -9,10 +9,10 @@
 CC = gcc
 AR = ar -q
 RANLIB = ranlib
-COPY = copy clone buf=0
+COPY = copy clone
 DELETE = delete all quiet
 MAKEDIR = makedir
-MAKE = $(MAKE_COMMAND) -f GNUmakefile.68k
+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]"
@@ -77,50 +77,40 @@ $(LIBAMIGA_OBJS)/%.o : %.c
 ##############################################################################

 ifeq (small_data_020,$(TYPE))
-CODE_TYPE	:= -m68020-60
-CODE_FLAGS	:= -fbaserel -DSMALL_DATA -DM68020 -DUSE_64_BIT_INTS
+CODE_TYPE := -fbaserel -DSMALL_DATA -m68020-60 -DM68020
 endif

 ifeq (small_data,$(TYPE))
-CODE_TYPE	:= -m68000
-CODE_FLAGS	:= -fbaserel -DSMALL_DATA
+CODE_TYPE := -fbaserel -DSMALL_DATA -m68000
 endif

 ifeq (small_data32,$(TYPE))
-CODE_TYPE	:= -m68020-60
-CODE_FLAGS	:= -fbaserel32 -DSMALL_DATA32 -DM68020 -DUSE_64_BIT_INTS
+CODE_TYPE := -fbaserel32 -DSMALL_DATA32 -m68020-60 -DM68020
 endif

 ifeq (large_data_020,$(TYPE))
-CODE_TYPE	:= -m68020-60
-CODE_FLAGS	:= -DM68020 -DUSE_64_BIT_INTS
+CODE_TYPE := -m68020-60 -DM68020
 endif

 ifeq (large_data,$(TYPE))
-CODE_TYPE	:= -m68000
-CODE_FLAGS	:=
+CODE_TYPE := -m68000
 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 = -fno-builtin -fno-common -DDEBUG
- OPTIONS = -fno-builtin -fno-common -DNDEBUG
-#OPTIONS = -fno-builtin -fno-common -D__MEM_DEBUG
-#OPTIONS = -fno-builtin -fno-common -DDEBUG -D__MEM_DEBUG -DNO_INLINE_STDARG
- OPTIMIZE = -O -fomit-frame-pointer -fstrength-reduce -finline-functions
+ 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
 #OPTIMIZE = -O2 -fomit-frame-pointer
-#DEBUG = -g
+#DEBUG = -g2

-CFLAGS = \
-	$(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) \
-	$(CODE_FLAGS) $(CODE_TYPE) $(INCLUDES)
+CFLAGS = $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(CODE_TYPE) $(INCLUDES)

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

@@ -129,7 +119,6 @@ C_LIB = \
 	ctype_isalnum.o \
 	ctype_isalpha.o \
 	ctype_isascii.o \
-	ctype_isblank.o \
 	ctype_iscntrl.o \
 	ctype_isdigit.o \
 	ctype_isgraph.o \
@@ -139,34 +128,27 @@ C_LIB = \
 	ctype_isspace.o \
 	ctype_isupper.o \
 	ctype_isxdigit.o \
-	ctype_table.o \
 	ctype_tolower.o \
 	ctype_toupper.o \
+	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 \
 	fcntl_fcntl.o \
-	fcntl_get_default_file.o \
-	fcntl_lock.o \
 	fcntl_lseek.o \
 	fcntl_open.o \
 	fcntl_read.o \
 	fcntl_write.o \
-	ftw_ftw.o \
-	ftw_nftw.o \
-	inttypes_imaxdiv.o \
-	inttypes_imaxabs.o \
-	inttypes_strtoimax.o \
-	inttypes_strtoumax.o \
 	libgen_basename.o \
 	libgen_dirname.o \
+	locale_data.o \
 	locale_init_exit.o \
 	locale_localeconv.o \
-	locale_open_locale.o \
 	locale_setlocale.o \
 	mount_convertinfo.o \
 	mount_fstatfs.o \
@@ -184,6 +166,7 @@ C_LIB = \
 	signal_sigsetmask.o \
 	stat_chmod.o \
 	stat_convertfileinfo.o \
+	stat_data.o \
 	stat_fchmod.o \
 	stat_fstat.o \
 	stat_lstat.o \
@@ -193,23 +176,21 @@ C_LIB = \
 	stat_umask.o \
 	stdio_asprintf.o \
 	stdio_clearerr.o \
+	stdio_data.o \
 	stdio_dropiobreadbuffer.o \
 	stdio_duplicate_fd.o \
-	stdio_examine_fh.o \
 	stdio_fclose.o \
 	stdio_fdhookentry.o \
 	stdio_feof.o \
 	stdio_ferror.o \
 	stdio_fflush.o \
+	stdio_flush.o \
 	stdio_fgetc.o \
 	stdio_fgetpos.o \
 	stdio_fgets.o \
 	stdio_filliobreadbuffer.o \
 	stdio_findvacantfdentry.o \
 	stdio_findvacantiobentry.o \
-	stdio_flockfile.o \
-	stdio_flush.o \
-	stdio_flush_all_files.o \
 	stdio_flushiobwritebuffer.o \
 	stdio_fopen.o \
 	stdio_fprintf.o \
@@ -219,42 +200,29 @@ C_LIB = \
 	stdio_freopen.o \
 	stdio_fscanf.o \
 	stdio_fseek.o \
-	stdio_fseeko.o \
 	stdio_fsetpos.o \
 	stdio_ftell.o \
-	stdio_ftello.o \
-	stdio_ftrylockfile.o \
-	stdio_funlockfile.o \
 	stdio_fwrite.o \
 	stdio_getc.o \
-	stdio_getc_unlocked.o \
 	stdio_getchar.o \
-	stdio_getchar_unlocked.o \
-	stdio_gets.o \
 	stdio_get_file_descriptor.o \
+	stdio_gets.o \
 	stdio_growfdtable.o \
 	stdio_growiobtable.o \
-	stdio_grow_file.o \
 	stdio_initializefd.o \
 	stdio_initializeiob.o \
 	stdio_init_exit.o \
-	stdio_file_init.o \
 	stdio_iobhookentry.o \
-	stdio_lock.o \
 	stdio_locksemaphorename.o \
 	stdio_nostdio.o \
 	stdio_openiob.o \
-	stdio_parent_of_fh.o \
 	stdio_perror.o \
 	stdio_popen.o \
 	stdio_printf.o \
 	stdio_putc.o \
-	stdio_putc_unlocked.o \
 	stdio_putchar.o \
-	stdio_putchar_unlocked.o \
 	stdio_puts.o \
 	stdio_remove.o \
-	stdio_remove_fd_alias.o \
 	stdio_rename.o \
 	stdio_rewind.o \
 	stdio_scanf.o \
@@ -268,7 +236,6 @@ C_LIB = \
 	stdio_tmpnam.o \
 	stdio_translateioerror.o \
 	stdio_ungetc.o \
-	stdio_unlockfile.o \
 	stdio_vasprintf.o \
 	stdio_vasprintf_hook_entry.o \
 	stdio_vfprintf.o \
@@ -278,8 +245,6 @@ C_LIB = \
 	stdio_vsnprintf_hook_entry.o \
 	stdio_vsprintf.o \
 	stdio_vsprintf_hook_entry.o \
-	stdio_vsscanf.o \
-	stdio_vscanf.o \
 	stdlib_abort.o \
 	stdlib_abs.o \
 	stdlib_alloca.o \
@@ -287,12 +252,13 @@ C_LIB = \
 	stdlib_atexit.o \
 	stdlib_atoi.o \
 	stdlib_atol.o \
-	stdlib_atoll.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 \
@@ -307,16 +273,11 @@ C_LIB = \
 	stdlib_getdefstacksize.o \
 	stdlib_getenv.o \
 	stdlib_getsp.o \
-	stdlib_get_errno.o \
+	stdlib_init_exit.o \
 	stdlib_isresident.o \
 	stdlib_labs.o \
-	stdlib_llabs.o \
 	stdlib_ldiv.o \
-	stdlib_lldiv.o \
-	stdlib_lib_main.o \
-	stdlib_lib_startup.o \
 	stdlib_machine_test.o \
-	stdlib_main.o \
 	stdlib_malloc.o \
 	stdlib_math.o \
 	stdlib_mkdtemp.o \
@@ -325,24 +286,16 @@ 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_program_name.o \
 	stdlib_putenv.o \
 	stdlib_qsort.o \
 	stdlib_rand.o \
-	stdlib_rand_r.o \
 	stdlib_realloc.o \
 	stdlib_red_black.o \
-	stdlib_semaphore.o \
 	stdlib_setenv.o \
 	stdlib_setjmp.o \
-	stdlib_set_errno.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 \
@@ -350,23 +303,20 @@ C_LIB = \
 	stdlib_stacksafezone.o \
 	stdlib_stacksize.o \
 	stdlib_stack_usage.o \
-	stdlib_arg.o \
-	stdlib_stdio_window_spec.o \
+	stdlib_startup.o \
 	stdlib_strtol.o \
-	stdlib_strtoll.o \
 	stdlib_strtoul.o \
-	stdlib_strtoull.o \
 	stdlib_swapstack.o \
 	stdlib_sysbase.o \
 	stdlib_system.o \
 	stdlib_termination_message.o \
 	stdlib_threshold.o \
-	stdlib_utilitybase.o \
 	stdlib_udivsi3.o \
 	stdlib_udivsi4.o \
 	stdlib_umodsi3.o \
 	stdlib_unsetenv.o \
-	strings_ffs.o \
+	stdlib_usergroup.o \
+	stdlib_wildcard_expand.o \
 	strings_strcasecmp.o \
 	strings_strncasecmp.o \
 	string_bcmp.o \
@@ -387,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 \
@@ -398,42 +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 \
-	uio_readv.o \
-	uio_writev.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 \
@@ -446,26 +381,20 @@ C_LIB = \
 	unistd_realpath.o \
 	unistd_sleep.o \
 	unistd_symlink.o \
-	unistd_sync_fd.o \
-	unistd_timer.o \
-	unistd_time_delay.o \
 	unistd_truncate.o \
 	unistd_unlink.o \
-	unistd_usleep.o \
-	utime_utime.o \
-	utsname_uname.o
+	utime_utime.o

 UNIX_LIB = \
 	unix.lib_rev.o \
 	dirent_closedir.o \
+	dirent_data.o \
 	dirent_rewinddir.o \
 	dirent_opendir.o \
 	dirent_readdir.o \
 	fcntl_creat.o \
 	fcntl_fcntl.o \
 	fcntl_open.o \
-	fcntl_get_default_file.o \
-	getopt_getopt_long.o \
 	mount_convertinfo.o \
 	mount_statfs.o \
 	stat_chmod.o \
@@ -474,41 +403,23 @@ UNIX_LIB = \
 	stat_mkdir.o \
 	stat_rmdir.o \
 	stat_stat.o \
-	stdio_ctermid.o \
 	stdio_fdhookentry.o \
 	stdio_fflush.o \
 	stdio_fopen.o \
+	stdio_fopen.o \
 	stdio_init_exit.o \
-	stdio_file_init.o \
 	stdio_locksemaphorename.o \
 	stdio_openiob.o \
 	stdio_popen.o \
-	stdio_record_locking.o \
 	stdio_remove.o \
 	stdio_rename.o \
-	stdlib_arg.o \
-	stdlib_main.o \
 	stdlib_mkdtemp.o \
 	stdlib_mkstemp.o \
+	stdlib_mkstemp.o \
 	stdlib_mktemp.o \
 	stdlib_system.o \
-	termios_cfgetispeed.o \
-	termios_cfgetospeed.o \
-	termios_cfmakeraw.o \
-	termios_cfsetispeed.o \
-	termios_cfsetospeed.o \
-	termios_console_fdhookentry.o \
-	termios_tcdrain.o \
-	termios_tcflow.o \
-	termios_tcflush.o \
-	termios_tcgetattr.o \
-	termios_tcsendbreak.o \
-	termios_tcsetattr.o \
-	uio_readv.o \
-	uio_writev.o \
 	unistd_access.o \
 	unistd_chdir.o \
-	unistd_chdir_exit.o \
 	unistd_chown.o \
 	unistd_getcwd.o \
 	unistd_lchown.o \
@@ -522,142 +433,43 @@ UNIX_LIB = \
 	unistd_translaterel.o \
 	unistd_translateu2a.o \
 	unistd_truncate.o \
-	unistd_ttyname.o \
-	unistd_ttyname_r.o \
 	unistd_unix_path_semantics.o \
 	unistd_unlink.o \
 	unistd_wildcard_expand.o \
 	utime_utime.o

 MATH_LIB = \
-	complex_carg.o \
-	complex_cargf.o \
-	complex_cargl.o \
-	complex_cimag.o \
-	complex_cimagf.o \
-	complex_cimagl.o \
-	complex_conj.o \
-	complex_conjf.o \
-	complex_conjl.o \
-	complex_creal.o \
-	complex_crealf.o \
-	complex_creall.o \
 	math_acos.o \
-	math_acosf.o \
-	math_acosh.o \
-	math_acoshf.o \
 	math_asin.o \
-	math_asinf.o \
-	math_asinh.o \
-	math_asinhf.o \
 	math_atan.o \
 	math_atan2.o \
-	math_atan2f.o \
-	math_atanf.o \
-	math_atanh.o \
-	math_atanhf.o \
-	math_cbrt.o \
-	math_cbrtf.o \
 	math_ceil.o \
-	math_ceilf.o \
-	math_copysign.o \
-	math_copysignf.o \
 	math_cos.o \
-	math_cosf.o \
 	math_cosh.o \
-	math_coshf.o \
-	math_erf.o \
-	math_erfc.o \
-	math_erfcf.o \
-	math_erff.o \
+	math_data.o \
 	math_exp.o \
-	math_exp2.o \
-	math_exp2f.o \
-	math_expf.o \
-	math_expm1.o \
-	math_expm1f.o \
 	math_fabs.o \
-	math_fabsf.o \
 	math_floor.o \
-	math_floorf.o \
-	math_fma.o \
-	math_fmaf.o \
 	math_fmod.o \
-	math_fmodf.o \
-	math_fpclassify.o \
 	math_frexp.o \
-	math_frexpf.o \
-	math_huge_val.o \
-	math_huge_valf.o \
-	math_hypot.o \
-	math_hypotf.o \
-	math_ilogb.o \
-	math_ilogbf.o \
-	math_inf.o \
-	math_inff.o \
 	math_init_exit.o \
-	math_isfinite.o \
-	math_isunordered.o \
-	math_kernel_cosf.o \
-	math_kernel_sinf.o \
-	math_kernel_tanf.o \
+	math_isinf.o \
+	math_isnan.o \
 	math_ldexp.o \
-	math_ldexpf.o \
-	math_lgamma.o \
-	math_lgammaf.o \
 	math_log.o \
 	math_log10.o \
-	math_log10f.o \
-	math_log1p.o \
-	math_log1pf.o \
-	math_log2.o \
-	math_log2f.o \
 	math_logb.o \
-	math_logbf.o \
-	math_logf.o \
-	math_lrint.o \
-	math_lrintf.o \
-	math_lround.o \
-	math_lroundf.o \
 	math_modf.o \
-	math_modff.o \
-	math_nan.o \
-	math_nanf.o \
-	math_nearbyint.o \
-	math_nearbyintf.o \
-	math_nextafter.o \
-	math_nextafterf.o \
 	math_pow.o \
-	math_powf.o \
-	math_remainder.o \
-	math_remainderf.o \
-	math_remquo.o \
-	math_remquof.o \
-	math_rem_pio2f.o \
 	math_rint.o \
 	math_rintf.o \
-	math_round.o \
-	math_roundf.o \
-	math_scalbn.o \
-	math_scalbnf.o \
-	math_signbit.o \
 	math_sin.o \
-	math_sinf.o \
 	math_sinh.o \
-	math_sinhf.o \
 	math_sqrt.o \
-	math_sqrtf.o \
 	math_tan.o \
-	math_tanf.o \
 	math_tanh.o \
-	math_tanhf.o \
-	math_tgamma.o \
-	math_tgammaf.o \
-	math_trunc.o \
-	math_truncf.o \
 	stdio_asprintf.o \
 	stdio_flush.o \
-	stdio_flush_all_files.o \
 	stdio_fprintf.o \
 	stdio_fscanf.o \
 	stdio_printf.o \
@@ -668,14 +480,13 @@ MATH_LIB = \
 	stdio_vasprintf.o \
 	stdio_vfprintf.o \
 	stdio_vfscanf.o \
-	stdio_vsscanf.o \
-	stdio_vscanf.o \
+	stdio_vfscanf.o \
 	stdio_vprintf.o \
 	stdio_vsnprintf.o \
 	stdio_vsprintf.o \
 	stdlib_atof.o \
+	stdlib_machine_test.o \
 	stdlib_strtod.o \
-	stdlib_strtof.o \
 	time_difftime.o

 MATH_LIB_881 = \
@@ -728,8 +539,8 @@ NET_LIB = \
 	net.lib_rev.o \
 	socket_accept.o \
 	socket_bind.o \
-	socket_check_daemon.o \
 	socket_connect.o \
+	socket_data.o \
 	socket_gethostbyaddr.o \
 	socket_gethostbyname.o \
 	socket_gethostid.o \
@@ -755,7 +566,6 @@ NET_LIB = \
 	socket_ioctl.o \
 	socket_isdaemon.o \
 	socket_listen.o \
-	socket_obtain_daemon.o \
 	socket_recv.o \
 	socket_recvfrom.o \
 	socket_recvmsg.o \
@@ -768,8 +578,6 @@ NET_LIB = \
 	socket_socket.o \
 	socket_hook_entry.o \
 	socket_hstrerror.o \
-	socket_get_h_errno.o \
-	socket_set_h_errno.o \
 	stat_umask.o \
 	usergroup_crypt.o \
 	usergroup_data.o \
@@ -799,8 +607,7 @@ NET_LIB = \
 	usergroup_setregid.o \
 	usergroup_setreuid.o \
 	usergroup_setsid.o \
-	usergroup_setuid.o \
-	utsname_uname.o
+	usergroup_setuid.o

 DEBUG_LIB = \
 	debug.lib_rev.o \
@@ -864,33 +671,22 @@ 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)

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

 # The 881 math library won't build in plain 68k mode
-ifneq (,$(findstring 68020,$(CODE_FLAGS)))
+ifneq (,$(findstring 68020,$(CODE_TYPE)))
 LIBS := $(LIBS_020)
 else
 LIBS := $(LIBS_68K)
@@ -898,7 +694,7 @@ endif

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

-STARTUPS := nrcrt0.o nbcrt0.o nr32crt0.o nb32crt0.o ncrt0.o
+STARTUPS := nrcrt0.o nbcrt0.o nr32crt0.o nb32crt0.o ncrt0.o mainnb.o mainb.o mainb32.o

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

@@ -908,8 +704,11 @@ all: \
 	lib/ncrt0.o \
 	lib/n32bcrt0.o \
 	lib/n32rcrt0.o \
-	lib/libm020/libm.a \
+	lib/mainnb.o \
+	lib/mainb.o \
+	lib/mainb32.o \
 	lib/libm.a \
+	lib/libm020/libm.a \
 	lib/libb/libm.a \
 	lib/libb/libm020/libm.a \
 	lib/libb32/libm020/libm.a
@@ -984,38 +783,47 @@ lib/libm020 : lib

 lib/libb/libm020/libm.a: lib lib/libb/libm020
 	$(MAKE) TYPE=small_data_020 kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_020),small_data_020/$(file)) lib/libb/libm020
+	$(COPY) $(foreach file,$(LIBS_020),small_data_020/$(file)) lib/libb/libm020

 lib/libb/libm.a: lib lib/libb
 	$(MAKE) TYPE=small_data kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_68K),small_data/$(file)) lib/libb
+	$(COPY) $(foreach file,$(LIBS_68K),small_data/$(file)) lib/libb

 lib/libb32/libm020/libm.a: lib lib/libb32 lib/libb32/libm020
 	$(MAKE) TYPE=small_data32 kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_020),small_data32/$(file)) lib/libb32/libm020
+	$(COPY) $(foreach file,$(LIBS_020),small_data32/$(file)) lib/libb32/libm020

 lib/libm020/libm.a: lib lib/libm020
 	$(MAKE) TYPE=large_data_020 kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_020),large_data_020/$(file)) lib/libm020
+	$(COPY) $(foreach file,$(LIBS_020),large_data_020/$(file)) lib/libm020

 lib/libm.a: lib
 	$(MAKE) TYPE=large_data kitchen_sink
-	@$(COPY) $(foreach file,$(LIBS_68K),large_data/$(file)) lib
+	$(COPY) $(foreach file,$(LIBS_68K),large_data/$(file)) lib

 lib/nrcrt0.o : lib nrcrt0.o
-	@$(COPY) nrcrt0.o lib
+	$(COPY) nrcrt0.o lib

 lib/nbcrt0.o : lib nbcrt0.o
-	@$(COPY) nbcrt0.o lib
+	$(COPY) nbcrt0.o lib

 lib/ncrt0.o : lib ncrt0.o
-	@$(COPY) ncrt0.o lib
+	$(COPY) ncrt0.o lib

 lib/n32bcrt0.o : lib nb32crt0.o
-	@$(COPY) nb32crt0.o lib
+	$(COPY) nb32crt0.o lib

 lib/n32rcrt0.o : lib nr32crt0.o
-	@$(COPY) nr32crt0.o lib
+	$(COPY) nr32crt0.o lib
+
+lib/mainnb.o : lib mainnb.o
+	$(COPY) mainnb.o lib
+
+lib/mainb.o : lib mainb.o
+	$(COPY) mainb.o lib
+
+lib/mainb32.o : lib mainb32.o
+	$(COPY) mainb32.o lib

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

@@ -1051,92 +859,21 @@ $(LIBAMIGA_OBJS)/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h

 $(LIBC_OBJS)/stdlib_stacksize.o : stdlib_stacksize.c stdlib_gcc_help.h

-$(LIBC_OBJS)/stdlib_getdefstacksize.o : stdlib_getdefstacksize.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_memory.h
+$(LIBC_OBJS)/stdlib_alloca.o : stdlib_alloca.c stdlib_mem_debug.h

-$(LIBC_OBJS)/stdlib_calloc.o : stdlib_calloc.c stdlib_memory.h
+$(LIBC_OBJS)/stdlib_calloc.o : stdlib_calloc.c stdlib_mem_debug.h

-$(LIBC_OBJS)/stdlib_free.o : stdlib_free.c stdlib_memory.h
+$(LIBC_OBJS)/stdlib_free.o : stdlib_free.c stdlib_mem_debug.h

-$(LIBC_OBJS)/stdlib_malloc.o : stdlib_malloc.c stdlib_memory.h
+$(LIBC_OBJS)/stdlib_init_exit.o : stdlib_init_exit.c stdlib_mem_debug.h

-$(LIBC_OBJS)/stdlib_realloc.o : stdlib_realloc.c stdlib_memory.h
+$(LIBC_OBJS)/stdlib_malloc.o : stdlib_malloc.c stdlib_mem_debug.h

-$(LIBC_OBJS)/stdlib_red_black.o : stdlib_red_black.c stdlib_memory.h
+$(LIBC_OBJS)/stdlib_realloc.o : stdlib_realloc.c stdlib_mem_debug.h

-##############################################################################
-
-# The -fbaserel32 option requires the CPU type to be 68020, too.
-ifneq (,$(findstring fbaserel32,$(CODE_FLAGS)))
-LOCAL_CODE_FLAGS := $(CODE_FLAGS) $(CODE_TYPE)
-else
-LOCAL_CODE_FLAGS := $(CODE_FLAGS)
-endif
-
-$(LIBM881_OBJS)/math_init_exit.o : math_init_exit.c
-	@echo "Compiling $< [$(TYPE):m881]"
-	@$(CC) -o $(LIBM881_OBJS)/math_init_exit.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) -DM68881_FLOATING_POINT_SUPPORT $(INCLUDES) $<
-
-$(LIBC_OBJS)/stdlib_machine_test.o : stdlib_machine_test.c
-	@echo "Compiling $< [$(TYPE):c]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_machine_test.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) $<
-
-$(LIBC_OBJS)/stdlib_showerror.o : stdlib_showerror.c
-	@echo "Compiling $< [$(TYPE):c]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_showerror.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) $<
-
-$(LIBC_OBJS)/stdlib_main.o : stdlib_main.c
-	@echo "Compiling $< [$(TYPE):c]"
-	@$(CC) -o $(LIBC_OBJS)/stdlib_main.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) stdlib_main.c
-
-##############################################################################
-
-$(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)/stdlib_red_black.o : stdlib_red_black.c stdlib_mem_debug.h

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

@@ -1221,49 +958,50 @@ $(LIBAMIGA_OBJS)/libamiga.a : $(LIBAMIGA_OBJS) $(foreach file,$(AMIGA_LIB),$(LIB
 ##############################################################################

 nrcrt0.o : nrcrt0.S
-	@echo "Assembling $< [resident]"
-	@$(CC) -traditional -o $@ -c nrcrt0.S
+	$(CC) -traditional -o $@ -c nrcrt0.S

 nr32crt0.o : nrcrt0.S
-	@echo "Assembling $< [resident32]"
-	@$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c nrcrt0.S
+	$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c nrcrt0.S

 nbcrt0.o : ncrt0.S
-	@echo "Assembling $< [small_data]"
-	@$(CC) -traditional -DSMALL_DATA -o $@ -c ncrt0.S
+	$(CC) -traditional -DSMALL_DATA -o $@ -c ncrt0.S

 nb32crt0.o : ncrt0.S
-	@echo "Assembling $< [small_data32]"
-	@$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c ncrt0.S
+	$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c ncrt0.S

 ncrt0.o : ncrt0.S
-	@echo "Assembling $< [large_data]"
-	@$(CC) -traditional -o $@ -c ncrt0.S
+	$(CC) -traditional -o $@ -c ncrt0.S
+
+mainb32.o : stdlib_main.c
+	$(CC) -o mainb32.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -fbaserel32 -DSMALL_DATA32 -m68020-60 -DM68020 stdlib_main.c
+
+mainb.o : stdlib_main.c
+	$(CC) -o mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -fbaserel -DSMALL_DATA -m68000 stdlib_main.c
+
+mainnb.o : stdlib_main.c
+	$(CC) -o mainnb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -m68000 stdlib_main.c

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

-CONSTRUCTOR_FILES = \
-	amiga_rexxvars.c \
-	dirent_closedir.c \
-	locale_init_exit.c \
-	math_init_exit.c \
-	sas_profile.c \
-	socket_init_exit.c \
-	stdio_file_init.c \
-	stdio_init_exit.c \
-	stdlib_alloca.c \
-	stdlib_arg.c \
-	stdlib_malloc.c \
-	stdlib_program_name.c \
-	stdlib_setenv.c \
-	stdlib_stackcheck.c \
-	stdlib_stackextension.c \
-	time_clock.c \
-	unistd_chdir_exit.c \
-	unistd_init_exit.c \
-	unistd_timer.c \
-	unistd_wildcard_expand.c \
-	usergroup_init_exit.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

-touch_constructor_files:
-	touch $(CONSTRUCTOR_FILES)
+#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
--- a/library/TODO
+++ b/library/TODO
@@ -1,5 +0,0 @@
-C99 math functions:
-
-	fma() and fmaf() should be implemented as a true "fused" multiply
-	and add function rather than the sequential operation implied in the
-	current implementation.
--- 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	197
-#define DATE		"4.11.2005"
-#define VERS		"amiga.lib 1.197"
-#define VSTRING		"amiga.lib 1.197 (4.11.2005)\r\n"
-#define VERSTAG		"\0$VER: amiga.lib 1.197 (4.11.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 @@
-197
+170
--- a/library/amiga_acrypt.c
+++ b/library/amiga_acrypt.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_acrypt.c,v 1.3 2005-05-30 14:01:20 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
@@ -31,14 +31,10 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */

-#define ACrypt __ACrypt
-
 #include <exec/types.h>
 #include <string.h>
 #include <clib/alib_protos.h>

-#undef ACrypt
-
 /****************************************************************************/

 #include "debug.h"
--- a/library/amiga_addtof.c
+++ b/library/amiga_addtof.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_addtof.c,v 1.3 2005-02-25 10:14:20 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
@@ -57,7 +57,7 @@ typedef LONG (* CFUNC)(APTR arg);

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

-STATIC LONG INTERRUPT ASM
+static LONG INTERRUPT ASM
 call_routine(REG(a1,struct Isrvstr *i))
 {
 	CFUNC p = (CFUNC)i->ccode;
--- 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.3 2005-10-27 08:58:41 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
@@ -61,11 +61,11 @@ struct DiskObject * CXLIB_disko;
 STRPTR *
 ArgArrayInit(LONG argc, CONST_STRPTR * argv)
 {
-	STRPTR * result = NULL;
+	unsigned char ** result = NULL;

 	if(argc != 0) /* run from CLI */
 	{
-		LONG i;
+		int i;

 		if(argc == 1)
 			goto out; /* skip command name */
--- 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.4 2005-03-18 12:38:21 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>
@@ -46,21 +48,11 @@

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

-#ifndef _STDLIB_PROFILE_H
-#include "stdlib_profile.h"
-#endif /* _STDLIB_PROFILE_H */
-
-/****************************************************************************/
-
 #include "macros.h"
 #include "debug.h"

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

-#ifndef __PPC__
-
-/****************************************************************************/
-
 /*
 *  Create a task with given name, priority, and stack size.
 *  It will use the default exception and trap handlers for now.
@@ -199,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.6 2005-09-03 14:45:14 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
@@ -44,12 +44,6 @@

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

-#ifndef _STDLIB_PROFILE_H
-#include "stdlib_profile.h"
-#endif /* _STDLIB_PROFILE_H */
-
-/****************************************************************************/
-
 #include "macros.h"
 #include "debug.h"

@@ -64,38 +58,18 @@ DoTimer(struct timeval *tv,LONG unit,LONG command)

 	assert( tv != NULL );

-	#if defined(__amigaos4__)
+	mp = AllocVec(sizeof(*mp),MEMF_ANY|MEMF_PUBLIC|MEMF_CLEAR);
+	if(mp == NULL)
 	{
-		mp = AllocSysObjectTags(ASOT_PORT,
-			ASOPORT_Action,			PA_SIGNAL,
-			ASOPORT_AllocSig,	FALSE,
-			ASOPORT_Signal,			SIGB_SINGLE,
-			ASOPORT_Target,			FindTask(NULL),
-		TAG_DONE);
-
-		if(mp == NULL)
-		{
-			error = IOERR_OPENFAIL;
-			goto out;
-		}
+		error = IOERR_OPENFAIL;
+		goto out;
 	}
-	#else
-	{
-		mp = AllocVec(sizeof(*mp),MEMF_ANY|MEMF_PUBLIC|MEMF_CLEAR);
-		if(mp == NULL)
-		{
-			error = IOERR_OPENFAIL;
-			goto out;
-		}

-		mp->mp_Node.ln_Type	= NT_MSGPORT;
-		mp->mp_Flags		= PA_SIGNAL;
-		mp->mp_SigBit		= SIGB_SINGLE;
-		mp->mp_SigTask		= FindTask(NULL);
-
-		NewList(&mp->mp_MsgList);
-	}
-	#endif /* __amigaos4__ */
+	mp->mp_Node.ln_Type	= NT_MSGPORT;
+	mp->mp_Flags		= PA_SIGNAL;
+	mp->mp_SigBit		= SIGB_SINGLE;
+	mp->mp_SigTask		= FindTask(NULL);
+	NewList(&mp->mp_MsgList);

 	tr = (struct timerequest *)CreateIORequest(mp,sizeof(*tr));
 	if(tr == NULL)
@@ -114,7 +88,7 @@ DoTimer(struct timeval *tv,LONG unit,LONG command)

 	PROFILE_OFF();

-	SetSignal(0,(1UL << mp->mp_SigBit));
+	SetSignal(0,SIGF_SINGLE);

 	error = DoIO((struct IORequest *)tr);

@@ -133,16 +107,7 @@ DoTimer(struct timeval *tv,LONG unit,LONG command)
 		DeleteIORequest((struct IORequest *)tr);
 	}

-	#if defined(__amigaos4__)
-	{
-		if(mp != NULL)
-			FreeSysObject(ASOT_PORT,mp);
-	}
-	#else
-	{
-		FreeVec(mp);
-	}
-	#endif /* __amigaos4__ */
+	FreeVec(mp);

 	return(error);
 }
--- 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.3 2005-02-25 10:14:20 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
@@ -49,7 +49,7 @@

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

-STATIC int
+static int
 do_escape(int cc)
 {
 	int result;
@@ -91,7 +91,7 @@ do_escape(int cc)

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

-STATIC ULONG
+static ULONG
 do_angle(STRPTR * strp, struct InputEvent *ie)
 {
 	ULONG result;
--- 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,203 +0,0 @@
-/*
- * $Id: amiga_rexxvars.c,v 1.6 2005-03-18 12:38: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>
- * 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 */
-
-/****************************************************************************/
-
-#ifndef _STDLIB_CONSTRUCTOR_H
-#include "stdlib_constructor.h"
-#endif /* _STDLIB_CONSTRUCTOR_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__ */
-
-	LEAVE();
-
-	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.4 2005-02-25 10:14:20 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
--- 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/build_archive_amiga
+++ b/library/build_archive_amiga
@@ -1,31 +0,0 @@
-; Simple release archive build script for Amiga systems.
-
-; Set the name of the archive and the directory the
-; files go into
-set dir_name clib2-1.`type c.lib_rev.rev`
-
-; Start with a clean slate
-delete all quiet ram:$dir_name
-
-; Create the directory, copy all the libraries, header files
-; and release note files inside.
-makedir ram:$dir_name
-copy lib ram:${dir_name}/lib all clone quiet
-copy include ram:${dir_name}/include all clone quiet
-copy changes ram:$dir_name clone
-
-; Delete the CVS data from the include directory
-delete ram:${dir_name}/include/CVS ram:${dir_name}/include/sys/CVS ram:${dir_name}/include/arpa/CVS ram:${dir_name}/include/netinet/CVS all quiet
-
-; Finally, create an lha archive in RAM:
-pushcd ram:
-lha -r -x -a a ${dir_name}-gcc-68k.lha ${dir_name}
-popcd
-
-; Move the archive back to this directory
-copy ram:${dir_name}-gcc-68k.lha "" clone
-
-; Clean up...
-delete ram:$dir_name all quiet
-unset dir_name
-
--- a/library/build_archive_unix.sh
+++ b/library/build_archive_unix.sh
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-# Simple release archive build script for Unix systems.
-# I typically build the library with a cross compiler.
-
-# Set the name of the archive and the directory the
-# files go into
-export dir_name=clib2-1.`cat c.lib_rev.rev`
-
-# Start with a clean slate
-rm -rf $dir_name
-
-# Create the directory, copy all the libraries, header files
-# and release note files inside.
-mkdir $dir_name
-cp -a lib $dir_name
-cp -a lib.threadsafe $dir_name
-cp -a include $dir_name
-cp changes $dir_name
-
-# Delete the CVS data from the include directory
-rm -rf ${dir_name}/include/CVS ${dir_name}/include/sys/CVS ${dir_name}/include/arpa/CVS ${dir_name}/include/netinet/CVS
-
-# Finally, create an lha type 5 archive; the Amiga LhA port
-# can unpack it.
-lha ao5q ${dir_name}-gcc-os4.lha ${dir_name}
-
--- 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	197
-#define DATE		"4.11.2005"
-#define VERS		"c.lib 1.197"
-#define VSTRING		"c.lib 1.197 (4.11.2005)\r\n"
-#define VERSTAG		"\0$VER: c.lib 1.197 (4.11.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 @@
-197
+170
--- a/library/changes
+++ b/library/changes
--- a/library/complex_cargf.c
+++ b/library/complex_cargf.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_cargf.c,v 1.1 2005-04-03 10:22:47 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.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-float
-cargf(float complex z)
-{
-	return(atan2(IMAG(z),REAL(z))); /* ZZZ this really needs to call ata2f(). */
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_cargl.c
+++ b/library/complex_cargl.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_cargl.c,v 1.1 2005-04-03 10:22:47 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.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-long double
-cargl(long double complex z)
-{
-	return(atan2(IMAG(z),REAL(z))); /* ZZZ this really needs to call atan2l(). */
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_cimag.c
+++ b/library/complex_cimag.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_cimag.c,v 1.1 2005-04-03 10:22:47 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.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-double
-cimag(double complex z)
-{
-	return(IMAG(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_cimagf.c
+++ b/library/complex_cimagf.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_cimagf.c,v 1.1 2005-04-03 10:22:47 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.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-float
-cimagf(float complex z)
-{
-	return(IMAG(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_cimagl.c
+++ b/library/complex_cimagl.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_cimagl.c,v 1.1 2005-04-03 10:22:47 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.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-long double
-cimagl(long double complex z)
-{
-	return(IMAG(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_conj.c
+++ b/library/complex_conj.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_conj.c,v 1.1 2005-04-03 10:22:47 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.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-double complex
-conj(double complex z)
-{
-	return(CONJ(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_conjf.c
+++ b/library/complex_conjf.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_conjf.c,v 1.1 2005-04-03 10:22:47 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.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-float complex
-conjf(float complex z)
-{
-	return(CONJ(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_conjl.c
+++ b/library/complex_conjl.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_conjl.c,v 1.1 2005-04-03 10:22:47 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.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-long double complex
-conjl(long double complex z)
-{
-	return(CONJ(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_creal.c
+++ b/library/complex_creal.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_creal.c,v 1.1 2005-04-03 10:22:47 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.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-double
-creal(double complex z)
-{
-	return(REAL(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_crealf.c
+++ b/library/complex_crealf.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_crealf.c,v 1.1 2005-04-03 10:22:47 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.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-float
-crealf(float complex z)
-{
-	return(REAL(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_creall.c
+++ b/library/complex_creall.c
@@ -1,52 +0,0 @@
-/*
- * $Id: complex_creall.c,v 1.1 2005-04-03 10:22:47 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.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#include "complex_headers.h"
-#endif /* _COMPLEX_HEADERS_H */
-
-/****************************************************************************/
-
-#if defined(COMPLEX_SUPPORT)
-
-/****************************************************************************/
-
-long double
-creall(long double complex z)
-{
-	return(REAL(z));
-}
-
-/****************************************************************************/
-
-#endif /* COMPLEX_SUPPORT */
--- a/library/complex_headers.h
+++ b/library/complex_headers.h
@@ -1,68 +0,0 @@
-/*
- * $Id: complex_headers.h,v 1.3 2005-05-12 14:50:06 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.
- */
-
-#ifndef _COMPLEX_HEADERS_H
-#define _COMPLEX_HEADERS_H
-
-/****************************************************************************/
-
-#ifndef _MATH_FP_SUPPORT_H
-#include "math_fp_support.h"
-#endif /* _MATH_FP_SUPPORT_H */
-
-/****************************************************************************/
-
-#if defined(FLOATING_POINT_SUPPORT) && defined(__GNUC__) && defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
-
-/****************************************************************************/
-
-#include <complex.h>
-#include <math.h>
-
-/****************************************************************************/
-
-#define COMPLEX_SUPPORT
-
-/****************************************************************************/
-
-#define	REAL(z)	(__real__ (z))
-#define	IMAG(z)	(__imag__ (z))
-#define	CONJ(z)	(~(z))
-
-/****************************************************************************/
-
-#endif /* FLOATING_POINT_SUPPORT && __GNUC__ && __STDC_VERSION__ */
-
-/****************************************************************************/
-
-#endif /* _COMPLEX_HEADERS_H */
--- a/library/crt0.S
+++ b/library/crt0.S
@@ -1,12 +1,11 @@
 //
-//	$Id: crt0.S,v 1.6 2005-10-11 09:28:29 obarthel Exp $
+//	$Id: crt0.S,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
 //
 //	:ts=4
 //

 	.text

-	.globl  main	/* This enforces linkage against the main() function */
 	.globl  _main
 	.globl  _start

@@ -19,10 +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
+
--- a/library/crtbegin.c
+++ b/library/crtbegin.c
@@ -1,18 +1,21 @@
 /* 
- * $Id: crtbegin.c,v 1.10 2005-03-18 12:38:22 obarthel Exp $
+ * $Id: crtbegin.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
 *
 * :ts=4
 *
- * Handles global constructors and destructors for the OS4 GCC build.
+ * Handles global constructors and destructors.
 */

-#if defined(__amigaos4__)
+#include <exec/types.h>

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

-#ifndef EXEC_TYPES_H
-#include <exec/types.h>
-#endif /* EXEC_TYPES_H */
+#include <stdlib.h>
+#include <setjmp.h>
+
+/****************************************************************************/
+
+#if defined(__amigaos4__)

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

@@ -22,22 +25,108 @@
 * with a NULL pointer entry and is put at the end of the sections. This way, the init
 * code can find the global constructor/destructor pointers
 */
-static void (*__CTOR_LIST__[1]) (void) __attribute__(( used, section(".ctors"), aligned(sizeof(void (*)(void))) ));
-static void (*__DTOR_LIST__[1]) (void) __attribute__(( used, section(".dtors"), aligned(sizeof(void (*)(void))) ));
+static void (*__CTOR_LIST__[1]) (void) __attribute__((section(".ctors"))) = { (void *)-1 };
+static void (*__DTOR_LIST__[1]) (void) __attribute__((section(".dtors"))) = { (void *)-1 };
+
+/****************************************************************************/
+
+static void
+_do_ctors(void)
+{
+	void (**pFuncPtr)(void);
+
+	/* Skip the first entry in the list (it's -1 anyway) */
+	pFuncPtr = __CTOR_LIST__ + 1;
+
+	/* Call all constructors in forward order */
+	while (*pFuncPtr != NULL)
+		(**pFuncPtr++)();
+}
+
+/****************************************************************************/
+
+static void
+_do_dtors(void)
+{
+	ULONG i = (ULONG)__DTOR_LIST__[0];
+	void (**pFuncPtr)(void);
+
+	if (i == ~0UL)
+	{
+		/* Find the end of the destructors list */
+		i = 1;
+
+		while (__DTOR_LIST__[i] != NULL)
+			i++;
+
+		/* We're at the NULL entry now. Go back by one */
+		i--;
+	}
+
+	/* Call all destructors in reverse order */
+	pFuncPtr = __DTOR_LIST__ + i;
+	while (i-- > 0)
+		(**pFuncPtr--)();
+}
+
+/****************************************************************************/
+
+#else
+
+/****************************************************************************/
+
+typedef void (*func_ptr)(void);
+
+/****************************************************************************/
+
+static void
+_do_ctors(void)
+{
+	extern func_ptr __CTOR_LIST__[];
+	ULONG nptrs = (ULONG)__CTOR_LIST__[0];
+	ULONG i;
+
+	for(i = nptrs ; i > 0 ; i--)
+		__CTOR_LIST__[i]();
+}
+
+/****************************************************************************/
+
+static void
+_do_dtors(void)
+{
+	extern func_ptr __DTOR_LIST__[];
+	extern jmp_buf __exit_jmp_buf;
+	ULONG nptrs = (ULONG)__DTOR_LIST__[0];
+	static ULONG i;
+
+	/* If one of the destructors drops into
+	 * exit(), processing will continue with
+	 * the next following destructor.
+	 */
+	(void)setjmp(__exit_jmp_buf);
+
+	while(i++ < nptrs)
+		__DTOR_LIST__[i]();
+}
+
+/****************************************************************************/
+
+#endif /*__amigaos4__ */
+
+/****************************************************************************/
+
+/* FIXME: Do we need to put these in .init/.fini sections? */
+
+//void _init(void) __attribute__((section(".init")));
+//void _fini(void) __attribute__((section(".fini")));

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

 void
 _init(void)
 {
-	int num_ctors,i;
-	int j;
-
-	for(i = 1, num_ctors = 0 ; __CTOR_LIST__[i] != NULL ; i++)
-		num_ctors++;
-
-	for(j = 0 ; j < num_ctors ; j++)
-		__CTOR_LIST__[num_ctors - j]();
+	_do_ctors();
 }

 /****************************************************************************/
@@ -45,16 +134,5 @@ _init(void)
 void
 _fini(void)
 {
-	int num_dtors,i;
-	static int j;
-
-	for(i = 1, num_dtors = 0 ; __DTOR_LIST__[i] != NULL ; i++)
-		num_dtors++;
-
-	while(j++ < num_dtors)
-		__DTOR_LIST__[j]();
+	_do_dtors();
 }
-
-/****************************************************************************/
-
-#endif /*__amigaos4__ */
--- a/library/crtend.c
+++ b/library/crtend.c
@@ -1,5 +1,5 @@
 /* 
- * $Id: crtend.c,v 1.2 2005-03-09 21:07:25 obarthel Exp $
+ * $Id: crtend.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
 *
 * :ts=4
 *
@@ -10,10 +10,9 @@

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

-static void (*__CTOR_LIST__[1]) (void) __attribute__((used, section(".ctors"), aligned(sizeof(void (*)(void))) ));
-static void (*__DTOR_LIST__[1]) (void) __attribute__((used, section(".dtors"), aligned(sizeof(void (*)(void))) ));
+static volatile void (*__CTOR_LIST__[1]) (void) __attribute__((used,section(".ctors"))) = { (void *)0 };
+static volatile void (*__DTOR_LIST__[1]) (void) __attribute__((used,section(".dtors"))) = { (void *)0 };

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

 #endif /*__amigaos4__ */
-
--- a/library/ctype_headers.h
+++ b/library/ctype_headers.h
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_headers.h,v 1.5 2005-05-29 09:56:09 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
@@ -42,25 +42,18 @@

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

-#ifndef _STDLIB_LOCALEBASE_H
-#include "stdlib_localebase.h"
-#endif /* _STDLIB_LOCALEBASE_H */
-
-#ifndef _STDLIB_UTILITYBASE_H
-#include "stdlib_utilitybase.h"
-#endif /* _STDLIB_UTILITYBASE_H */
+#ifndef _STDLIB_LOCALE_UTILITY_H
+#include "stdlib_locale_utility.h"
+#endif /* _STDLIB_LOCALE_UTILITY_H */

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

-#ifndef _MACROS_H
 #include "macros.h"
-#endif /* _MACROS_H */

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

 #include <locale.h>
 #include <assert.h>
-#include <limits.h>
 #include <ctype.h>

 /****************************************************************************/
--- a/library/ctype_isalnum.c
+++ b/library/ctype_isalnum.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isalnum.c,v 1.4 2005-05-29 09:56:09 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
@@ -49,26 +49,16 @@ isalnum(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsAlNum(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsAlNum(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = isalpha(c) || isdigit(c);
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isalpha.c
+++ b/library/ctype_isalpha.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isalpha.c,v 1.4 2005-05-29 09:56:09 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
@@ -47,19 +47,11 @@ isalpha(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsAlpha(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsAlpha(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
@@ -67,7 +59,5 @@ isalpha(int c)
 		          ('A' <= c && c <= 'Z'));
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- 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.4 2005-05-29 09:56:09 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
@@ -47,26 +47,16 @@ iscntrl(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsCntrl(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsCntrl(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = (('\0' <= c && c < ' ') || (c == 127));
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isdigit.c
+++ b/library/ctype_isdigit.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isdigit.c,v 1.4 2005-05-29 09:56:09 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
@@ -47,26 +47,16 @@ isdigit(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsDigit(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsDigit(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = ('0' <= c && c <= '9');
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isgraph.c
+++ b/library/ctype_isgraph.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isgraph.c,v 1.4 2005-05-29 09:56:09 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
@@ -47,26 +47,16 @@ isgraph(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsGraph(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsGraph(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = (' ' < c && c < 127);
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_islower.c
+++ b/library/ctype_islower.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_islower.c,v 1.4 2005-05-29 09:56:09 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
@@ -47,26 +47,16 @@ islower(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsLower(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsLower(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = ('a' <= c && c <= 'z');
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isprint.c
+++ b/library/ctype_isprint.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isprint.c,v 1.4 2005-05-29 09:56:09 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
@@ -47,26 +47,16 @@ isprint(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsPrint(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsPrint(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = (' ' <= c && c <= '~');
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_ispunct.c
+++ b/library/ctype_ispunct.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_ispunct.c,v 1.4 2005-05-29 09:56:09 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
@@ -47,19 +47,11 @@ ispunct(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsPunct(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsPunct(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
@@ -69,7 +61,5 @@ ispunct(int c)
 		          ('{' <= c && c <= '~'));
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isspace.c
+++ b/library/ctype_isspace.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isspace.c,v 1.4 2005-05-29 09:56:09 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
@@ -47,19 +47,11 @@ isspace(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsSpace(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsSpace(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
@@ -71,7 +63,5 @@ isspace(int c)
 		          c == ' ');
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isupper.c
+++ b/library/ctype_isupper.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isupper.c,v 1.4 2005-05-29 09:56:09 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
@@ -47,26 +47,16 @@ isupper(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsUpper(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsUpper(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = ('A' <= c && c <= 'Z');
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_isxdigit.c
+++ b/library/ctype_isxdigit.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isxdigit.c,v 1.4 2005-05-29 09:56:09 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
@@ -47,19 +47,11 @@ isxdigit(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = IsXDigit(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = FALSE;
+		result = IsXDigit(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
@@ -68,7 +60,5 @@ isxdigit(int c)
 		          ('A' <= c && c <= 'F'));
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- 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.4 2005-05-29 09:56:09 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
@@ -43,26 +43,16 @@ tolower(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = ConvToLower(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = c;
+		result = ConvToLower(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = ('A' <= c && c <= 'Z') ? (c + ('a' - 'A')) : c;
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/ctype_toupper.c
+++ b/library/ctype_toupper.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_toupper.c,v 1.4 2005-05-29 09:56:09 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
@@ -43,26 +43,16 @@ toupper(int c)
 	DECLARE_LOCALEBASE();
 	int result;

-	__locale_lock();
-
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );

-		/* The parameter must be either EOF or in the range of an
-		   'unsigned char'. If it's not, then the behaviour is
-		   undefined. */
-		if(c != EOF && ((0 <= c && c <= UCHAR_MAX) || ((c + 256) <= UCHAR_MAX)))
-			result = ConvToUpper(__locale_table[LC_CTYPE],(ULONG)(c & 255));
-		else
-			result = c;
+		result = ConvToUpper(__locale_table[LC_CTYPE],(ULONG)c);
 	}
 	else
 	{
 		result = ('a' <= c && c <= 'z') ? (c - ('a' - 'A')) : c;
 	}

-	__locale_unlock();
-
 	return(result);
 }
--- a/library/debug.c
+++ b/library/debug.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug.c,v 1.3 2005-02-25 10:14:21 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
@@ -133,7 +133,7 @@ _POPDEBUGLEVEL(void)

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

-STATIC VOID
+static void
 _INDENT(void)
 {
 	if(program_name_len > 0)
--- 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	197
-#define DATE		"4.11.2005"
-#define VERS		"debug.lib 1.197"
-#define VSTRING		"debug.lib 1.197 (4.11.2005)\r\n"
-#define VERSTAG		"\0$VER: debug.lib 1.197 (4.11.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 @@
-197
+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.3 2005-03-18 12:38:22 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
@@ -36,15 +36,14 @@

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

-#ifndef EXEC_LIBRARIES_H
 #include <exec/libraries.h>
-#endif /* EXEC_LIBRARIES_H */

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

 #if defined(__SASC)

 #include <clib/exec_protos.h>
+/*#include <pragmas/exec_sysbase_pragmas.h>*/
 #include <pragmas/exec_pragmas.h>

 LONG RawMayGetChar(VOID);
@@ -58,11 +57,7 @@ VOID RawPutChar(UBYTE c);
 /****************************************************************************/

 #if defined(__amigaos4__)
-
-#ifndef EXEC_EMULATION_H
 #include <exec/emulation.h>
-#endif /* EXEC_EMULATION_H */
-
 #endif /* __amigaos4__ */

 /****************************************************************************/
@@ -111,13 +106,11 @@ VOID RawPutChar(UBYTE c);

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

-#ifndef _MACROS_H
-#include "macros.h"
-#endif /* _MACROS_H */
-
-#ifndef _DEBUG_H
 #include "debug.h"
-#endif /* _DEBUG_H */
+
+/****************************************************************************/
+
+#include "macros.h"

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

--- 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/Show More
+++ b/Show More