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

git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/tags/V1_166@14691 87f5fb63-7c3d-0410-a384-fd976d0f7a62
2025-12-08 14:59:05 +00:00 · 2004-07-28 15:50:46 +00:00
951 changed files with 16497 additions and 53816 deletions
--- a/library/GNUmakefile.68k
+++ b/library/GNUmakefile.68k
--- a/library/GNUmakefile.os4
+++ b/library/GNUmakefile.os4
@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.os4,v 1.109 2006-09-17 17:37:27 obarthel Exp $
+# $Id: GNUmakefile.os4,v 1.2 2004-07-28 15:50:44 obarthel Exp $
 #
 # :ts=8
 #
@@ -7,161 +7,878 @@

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

-.PHONY : all all-targets clean version cvs-tag
+# You may have to tweak this for the native OS4 compiler
+SDK_INCLUDE = $(V)/include
+NET_INCLUDE = netinclude

-# You may have to change the following sets of macro definitions which will
-# be used throughout the build makefile. These definitions cover the paths
-# to look into for the operating system and networking header files, and
-# the names and parameters passed to the program which actually do the
-# compilation, library building and cleanup work.
-#
-# Note that for either set you still need the GNU make utility to build the
-# library!
+# These are for the cross compiler
+CC = ppc-amigaos-gcc
+AR = ppc-amigaos-ar -q
+RANLIB = ppc-amigaos-ranlib
+COPY = cp
+DELETE = rm -r
+MAKEDIR = mkdir

-# These are for the cross compiler, with the operating system header files
-# stored in "/V/include" and the network header files in a local directory
-# called "netinclude".
-SDK_INCLUDE := /V/include
-NET_INCLUDE := netinclude
-CC := ppc-amigaos-gcc
-AR := ppc-amigaos-ar -q
-RANLIB := ppc-amigaos-ranlib
-COPY := cp -a
-DELETE := rm -rf
-MAKEDIR := mkdir -p
-LOG_COMMAND := 2>&1 | tee -a compiler.log
+# The following are for the native OS4 compiler
+# CC = gcc
+# AR = ar -q
+# RANLIB = ranlib
+# COPY = copy
+# DELETE = delete all quiet
+# MAKEDIR = makedir

-# The following are for the native OS4 compiler; note that the
-# LOG_COMMAND should not be enabled unless you have a shell
-# installed which supports it.
-#SDK_INCLUDE := /SDK/Include/include_h
-#NET_INCLUDE := /SDK/Include/netinclude
-#CC := distcc gcc
-#AR := ar -q
-#RANLIB := ranlib
-#COPY := copy
-#DELETE := delete all quiet force
-#MAKEDIR := makedir all force
-#LOG_COMMAND := *>< | tee >>compiler.log
+MAKE = make -f GNUmakefile.os4

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

-WARNINGS := \
-	-Wall -W -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
-	-Wundef -Wbad-function-cast -Wmissing-declarations -Wunused -Wwrite-strings
-
-#	-Wconversion -Wshadow
-
-INCLUDES   := -Iinclude -I. -I$(SDK_INCLUDE)
- OPTIONS   := -DUSE_64_BIT_INTS -D__USE_INLINE__ -Wa,-mregnames -fno-common -std=gnu99
-OPTIMIZE   := -DNDEBUG -O3
-
-#DEBUG     := -ggdb
-#MEMDEBUG  := -D__USE_MEM_TREES -D__MEM_DEBUG
-
-CFLAGS     := $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(MEMDEBUG) $(OPTIONS) $(INCLUDES)
-AFLAGS     := -Wa,-mregnames
-
-LARGEDATA  := -msdata=data
-SOFTFLOAT  := -msdata=data -msoft-float
-SMALLDATA  := -msdata=sysv -DSMALL_DATA
-BASEREL    := -mbaserel -DBASEREL_DATA
-THREADSAFE := -D__THREAD_SAFE
+ifeq (,$(TYPE))
+LIBC_OBJS	= libc_objs
+LIBUNIX_OBJS	= libunix_objs
+LIBM_OBJS	= libm_objs
+LIBSTACK_OBJS	= libstack_objs
+LIBNET_OBJS	= libnet_objs
+LIBDEBUG_OBJS	= libdebug_objs
+LIBAMIGA_OBJS	= libamiga_objs
+else
+LIBC_OBJS	= $(TYPE)/libc_objs
+LIBUNIX_OBJS	= $(TYPE)/libunix_objs
+LIBM_OBJS	= $(TYPE)/libm_objs
+LIBSTACK_OBJS	= $(TYPE)/libstack_objs
+LIBNET_OBJS	= $(TYPE)/libnet_objs
+LIBDEBUG_OBJS	= $(TYPE)/libdebug_objs
+LIBAMIGA_OBJS	= $(TYPE)/libamiga_objs
+endif

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

-# This is the first target: it depends on all the targets
+%.o : %.c
+	@echo "Compiling $<"
+	@$(CC) -c $(CFLAGS) -DPPC_FLOATING_POINT_SUPPORT $<

-all: all-targets
+$(LIBC_OBJS)/%.o : %.c
+	@echo "Compiling $< [$(TYPE):c]"
+	@$(CC) -o $(LIBC_OBJS)/$*.o -c $(CFLAGS) $<
+
+$(LIBUNIX_OBJS)/%.o : %.c
+	@echo "Compiling $< [$(TYPE):unix]"
+	@$(CC) -o $(LIBUNIX_OBJS)/$*.o -c $(CFLAGS) -DUNIX_PATH_SEMANTICS $<
+
+$(LIBM_OBJS)/%.o : %.c
+	@echo "Compiling $< [$(TYPE):m]"
+	@$(CC) -o $(LIBM_OBJS)/$*.o -c $(CFLAGS) -DPPC_FLOATING_POINT_SUPPORT $<
+
+$(LIBSTACK_OBJS)/%.o : %.c
+	@echo "Compiling $< [$(TYPE):stack]"
+	@$(CC) -o $(LIBSTACK_OBJS)/$*.o -c $(CFLAGS) $<
+
+$(LIBNET_OBJS)/%.o : %.c
+	@echo "Compiling $< [$(TYPE):net]"
+	@$(CC) -o $(LIBNET_OBJS)/$*.o -c $(CFLAGS) -I$(NET_INCLUDE) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT $<
+
+$(LIBDEBUG_OBJS)/%.o : %.c
+	@echo "Compiling $< [$(TYPE):debug]"
+	@$(CC) -o $(LIBDEBUG_OBJS)/$*.o -c $(CFLAGS) $<
+
+$(LIBAMIGA_OBJS)/%.o : %.c
+	@echo "Compiling $< [$(TYPE):amiga]"
+	@$(CC) -o $(LIBAMIGA_OBJS)/$*.o -c $(CFLAGS) $<

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

-# The LIBS variable is updated by each of the included library makefiles.
+ifeq (small_data,$(TYPE))
+CODE_TYPE := -msdata=sysv -DSMALL_DATA
+endif

-LIBS :=
+ifeq (large_data,$(TYPE))
+CODE_TYPE := -msdata=data
+endif

-include libc.gmk
-include libunix.gmk
-include libm.gmk
-include libnet.gmk
-include libdebug.gmk
-include libamiga.gmk
-include libprofile.gmk
+##############################################################################

-all-targets: \
+WARNINGS = \
+	-Wall -W -Wshadow -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
+	-Wundef -Wbad-function-cast -Wmissing-declarations -Wconversion
+
+INCLUDES = -Iinclude -I. -I$(SDK_INCLUDE)
+OPTIONS = -DNDEBUG -DUSE_64_BIT_INTS -fno-builtin -D__USE_INLINE__ -Wa,-mregnames
+OPTIMIZE = -O3 -fomit-frame-pointer -funroll-loops
+#DEBUG = -g
+
+CFLAGS = $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(CODE_TYPE) $(INCLUDES)
+
+##############################################################################
+
+C_LIB = \
+	c.lib_rev.o \
+	ctype_isalnum.o \
+	ctype_isalpha.o \
+	ctype_isascii.o \
+	ctype_iscntrl.o \
+	ctype_isdigit.o \
+	ctype_isgraph.o \
+	ctype_islower.o \
+	ctype_isprint.o \
+	ctype_ispunct.o \
+	ctype_isspace.o \
+	ctype_isupper.o \
+	ctype_isxdigit.o \
+	ctype_tolower.o \
+	ctype_toupper.o \
+	ctype_table.o \
+	dirent_closedir.o \
+	dirent_data.o \
+	dirent_opendir.o \
+	dirent_readdir.o \
+	dirent_rewinddir.o \
+	errno_data.o \
+	fcntl_close.o \
+	fcntl_creat.o \
+	fcntl_fcntl.o \
+	fcntl_lseek.o \
+	fcntl_open.o \
+	fcntl_read.o \
+	fcntl_write.o \
+	libgen_basename.o \
+	libgen_dirname.o \
+	locale_data.o \
+	locale_init_exit.o \
+	locale_localeconv.o \
+	locale_setlocale.o \
+	mount_convertinfo.o \
+	mount_fstatfs.o \
+	mount_statfs.o \
+	signal_checkabort.o \
+	signal_data.o \
+	signal_kill.o \
+	signal_raise.o \
+	signal_sigaddset.o \
+	signal_sigblock.o \
+	signal_sigemptyset.o \
+	signal_sigmask.o \
+	signal_signal.o \
+	signal_sigprocmask.o \
+	signal_sigsetmask.o \
+	stat_chmod.o \
+	stat_convertfileinfo.o \
+	stat_data.o \
+	stat_fchmod.o \
+	stat_fstat.o \
+	stat_lstat.o \
+	stat_mkdir.o \
+	stat_rmdir.o \
+	stat_stat.o \
+	stat_umask.o \
+	stdio_asprintf.o \
+	stdio_clearerr.o \
+	stdio_data.o \
+	stdio_dropiobreadbuffer.o \
+	stdio_duplicate_fd.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_flushiobwritebuffer.o \
+	stdio_fopen.o \
+	stdio_fprintf.o \
+	stdio_fputc.o \
+	stdio_fputs.o \
+	stdio_fread.o \
+	stdio_freopen.o \
+	stdio_fscanf.o \
+	stdio_fseek.o \
+	stdio_fsetpos.o \
+	stdio_ftell.o \
+	stdio_fwrite.o \
+	stdio_getc.o \
+	stdio_getchar.o \
+	stdio_get_file_descriptor.o \
+	stdio_gets.o \
+	stdio_growfdtable.o \
+	stdio_growiobtable.o \
+	stdio_initializefd.o \
+	stdio_initializeiob.o \
+	stdio_init_exit.o \
+	stdio_iobhookentry.o \
+	stdio_locksemaphorename.o \
+	stdio_nostdio.o \
+	stdio_openiob.o \
+	stdio_perror.o \
+	stdio_popen.o \
+	stdio_printf.o \
+	stdio_putc.o \
+	stdio_putchar.o \
+	stdio_puts.o \
+	stdio_remove.o \
+	stdio_rename.o \
+	stdio_rewind.o \
+	stdio_scanf.o \
+	stdio_setbuf.o \
+	stdio_setvbuf.o \
+	stdio_snprintf.o \
+	stdio_sprintf.o \
+	stdio_sscanf.o \
+	stdio_sscanf_hook_entry.o \
+	stdio_tmpfile.o \
+	stdio_tmpnam.o \
+	stdio_translateioerror.o \
+	stdio_ungetc.o \
+	stdio_vasprintf.o \
+	stdio_vasprintf_hook_entry.o \
+	stdio_vfprintf.o \
+	stdio_vfscanf.o \
+	stdio_vprintf.o \
+	stdio_vsnprintf.o \
+	stdio_vsnprintf_hook_entry.o \
+	stdio_vsprintf.o \
+	stdio_vsprintf_hook_entry.o \
+	stdlib_abort.o \
+	stdlib_abs.o \
+	stdlib_alloca.o \
+	stdlib_assertion_failure.o \
+	stdlib_atexit.o \
+	stdlib_atoi.o \
+	stdlib_atol.o \
+	stdlib_bsearch.o \
+	stdlib_calloc.o \
+	stdlib_data.o \
+	stdlib_default_pool_size.o \
+	stdlib_default_puddle_size.o \
+	stdlib_destructor.o \
+	stdlib_disablerequesters.o \
+	stdlib_div.o \
+	stdlib_modsi3.o \
+	stdlib_divsi3.o \
+	stdlib_divsi4.o \
+	stdlib_umodsi3.o \
+	stdlib_udivsi3.o \
+	stdlib_udivsi4.o \
+	stdlib_exit.o \
+	stdlib_free.o \
+	stdlib_getenv.o \
+	stdlib_getsp.o \
+	stdlib_init_exit.o \
+	stdlib_labs.o \
+	stdlib_ldiv.o \
+	stdlib_getdefstacksize.o \
+	stdlib_stackargbytes.o \
+	stdlib_stack_usage.o \
+	stdlib_checkdetach.o \
+	stdlib_detach.o \
+	stdlib_isresident.o \
+	stdlib_sysbase.o \
+	stdlib_dosbase.o \
+	stdlib_machine_test.o \
+	stdlib_malloc.o \
+	stdlib_math.o \
+	stdlib_mkdtemp.o \
+	stdlib_mkstemp.o \
+	stdlib_mktemp.o \
+	stdlib_mulsi3.o \
+	stdlib_never_free.o \
+	stdlib_putenv.o \
+	stdlib_qsort.o \
+	stdlib_rand.o \
+	stdlib_realloc.o \
+	stdlib_red_black.o \
+	stdlib_setenv.o \
+	stdlib_setjmp.o \
+	stdlib_shell_escape.o \
+	stdlib_showerror.o \
+	stdlib_socket.o \
+	stdlib_srand.o \
+	stdlib_stackcheck.o \
+	stdlib_stackoverflow.o \
+	stdlib_stacksafezone.o \
+	stdlib_stacksize.o \
+	stdlib_startup.o \
+	stdlib_strtol.o \
+	stdlib_strtoul.o \
+	stdlib_swapstack.o \
+	stdlib_system.o \
+	stdlib_termination_message.o \
+	stdlib_threshold.o \
+	stdlib_unsetenv.o \
+	stdlib_usergroup.o \
+	stdlib_wildcard_expand.o \
+	strings_strcasecmp.o \
+	strings_strncasecmp.o \
+	string_bcmp.o \
+	string_bcopy.o \
+	string_bzero.o \
+	string_index.o \
+	string_memchr.o \
+	string_memcmp.o \
+	string_memcpy.o \
+	string_memmove.o \
+	string_memset.o \
+	string_rindex.o \
+	string_strcat.o \
+	string_strchr.o \
+	string_strcmp.o \
+	string_strcoll.o \
+	string_strcpy.o \
+	string_strcspn.o \
+	string_strdup.o \
+	string_strerror.o \
+	string_strlen.o \
+	string_strncat.o \
+	string_strncmp.o \
+	string_strncpy.o \
+	string_strpbrk.o \
+	string_strrchr.o \
+	string_strspn.o \
+	string_strstr.o \
+	string_strtok.o \
+	string_strxfrm.o \
+	time_asctime.o \
+	time_clock.o \
+	time_converttime.o \
+	time_ctime.o \
+	time_data.o \
+	time_gettimeofday.o \
+	time_gmtime.o \
+	time_localtime.o \
+	time_mktime.o \
+	time_numbertostring.o \
+	time_strftime.o \
+	time_time.o \
+	unistd_access.o \
+	unistd_chdir.o \
+	unistd_chown.o \
+	unistd_currentpathname.o \
+	unistd_data.o \
+	unistd_dup.o \
+	unistd_dup2.o \
+	unistd_fchown.o \
+	unistd_fdopen.o \
+	unistd_fileno.o \
+	unistd_ftruncate.o \
+	unistd_getcwd.o \
+	unistd_getopt.o \
+	unistd_getpid.o \
+	unistd_init_exit.o \
+	unistd_isatty.o \
+	unistd_lchown.o \
+	unistd_link.o \
+	unistd_readlink.o \
+	unistd_realpath.o \
+	unistd_sleep.o \
+	unistd_symlink.o \
+	unistd_truncate.o \
+	unistd_unlink.o \
+	utime_utime.o 
+
+
+UNIX_LIB = \
+	unix.lib_rev.o \
+	dirent_closedir.o \
+	dirent_data.o \
+	dirent_opendir.o \
+	dirent_readdir.o \
+	dirent_rewinddir.o \
+	fcntl_creat.o \
+	fcntl_fcntl.o \
+	fcntl_open.o \
+	mount_convertinfo.o \
+	mount_statfs.o \
+	stat_chmod.o \
+	stat_fstat.o \
+	stat_lstat.o \
+	stat_mkdir.o \
+	stat_rmdir.o \
+	stat_stat.o \
+	stdio_fdhookentry.o \
+	stdio_init_exit.o \
+	stdio_locksemaphorename.o \
+	stdio_openiob.o \
+	stdio_fflush.o \
+	stdio_fopen.o \
+	stdio_fopen.o \
+	stdio_popen.o \
+	stdio_remove.o \
+	stdio_rename.o \
+	stdlib_mkdtemp.o \
+	stdlib_mkstemp.o \
+	stdlib_mkstemp.o \
+	stdlib_mktemp.o \
+	stdlib_system.o \
+	unistd_access.o \
+	unistd_chdir.o \
+	unistd_chown.o \
+	unistd_getcwd.o \
+	unistd_lchown.o \
+	unistd_link.o \
+	unistd_readlink.o \
+	unistd_realpath.o \
+	unistd_restorepathname.o \
+	unistd_setcurrentpath.o \
+	unistd_strip_double_slash.o \
+	unistd_translatea2u.o \
+	unistd_translaterel.o \
+	unistd_translateu2a.o \
+	unistd_truncate.o \
+	unistd_unix_path_semantics.o \
+	unistd_unlink.o \
+	unistd_wildcard_expand.o \
+	utime_utime.o
+
+MATH_LIB = \
+	math_acos.o \
+	math_asin.o \
+	math_atan.o \
+	math_atan2.o \
+	math_ceil.o \
+	math_cos.o \
+	math_cosh.o \
+	math_data.o \
+	math_exp.o \
+	math_fabs.o \
+	math_floor.o \
+	math_fmod.o \
+	math_frexp.o \
+	math_init_exit.o \
+	math_ldexp.o \
+	math_log.o \
+	math_log10.o \
+	math_modf.o \
+	math_pow.o \
+	math_sin.o \
+	math_sinh.o \
+	math_sqrt.o \
+	math_tan.o \
+	math_tanh.o \
+	math_kernel_expm1.o \
+	math_kernel_scalbn.o \
+	math_kernel_tan.o \
+	math_kernel_cos.o \
+	math_kernel_rem_pio2.o \
+	math_kernel_sin.o \
+	stdio_asprintf.o \
+	stdio_flush.o \
+	stdio_fprintf.o \
+	stdio_fscanf.o \
+	stdio_isinfinity.o \
+	stdio_isnotanumber.o \
+	stdio_printf.o \
+	stdio_scanf.o \
+	stdio_snprintf.o \
+	stdio_sprintf.o \
+	stdio_sscanf.o \
+	stdio_vasprintf.o \
+	stdio_vfprintf.o \
+	stdio_vfscanf.o \
+	stdio_vfscanf.o \
+	stdio_vprintf.o \
+	stdio_vsnprintf.o \
+	stdio_vsprintf.o \
+	stdlib_atof.o \
+	stdlib_machine_test.o \
+	stdlib_strtod.o \
+	time_difftime.o
+
+MATH_LIB_IEEE = \
+	m.lib_rev.o \
+	$(MATH_LIB) \
+	math_adddf3.o \
+	math_addsf3.o \
+	math_divdf3.o \
+	math_divsf3.o \
+	math_eqdf2.o \
+	math_eqsf2.o \
+	math_extendsfdf2.o \
+	math_fixdfsi.o \
+	math_fixsfsi.o \
+	math_fixunsdfsi.o \
+	math_fixunssfsi.o \
+	math_floatsidf.o \
+	math_floatsisf.o \
+	math_gedf2.o \
+	math_gesf2.o \
+	math_gtdf2.o \
+	math_gtsf2.o \
+	math_ledf2.o \
+	math_lesf2.o \
+	math_ltdf2.o \
+	math_ltsf2.o \
+	math_muldf3.o \
+	math_mulsf3.o \
+	math_nedf2.o \
+	math_negdf2.o \
+	math_negsf2.o \
+	math_nesf2.o \
+	math_subdf3.o \
+	math_subsf3.o \
+	math_truncdfsf2.o
+
+STACK_LIB = \
+	stack.lib_rev.o \
+	stdlib_setjmp.o \
+	stdlib_stackextension.o \
+	stdlib_stackminframe.o \
+	stdlib_stackoverflow.o \
+	stdlib_stacksafezone.o
+
+NET_LIB = \
+	net.lib_rev.o \
+	socket_accept.o \
+	socket_bind.o \
+	socket_connect.o \
+	socket_data.o \
+	socket_gethostbyaddr.o \
+	socket_gethostbyname.o \
+	socket_gethostid.o \
+	socket_gethostname.o \
+	socket_getnetbyaddr.o \
+	socket_getnetbyname.o \
+	socket_getpeername.o \
+	socket_getprotobyname.o \
+	socket_getprotobynumber.o \
+	socket_getservbyname.o \
+	socket_getservbyport.o \
+	socket_getsockname.o \
+	socket_getsockopt.o \
+	socket_get_descriptor.o \
+	socket_inet_addr.o \
+	socket_inet_aton.o \
+	socket_inet_lnaof.o \
+	socket_inet_makeaddr.o \
+	socket_inet_netof.o \
+	socket_inet_network.o \
+	socket_inet_ntoa.o \
+	socket_init_exit.o \
+	socket_ioctl.o \
+	socket_isdaemon.o \
+	socket_listen.o \
+	socket_recv.o \
+	socket_recvfrom.o \
+	socket_recvmsg.o \
+	socket_select.o \
+	socket_send.o \
+	socket_sendmsg.o \
+	socket_sendto.o \
+	socket_setsockopt.o \
+	socket_shutdown.o \
+	socket_socket.o \
+	socket_hook_entry.o \
+	socket_hstrerror.o \
+	usergroup_crypt.o \
+	usergroup_data.o \
+	usergroup_endgrent.o \
+	usergroup_endpwent.o \
+	usergroup_getegid.o \
+	usergroup_geteuid.o \
+	usergroup_getgid.o \
+	usergroup_getgrent.o \
+	usergroup_getgrgid.o \
+	usergroup_getgrnam.o \
+	usergroup_getgroups.o \
+	usergroup_getpass.o \
+	usergroup_getpwent.o \
+	usergroup_getpwnam.o \
+	usergroup_getpwuid.o \
+	usergroup_getuid.o \
+	usergroup_initgroups.o \
+	usergroup_init_exit.o \
+	usergroup_rootmode.o \
+	usergroup_setegid.o \
+	usergroup_seteuid.o \
+	usergroup_setgid.o \
+	usergroup_setgrent.o \
+	usergroup_setgroups.o \
+	usergroup_setpwent.o \
+	usergroup_setregid.o \
+	usergroup_setreuid.o \
+	usergroup_setsid.o \
+	usergroup_setuid.o \
+	stat_umask.o
+
+DEBUG_LIB = \
+	debug.lib_rev.o \
+	debug.o \
+	debug_level.o \
+	debug_cmpstrexec.o \
+	debug_kcmpstr.o \
+	debug_kdofmt.o \
+	debug_kgetc.o \
+	debug_kgetch1.o \
+	debug_kgetch2.o \
+	debug_kgetchar1.o \
+	debug_kgetchar2.o \
+	debug_kgetnum1.o \
+	debug_kgetnum2.o \
+	debug_kmaygetch.o \
+	debug_kmaygetchar.o \
+	debug_kprintf1.o \
+	debug_kprintf2.o \
+	debug_kputc.o \
+	debug_kputch1.o \
+	debug_kputch2.o \
+	debug_kputchar1.o \
+	debug_kputchar2.o \
+	debug_kputfmt.o \
+	debug_kputs1.o \
+	debug_kputs2.o \
+	debug_kputstr1.o \
+	debug_kputstr2.o \
+	debug_kvprintf1.o \
+	debug_kvprintf2.o
+
+AMIGA_LIB = \
+	amiga.lib_rev.o \
+	amiga_acrypt.o \
+	amiga_addtof.o \
+	amiga_argarraydone.o \
+	amiga_argarrayinit.o \
+	amiga_argint.o \
+	amiga_argstring.o \
+	amiga_callhooka.o \
+	amiga_coercemethod.o \
+	amiga_createstdio.o \
+	amiga_deletestdio.o \
+	amiga_domethod.o \
+	amiga_dosupermethod.o \
+	amiga_dotimer.o \
+	amiga_fastrand.o \
+	amiga_freeievents.o \
+	amiga_hotkey.o \
+	amiga_invertstring.o \
+	amiga_rangerand.o \
+	amiga_remtof.o \
+	amiga_setsuperattrs.o \
+	amiga_timedelay.o \
+	amiga_waitbeam.o 
+
+##############################################################################
+
+LIBS := $(LIBC_OBJS)/libc.a $(LIBSTACK_OBJS)/libstack.a $(LIBUNIX_OBJS)/libunix.a \
+            $(LIBDEBUG_OBJS)/libdebug.a $(LIBAMIGA_OBJS)/libamiga.a \
+            $(LIBM_OBJS)/libm.a $(LIBNET_OBJS)/libnet.a
+
+##############################################################################
+
+
+##############################################################################
+
+STARTUPS := crt0.o crtbegin.o crtend.o mainnb.o
+
+##############################################################################
+
+all: \
 	lib/crt0.o \
-	lib/small-data/crt0.o \
-	lib/baserel/crt0.o \
-	$(LIBS)
+	lib/crtbegin.o \
+	lib/crtend.o \
+	lib/mainnb.o \
+	lib/libm.a
+
+copy:
+	$(COPY) $(foreach file,$(LIBS),large_data/$(file)) lib

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

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

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

-# Update the version numbers bound to the individual libraries
 version:
-	$(COPY) c.lib_rev.rev amiga.lib_rev.rev
-	$(COPY) c.lib_rev.rev debug.lib_rev.rev
-	$(COPY) c.lib_rev.rev m.lib_rev.rev
-	$(COPY) c.lib_rev.rev net.lib_rev.rev
-	$(COPY) c.lib_rev.rev unix.lib_rev.rev
-	$(COPY) c.lib_rev.rev profile.lib_rev.rev
+	cp c.lib_rev.rev amiga.lib_rev.rev
+	cp c.lib_rev.rev debug.lib_rev.rev
+	cp c.lib_rev.rev m.lib_rev.rev
+	cp c.lib_rev.rev m881.lib_rev.rev
+	cp c.lib_rev.rev net.lib_rev.rev
+	cp c.lib_rev.rev stack.lib_rev.rev
+	cp c.lib_rev.rev unix.lib_rev.rev
 	bumprev 1 amiga.lib
 	bumprev 1 c.lib
 	bumprev 1 debug.lib
 	bumprev 1 m.lib
+	bumprev 1 m881.lib
 	bumprev 1 net.lib
+	bumprev 1 stack.lib
 	bumprev 1 unix.lib
-	bumprev 1 profile.lib

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

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

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

-# General build rules for all object files and the individual libraries
-
-lib/%.o : AFLAGS += $(LARGEDATA)
-lib/%.o : %.S
-	@$(ASSEMBLE)
-
-lib/small-data/%.o : AFLAGS += $(SMALLDATA)
-lib/small-data/%.o : %.S
-	@$(ASSEMBLE)
-
-lib/baserel/%.o : AFLAGS += $(BASEREL)
-lib/baserel/%.o : %.S
-	@$(ASSEMBLE)
+kitchen_sink: $(TYPE) $(LIBS) $(STARTUPS)

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

-define COMPILE
-$(MAKEDIR) $(@D)
-echo "Compiling $< [$(@D)]"
-$(CC) -o $@ -c $(CFLAGS) $< $(LOG_COMMAND)
-endef
-
-define ASSEMBLE
-$(MAKEDIR) $(@D)
-echo "Assembling $< [$(@D)]"
-$(CC) -o $@ -c $(AFLAGS) $< $(LOG_COMMAND)
-endef
-
-define MAKELIB
+ifneq (,$(TYPE))
+$(TYPE):
 	$(MAKEDIR) $@
-$(DELETE) $@
-echo "Making $@"
-$(AR) $@ $^ $(LOG_COMMAND)
-$(RANLIB) $@ $(LOG_COMMAND)
-endef
+endif
+
+##############################################################################
+
+lib:
+	-$(MAKEDIR) $@
+
+lib/libm.a: lib
+	$(MAKE) TYPE=large_data kitchen_sink
+	$(COPY) $(foreach file,$(LIBS),large_data/$(file)) lib
+
+lib/small-data/libm.a: lib lib/small-data
+	$(MAKE) TYPE=small_data kitchen_sink
+	$(COPY) $(foreach file,$(LIBS),small_data/$(file)) lib/small-data
+
+lib/crt0.o : lib crt0.o
+	$(COPY) crt0.o lib
+
+lib/crtbegin.o : lib crtbegin.o
+	$(COPY) crtbegin.o lib
+
+lib/crtend.o : lib crtend.o
+	$(COPY) crtend.o lib
+
+lib/mainnb.o : lib mainnb.o
+	$(COPY) mainnb.o lib
+
+lib/mainb.o : lib mainb.o
+	$(COPY) mainb.o lib
+
+##############################################################################
+
+$(LIBAMIGA_OBJS)/amiga_hookentry.o : amiga_hookentry.c
+
+$(LIBC_OBJS)/stdlib_getsp.o : stdlib_getsp.c
+
+$(LIBC_OBJS)/stdlib_swapstack.o : stdlib_swapstack.c
+
+$(LIBC_OBJS)/stdlib_setjmp.o : stdlib_setjmp.c
+
+$(LIBSTACK_OBJS)/stdlib_setjmp.o : stdlib_setjmp.c
+
+##############################################################################
+
+$(LIBC_OBJS)/stdlib_stacksize.o : stdlib_stacksize.c stdlib_gcc_help.h
+
+$(LIBC_OBJS)/stdlib_shell_escape.o : stdlib_shell_escape.c stdlib_gcc_help.h
+
+$(LIBC_OBJS)/stdlib_alloca.o : stdlib_alloca.c stdlib_mem_debug.h
+
+$(LIBC_OBJS)/stdlib_calloc.o : stdlib_calloc.c stdlib_mem_debug.h
+
+$(LIBC_OBJS)/stdlib_free.o : stdlib_free.c stdlib_mem_debug.h
+
+$(LIBC_OBJS)/stdlib_init_exit.o : stdlib_init_exit.c stdlib_mem_debug.h
+
+$(LIBC_OBJS)/stdlib_malloc.o : stdlib_malloc.c stdlib_mem_debug.h
+
+$(LIBC_OBJS)/stdlib_realloc.o : stdlib_realloc.c stdlib_mem_debug.h
+
+$(LIBC_OBJS)/stdlib_red_black.o : stdlib_red_black.c stdlib_mem_debug.h
+
+##############################################################################
+
+$(LIBC_OBJS) :
+	$(MAKEDIR) $@
+
+$(LIBC_OBJS)/libc.a : $(LIBC_OBJS) $(foreach file,$(C_LIB),$(LIBC_OBJS)/$(file))
+	-$(DELETE) $@
+	@$(AR) $@ $(foreach file,$(C_LIB),$(LIBC_OBJS)/$(file))
+	$(RANLIB) $@
+
+##############################################################################
+
+$(LIBUNIX_OBJS) :
+	$(MAKEDIR) $@
+
+$(LIBUNIX_OBJS)/libunix.a : $(LIBUNIX_OBJS) $(foreach file,$(UNIX_LIB),$(LIBUNIX_OBJS)/$(file))
+	-$(DELETE) $@
+	@$(AR) $@ $(foreach file,$(UNIX_LIB),$(LIBUNIX_OBJS)/$(file))
+	$(RANLIB) $@
+
+##############################################################################
+
+$(LIBM_OBJS) :
+	$(MAKEDIR) $@
+
+$(LIBM_OBJS)/libm.a : $(LIBM_OBJS) $(foreach file,$(MATH_LIB_IEEE),$(LIBM_OBJS)/$(file))
+	-$(DELETE) $@
+	@$(AR) $@ $(foreach file,$(MATH_LIB_IEEE),$(LIBM_OBJS)/$(file))
+	$(RANLIB) $@
+
+##############################################################################
+
+$(LIBSTACK_OBJS) :
+	$(MAKEDIR) $@
+
+$(LIBSTACK_OBJS)/libstack.a : $(LIBSTACK_OBJS) $(foreach file,$(STACK_LIB),$(LIBSTACK_OBJS)/$(file))
+	-$(DELETE) $@
+	@$(AR) $@ $(foreach file,$(STACK_LIB),$(LIBSTACK_OBJS)/$(file))
+	$(RANLIB) $@
+
+##############################################################################
+
+$(LIBNET_OBJS) :
+	$(MAKEDIR) $@
+
+$(LIBNET_OBJS)/libnet.a : $(LIBNET_OBJS) $(foreach file,$(NET_LIB),$(LIBNET_OBJS)/$(file))
+	-$(DELETE) $@
+	@$(AR) $@ $(foreach file,$(NET_LIB),$(LIBNET_OBJS)/$(file))
+	$(RANLIB) $@
+
+##############################################################################
+
+$(LIBDEBUG_OBJS) :
+	$(MAKEDIR) $@
+
+$(LIBDEBUG_OBJS)/libdebug.a : $(LIBDEBUG_OBJS) $(foreach file,$(DEBUG_LIB),$(LIBDEBUG_OBJS)/$(file))
+	-$(DELETE) $@
+	@$(AR) $@ $(foreach file,$(DEBUG_LIB),$(LIBDEBUG_OBJS)/$(file))
+	$(RANLIB) $@
+
+##############################################################################
+
+$(LIBAMIGA_OBJS) :
+	$(MAKEDIR) $@
+
+$(LIBAMIGA_OBJS)/libamiga.a : $(LIBAMIGA_OBJS) $(foreach file,$(AMIGA_LIB),$(LIBAMIGA_OBJS)/$(file))
+	-$(DELETE) $@
+	@$(AR) $@ $(foreach file,$(AMIGA_LIB),$(LIBAMIGA_OBJS)/$(file))
+	$(RANLIB) $@
+
+##############################################################################
+
+crt0.o : crt0.S
+	@echo "Assembling $<"
+	@$(CC) -Wa,-mregnames -o crt0.o -c crt0.S
+
+bcrt0.o : crt0.S
+	@echo "Assembling $<"
+	@$(CC) -DSMALL_DATA -Wa,-mregnames -o bcrt0.o -c crt0.S
+
+mainnb.o : stdlib_main.c
+	@echo "Compiling $<"
+	@$(CC) -o mainnb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=data stdlib_main.c
+
+mainb.o : stdlib_main.c
+	@echo "Compiling $<"
+	@$(CC) -o mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -msdata=sysv -DSMALL_DATA stdlib_main.c
+
+##############################################################################
+
+mkid:
+#	mkid -v #?.(c|h|asm|i) include/#?.(c|h|asm|i) include/sys/#?.(c|h|asm|i)
+	mkid *.[ch] include/*.h include/sys/*.h
+
+update:
+	mkid -v -u
--- 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.3 2006-01-08 12:04:21 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-2006 by Olaf Barthel <olsen (at) 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	201
-#define DATE		"21.9.2006"
-#define VERS		"amiga.lib 1.201"
-#define VSTRING		"amiga.lib 1.201 (21.9.2006)\r\n"
-#define VERSTAG		"\0$VER: amiga.lib 1.201 (21.9.2006)"
+#define REVISION	166
+#define DATE		"28.7.2004"
+#define VERS		"amiga.lib 1.166"
+#define VSTRING		"amiga.lib 1.166 (28.7.2004)\r\n"
+#define VERSTAG		"\0$VER: amiga.lib 1.166 (28.7.2004)"
--- a/library/amiga.lib_rev.rev
+++ b/library/amiga.lib_rev.rev
@@ -1 +1 @@
-201
+166
--- a/library/amiga_acrypt.c
+++ b/library/amiga_acrypt.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_acrypt.c,v 1.4 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.4 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.6 2006-09-22 09:02:51 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-2006 by Olaf Barthel <olsen (at) 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 */
@@ -75,9 +75,9 @@ ArgArrayInit(LONG argc, CONST_STRPTR * argv)
 			goto out;

 		for(i = 1 ; i < argc ; i++)
-			CXLIB_argarray[i-1] = (unsigned char *)argv[i];
+			CXLIB_argarray[i-1] = argv[i];

-		result = (STRPTR *)CXLIB_argarray;
+		result = (unsigned char **)CXLIB_argarray;
 	}
 	else if (IconBase != NULL)
 	{
@@ -90,7 +90,7 @@ ArgArrayInit(LONG argc, CONST_STRPTR * argv)
 		if(CXLIB_disko == NULL)
 			goto out;

-		result = (STRPTR *)CXLIB_disko->do_ToolTypes;
+		result = (unsigned char **)CXLIB_disko->do_ToolTypes;
 	}

 out:
--- a/library/amiga_argint.c
+++ b/library/amiga_argint.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argint.c,v 1.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.4 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.4 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.4 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.4 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.4 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.4 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.4 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.4 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.8 2006-04-05 06:43:56 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-2006 by Olaf Barthel <olsen (at) 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,34 +44,11 @@

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

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

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

-/* A quick workaround for the timeval/timerequest->TimeVal/TimeRequest
-   change in the recent OS4 header files. */
-
-#if defined(__NEW_TIMEVAL_DEFINITION_USED__)
-
-#define timeval		TimeVal
-#define tv_secs		Seconds
-#define tv_micro	Microseconds
-
-#define timerequest	TimeRequest
-#define tr_node		Request
-#define tr_time		Time
-
-#endif /* __NEW_TIMEVAL_DEFINITION_USED__ */
-
-/****************************************************************************/
-
 LONG
 DoTimer(struct timeval *tv,LONG unit,LONG command)
 {
@@ -81,23 +58,6 @@ DoTimer(struct timeval *tv,LONG unit,LONG command)

 	assert( tv != NULL );

-	#if defined(__amigaos4__)
-	{
-		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;
-		}
-	}
-	#else
-	{
 	mp = AllocVec(sizeof(*mp),MEMF_ANY|MEMF_PUBLIC|MEMF_CLEAR);
 	if(mp == NULL)
 	{
@@ -109,10 +69,7 @@ DoTimer(struct timeval *tv,LONG unit,LONG command)
 	mp->mp_Flags		= PA_SIGNAL;
 	mp->mp_SigBit		= SIGB_SINGLE;
 	mp->mp_SigTask		= FindTask(NULL);
-
 	NewList(&mp->mp_MsgList);
-	}
-	#endif /* __amigaos4__ */

 	tr = (struct timerequest *)CreateIORequest(mp,sizeof(*tr));
 	if(tr == NULL)
@@ -131,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);

@@ -150,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__ */

 	return(error);
 }
--- a/library/amiga_fastrand.c
+++ b/library/amiga_fastrand.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_fastrand.c,v 1.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.4 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.8 2006-09-22 09:02:51 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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 TEXT 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.4 2006-04-05 06:43:56 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-2006 by Olaf Barthel <olsen (at) 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
@@ -39,19 +39,6 @@

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

-/* A quick workaround for the timeval/timerequest->TimeVal/TimeRequest
-   change in the recent OS4 header files. */
-
-#if defined(__NEW_TIMEVAL_DEFINITION_USED__)
-
-#define timeval		TimeVal
-#define tv_secs		Seconds
-#define tv_micro	Microseconds
-
-#endif /* __NEW_TIMEVAL_DEFINITION_USED__ */
-
-/****************************************************************************/
-
 LONG
 TimeDelay(LONG unit,ULONG seconds,ULONG micros)
 {
--- a/library/amiga_waitbeam.c
+++ b/library/amiga_waitbeam.c
@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_waitbeam.c,v 1.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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	201
-#define DATE		"21.9.2006"
-#define VERS		"c.lib 1.201"
-#define VSTRING		"c.lib 1.201 (21.9.2006)\r\n"
-#define VERSTAG		"\0$VER: c.lib 1.201 (21.9.2006)"
+#define REVISION	166
+#define DATE		"28.7.2004"
+#define VERS		"c.lib 1.166"
+#define VSTRING		"c.lib 1.166 (28.7.2004)\r\n"
+#define VERSTAG		"\0$VER: c.lib 1.166 (28.7.2004)"
--- a/library/c.lib_rev.rev
+++ b/library/c.lib_rev.rev
@@ -1 +1 @@
-201
+166
--- 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.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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.2 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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.4 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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.11 2006-09-22 09:02:51 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,27 +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 };

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

-void _init(void);
-void _fini(void);
+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();
 }

 /****************************************************************************/
@@ -50,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.6 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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_isblank.c
+++ b/library/ctype_isblank.c
@@ -1,52 +0,0 @@
-/*
- * $Id: ctype_isblank.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
- *
- * :ts=4
- *
- * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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 _CTYPE_HEADERS_H
-#include "ctype_headers.h"
-#endif /* _CTYPE_HEADERS_H */
-
-/****************************************************************************/
-
-#undef isblank
-
-/****************************************************************************/
-
-int
-isblank(int c)
-{
-	int result;
-
-	result = (c == '\t' || c == ' ');
-
-	return(result);
-}
--- a/library/ctype_iscntrl.c
+++ b/library/ctype_iscntrl.c
@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_iscntrl.c,v 1.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.4 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.5 2006-09-22 09:02:51 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-2006 by Olaf Barthel <olsen (at) 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)
@@ -160,7 +160,7 @@ _SHOWVALUE(
 {
 	if(__debug_level >= DEBUGLEVEL_Reports)
 	{
-		const char *fmt;
+		char *fmt;

 		switch(size)
 		{
@@ -207,7 +207,7 @@ _SHOWPOINTER(
 {
 	if(__debug_level >= DEBUGLEVEL_Reports)
 	{
-		const char *fmt;
+		char *fmt;

 		_INDENT();

--- a/library/debug.h
+++ b/library/debug.h
@@ -1,10 +1,10 @@
 /*
- * $Id: debug.h,v 1.4 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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	201
-#define DATE		"21.9.2006"
-#define VERS		"debug.lib 1.201"
-#define VSTRING		"debug.lib 1.201 (21.9.2006)\r\n"
-#define VERSTAG		"\0$VER: debug.lib 1.201 (21.9.2006)"
+#define REVISION	166
+#define DATE		"28.7.2004"
+#define VERS		"debug.lib 1.166"
+#define VSTRING		"debug.lib 1.166 (28.7.2004)\r\n"
+#define VERSTAG		"\0$VER: debug.lib 1.166 (28.7.2004)"
--- a/library/debug.lib_rev.rev
+++ b/library/debug.lib_rev.rev
@@ -1 +1 @@
-201
+166
--- a/library/debug_cmpstrexec.c
+++ b/library/debug_cmpstrexec.c
@@ -1,10 +1,10 @@
 /*
- * $Id: debug_cmpstrexec.c,v 1.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.4 2006-01-08 12:04: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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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.3 2006-01-08 12:04:22 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-2006 by Olaf Barthel <olsen (at) 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