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

git-svn-id: file:///Users/olsen/Code/migration-svn-zu-git/logical-line-staging/clib2/tags/V1_200@15098 87f5fb63-7c3d-0410-a384-fd976d0f7a62

CVSROOT/checkoutlist

@@ -1,13 +0,0 @@
-# The "checkoutlist" file is used to support additional version controlled
-# administrative files in $CVSROOT/CVSROOT, such as template files.
-#
-# The first entry on a line is a filename which will be checked out from
-# the corresponding RCS file in the $CVSROOT/CVSROOT directory.
-# The remainder of the line is an error message to use if the file cannot
-# be checked out.
-#
-# File format:
-#
-#	[<whitespace>]<filename>[<whitespace><error message>]<end-of-line>
-#
-# comment lines begin with '#'

CVSROOT/commitinfo

@@ -1,15 +0,0 @@
-# The "commitinfo" file is used to control pre-commit checks.
-# The filter on the right is invoked with the repository and a list 
-# of files to check.  A non-zero exit of the filter program will 
-# cause the commit to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

CVSROOT/config

@@ -1,21 +0,0 @@
-# Set this to "no" if pserver shouldn't check system users/passwords
-#SystemAuth=no
-
-# Put CVS lock files in this directory rather than directly in the repository.
-#LockDir=/var/lock/cvs
-
-# Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
-# level of the new working directory when using the `cvs checkout'
-# command.
-#TopLevelAdmin=no
-
-# Set `LogHistory' to `all' or `TOEFWUPCGMAR' to log all transactions to the
-# history file, or a subset as needed (ie `TMAR' logs all write operations)
-#LogHistory=TOEFWUPCGMAR
-
-# Set `RereadLogAfterVerify' to `always' (the default) to allow the verifymsg
-# script to change the log message.  Set it to `stat' to force CVS to verify# that the file has changed before reading it (this can take up to an extra
-# second per directory being committed, so it is not recommended for large
-# repositories.  Set it to `never' (the previous CVS behavior) to prevent
-# verifymsg scripts from changing the log message.
-#RereadLogAfterVerify=always

CVSROOT/cvswrappers

@@ -1,19 +0,0 @@
-# This file affects handling of files based on their names.
-#
-# The -m option specifies whether CVS attempts to merge files.
-#
-# The -k option specifies keyword expansion (e.g. -kb for binary).
-#
-# Format of wrapper file ($CVSROOT/CVSROOT/cvswrappers or .cvswrappers)
-#
-#  wildcard	[option value][option value]...
-#
-#  where option is one of
-#  -f		from cvs filter		value: path to filter
-#  -t		to cvs filter		value: path to filter
-#  -m		update methodology	value: MERGE or COPY
-#  -k		expansion mode		value: b, o, kkv, &c
-#
-#  and value is a single-quote delimited value.
-# For example:
-#*.gif -k 'b'

CVSROOT/editinfo

@@ -1,21 +0,0 @@
-# The "editinfo" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.

CVSROOT/loginfo

@@ -1,27 +0,0 @@
-# The "loginfo" file controls where "cvs commit" log information
-# is sent.  The first entry on a line is a regular expression which must match
-# the directory that the change is being made to, relative to the
-# $CVSROOT.  If a match is found, then the remainder of the line is a filter
-# program that should expect log information on its standard input.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name ALL appears as a regular expression it is always used
-# in addition to the first matching regex or DEFAULT.
-#
-# You may specify a format string as part of the
-# filter.  The string is composed of a `%' followed
-# by a single format character, or followed by a set of format
-# characters surrounded by `{' and `}' as separators.  The format
-# characters are:
-#
-#   s = file name
-#   V = old version number (pre-checkin)
-#   v = new version number (post-checkin)
-#   t = tag or branch name
-#
-# For example:
-#DEFAULT (echo ""; id; echo %s; date; cat) >> $CVSROOT/CVSROOT/commitlog
-# or
-#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog

CVSROOT/modules

@@ -1,26 +0,0 @@
-# Three different line formats are valid:
-#	key	-a    aliases...
-#	key [options] directory
-#	key [options] directory files...
-#
-# Where "options" are composed of:
-#	-i prog		Run "prog" on "cvs commit" from top-level of module.
-#	-o prog		Run "prog" on "cvs checkout" of module.
-#	-e prog		Run "prog" on "cvs export" of module.
-#	-t prog		Run "prog" on "cvs rtag" of module.
-#	-u prog		Run "prog" on "cvs update" of module.
-#	-d dir		Place module in directory "dir" instead of module name.
-#	-l		Top-level directory only -- do not recurse.
-#
-# NOTE:  If you change any of the "Run" options above, you'll have to
-# release and re-checkout any working directories of these modules.
-#
-# And "directory" is a path to a directory relative to $CVSROOT.
-#
-# The "-a" option specifies an alias.  An alias is interpreted as if
-# everything on the right of the "-a" had been typed on the command line.
-#
-# You can encode a module within a module by using the special '&'
-# character to interpose another module into the current module.  This
-# can be useful for creating a module that consists of many directories
-# spread out over the entire source repository.

CVSROOT/notify

@@ -1,12 +0,0 @@
-# The "notify" file controls where notifications from watches set by
-# "cvs watch add" or "cvs edit" are sent.  The first entry on a line is
-# a regular expression which is tested against the directory that the
-# change is being made to, relative to the $CVSROOT.  If it matches,
-# then the remainder of the line is a filter program that should contain
-# one occurrence of %s for the user to notify, and information on its
-# standard input.
-#
-# "ALL" or "DEFAULT" can be used in place of the regular expression.
-#
-# For example:
-#ALL mail -s "CVS notification" %s

CVSROOT/rcsinfo

@@ -1,13 +0,0 @@
-# The "rcsinfo" file is used to control templates with which the editor
-# is invoked on commit and import.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being made to, relative to the
-# $CVSROOT.  For the first match that is found, then the remainder of the
-# line is the name of the file that contains the template.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

CVSROOT/taginfo

@@ -1,20 +0,0 @@
-# The "taginfo" file is used to control pre-tag checks.
-# The filter on the right is invoked with the following arguments:
-#
-# $1 -- tagname
-# $2 -- operation "add" for tag, "mov" for tag -F, and "del" for tag -d
-# $3 -- repository
-# $4->  file revision [file revision ...]
-#
-# A non-zero exit of the filter program will cause the tag to be aborted.
-#
-# The first entry on a line is a regular expression which is tested
-# against the directory that the change is being committed to, relative
-# to the $CVSROOT.  For the first match that is found, then the remainder
-# of the line is the name of the filter to run.
-#
-# If the repository name does not match any of the regular expressions in this
-# file, the "DEFAULT" line is used, if it is specified.
-#
-# If the name "ALL" appears as a regular expression it is always used
-# in addition to the first matching regex or "DEFAULT".

CVSROOT/verifymsg

@@ -1,21 +0,0 @@
-# The "verifymsg" file is used to allow verification of logging
-# information.  It works best when a template (as specified in the
-# rcsinfo file) is provided for the logging procedure.  Given a
-# template with locations for, a bug-id number, a list of people who
-# reviewed the code before it can be checked in, and an external
-# process to catalog the differences that were code reviewed, the
-# following test can be applied to the code:
-#
-#   Making sure that the entered bug-id number is correct.
-#   Validating that the code that was reviewed is indeed the code being
-#       checked in (using the bug-id number or a seperate review
-#       number to identify this particular code set.).
-#
-# If any of the above test failed, then the commit would be aborted.
-#
-# Actions such as mailing a copy of the report to each reviewer are
-# better handled by an entry in the loginfo file.
-#
-# One thing that should be noted is the the ALL keyword is not
-# supported.  There can be only one entry that matches a given
-# repository.

documentation/BUILDING

@@ -1,19 +0,0 @@
-In order to build the library, you need a 'C' compiler (obvious, isn't it?) and
-a set of header files for the networking API definitions. The networking header
-files go into a directory "netinclude" which has to sit in the same directory as
-the source code and the "include" directory you find in there. I'm not currently
-supplying these header files here. Drop me a line, and I'll take care of that.
-
-The SAS/C flavour (smakefile) should get the library built using the "large data"
-model. This rules out the use of residentable programs as the startup code I'm
-using is very primitive (startup.o) and doesn't tinker with A4 relative data
-addressing (and how this may be set up).
-
-There are two makefiles for GCC, each a different flavour. There is "GNUmakefile.68k",
-which will build the library for GCC on the 68k platform ("classic" Amiga). This
-builds all variants of the library, for large data, small data, resident, whatever
-model. It's a lot of work and I don't recommend you do this on a plain 68k machine.
-It will literally (!) take hours. The other makefile flavour is for AmigaOS4 using
-the PowerPC hosted GCC system ("GNUmakefile.os4"). This builds only the large data
-version of the library, but this is usually all you need. Small data support is
-currently not implemented but might follow in the future.

documentation/README

@@ -1,235 +0,0 @@
-An ISO 'C' (1994) compliant runtime library for the Amiga
-=========================================================
-
-1. What is this?
-
-This is my attempt to get Samba 2.2.x ported to the Amiga. My first Amiga
-port required SAS/C and a number of strange tricks had to be pulled to get
-it to support the kind of environment Samba needed. But with the
-introduction of Samba 2.2.x many of those tricks did not work any more,
-which is why I decided to attack the problem at the root, namely the
-runtime library.
-
-Because it was no longer possible to build Samba with SAS/C on the new
-Amiga platform, the idea came up to move development to the GNU 'C'
-compiler. This turned out to be a challenge due to its somewhat
-underdeveloped runtime library and header files. Eventually, I decided to
-rewrite that library from scratch.
-
-
-2. What does it do?
-
-Using "'C' - A reference manual" as a reference I wrote a set of header
-files, then proceeded to implement each single function referenced in them.
-With few exceptions in the area of wide character support, the result
-should be a feature complete implementation of the ISO 'C' (1994) runtime
-library.
-
-Because Samba needs a few POSIX-like routines to be supported, the library
-functionality is complemented by a set of routines described in "Advanced
-programming in the Unix environent". This set is not complete, however. It
-will have to grow even further to accomodate for Samba's needs, but this is
-a good start. I specifically added hooks for integrating socket I/O at a
-later point of time.
-
-This is not a portable implementation of the library in the sense that you
-could move it from one 'C' compiler on one operating system to another.
-This is an Amiga specific implementation.
-
-The library supports floating point math, which is limited to IEEE single
-and double precision or M68881 inline math. There is no support for the
-fast floating point (FFP) format or exclusive IEEE single precision. You
-either get double precision (IEEE math) or extended precision (M68881
-inline math). What it is that you get is determined at compile time. Use
-the IEEE_FLOATING_POINT_SUPPORT preprocessor symbol to activate IEEE math
-code and the M68881_FLOATING_POINT_SUPPORT symbol for M68881 inline math.
-
-Not unlike SAS/C, you can configure a minimum stack size the program is to
-use when it starts up. This is controlled via the '__stack_size' variable
-(see "stdlib_main.c").
-
-I added some amiga.lib and debug.lib functionality to the library, but
-don't count on it to be complete.
-
-
-3. What does it not do?
-
-This library is a departure from the typical 'C' runtime environments of
-the past which had to run on all AmigaOS releases, down to Kickstart 1.1.
-This very library was designed to take advantage of the routines available
-since Kickstart 2.04 was introduced and virtually nobody ever put to use.
-This helps to cut the code size, and it also helps to keep bugs out of the
-library by falling back onto well-tested implementations. However, the
-catch is that the code won't run under Kickstart 1.3 and below. But then
-these operating system releases have been obsolete for more than a decade,
-and you can always go back to a compiler environment which supports them.
-
-Practically all library routines are implemented in a sort of na<6E>ve
-fashion. That is, they contain virtually no optimizations whatsoever. This
-is particularly apparent in workhorses such as memset() or memmove(). But
-then, the issue is easy testability and Amiga platform portability.
-
-There is very little support for amiga.lib functionality. There is
-NewList(), HookEntry(), CallHook(), CallHookA(), the DoMethod() family, the
-RexxVars family, but that's all. If you need more, you would have to
-implement it yourself. Put another way, if you absolutely need
-functionality that is only found in amiga.lib, you really shouldn't need in
-in the first place.
-
-
-4. Where does the source code come from?
-
-I originally thought that it might be helpful to piece this library
-together from various sources, such as the BSD libc. Turned out that this
-code was so 'portable' that it became much more complex than it ought to
-be. Also, some side-effects were present which considerably changed the
-behaviour of the library. For example, the BSD libc uses bcopy() as an
-alias for memcpy(), and unlike memcpy() is documented to, bcopy() supports
-overlapping copies.
-
-Eventually, I wrote virtually all the code myself, borrowing algorithmic
-ideas from the BSD libc and the Manx Aztec 'C' runtime library. Because I
-don't know much about the environment GCC expects, I borrowed code snippets
-from libnix, which was written by Matthias Fleischer and Gunther Nikl. This
-in particular concerns the integer and floating point math support, the
-setjmp/longjmp routines and the startup code. The M68881 inline math code
-comes from the <math-68881.h> file written by Matthew Self
-(self@bayes.arc.nasa.gov).
-
-
-5. Limitations and caveats
-
-There is hardly any documentation on the code I wrote. In part this is due
-to the fact that the code itself is very simple in design. It should speak
-for itself. However, to make a usable runtime library you have to have a
-user documentation as in man pages or autodocs. We will eventually have to
-have autodocs for this library.
-
-The code is currently plastered with assertions and debug code. It is
-therefore much larger than it ought to be and runs much slower than it
-ought to be. For example, the malloc() routine will set the contents of the
-memory allocated to a 'dirty' bit pattern which is likely to break software
-which makes assumptions about its contents. Likewise, the free() routine
-will trash the memory to deallocate with a different 'dirty' bit pattern to
-turn up reuse of memory after deallocation. All these debugging features
-can be disabled by defining the NDEBUG preprocessor symbol at compile time
-(see <assert.h>).
-
-The exception handling in the math code is not particularly effective. For
-one part this is due to the fact that there is no exception handler
-installed by the runtime library when it starts up which could catch and
-process the error conditions the CPU or FPU generates. The idea was to
-provide for a portable runtime library with little to no assembly language
-involved. To make the exception handling complete, such code would be
-necessary.
-
-The library currently builds under SAS/C, but because the 'normal' program
-startup code is not utilized, the base relative (A4) addressing does not
-work. If you are going to test it, use the data=faronly option to compile
-the library and the programs.
-
-If you are going to rebuild the library with SAS/C you will need to
-reassign INCLUDE: to point to the local 'include' directory or things won't
-work.
-
-
-6. Conventions and design issues
-
-You will have noticed the 330+ files in this directory. This is not the
-best way to organize a runtime library, but at least all the bits and
-pieces are in plain sight. Each file stands for the one or two routines it
-contains. The name indicates what routine(s) that might be. Each file name
-is prefixed by the name of the header file in which the corresponding
-routine is defined. So, for example, you will find that "unistd_lchown.c"
-contains the definition of the lchown() routine, which has its prototype
-defined in the <unistd.h> header file.
-
-Internal function and variable names are prefixed with two underscores, as
-in '__stdio_init()'.
-
-All routines attempt to do error checking on their parameters. They will
-either drop into an assert() or set an errno value and refuse to go any
-further. This cuts performance but should help to catch the simple bugs
-quite easily (NULL pointers).
-
-Just like any halfway sane Amiga 'C'<27>runtime library, this one performs its
-^C checking in the I/O routines. Typically once upon entry and in every
-iteration of the loop there might be it will quickly poll the ^C signal and
-drop into raise(SIGINT) in case the signal is set. This is just about the
-safest method to solve the problem and should be much more robust than the
-ixemul approach of 'interrupt anywhere - crash anywhere' using the task
-switch/launch hooks to test for signals.
-
-By default all library routines follow the ISO 'C' conventions in that
-where implementation defined behaviour is permitted, the AmigaOS rules are
-followed. For example, unlink() will by default operate like DeleteFile()
-and rename() will return with an error code set if the name of the
-file/directory to be renamed would collide with an existing directory
-entry. However, your program can set a global variable '__unix_semantics'
-which will cause some routines to perform like their Unix counterparts.
-This is necessary for Samba to work but not a generally desirable feature.
-You have some Unix-like behaviour, but the environment itself is not
-completely Unix- or POSIX-compliant. And it shouldn't be. Don't make the
-mistake of trying to mold the environment into a POSIX emulation. It
-doesn't work; AmigaOS is not Unix.
-
-
-7. The startup code
-
-There are three program startup files provided. The most simplistic is in
-'startup.c' which I use for SAS/C. It just invokes the setup routine which
-eventually calls main() and drops straight into exit().
-
-The ncrt0.S file was adapted from the libnix startup code which sets up the
-base relative data area, if necessary (the SMALL_DATA preprocessor symbol
-must be defined).
-
-The nrcrt0.S file was adapted from libnix startup code, too, and sets up
-the base relative data area for programs to be made resident. Note that the
-geta4() stub is missing here; it wouldn't work in a resident program
-anyway.
-
-The ncrt0.S and nrcrt0.S files are considerably smaller and less complex
-than the libnix code they are based on. This is because in this library
-design all the more complex tasks are performed in the stdlib_main.c file
-rather than in assembly language.
-
-
-8. Documentation
-
-Well, you're reading it. There isn't anything much yet. You can consult the book
-"'C' - A reference manual" and you could look at the Open Group's Single Unix
-Specification at <http://www.opengroup.org/onlinepubs/007904975>.
-
-
-9. Legal status
-
-Because this library is in part based upon free software it would be uncourteous
-not to make it free software itself. The BSD license would probably be
-appropriate here.
-
-The PowerPC math library is based in part on work by Sun Microsystems:
-
-====================================================
-Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
-
-Developed at SunPro, a Sun Microsystems, Inc. business.
-Permission to use, copy, modify, and distribute this
-software is freely granted, provided that this notice
-is preserved.
-====================================================
-
-
-
-10. Contacting the author
-
-The basic work was done by Olaf Barthel during two weeks in July 2002. You
-can reach me at:
-
-   Olaf Barthel
-   Gneisenaustr. 43
-   D-31275 Lehrte
-
-Or via e-mail:
-
-   olsen@sourcery.han.de

library/GNUmakefile.68k

@@ -1,5 +1,5 @@
 #
-# $Id: GNUmakefile.68k,v 1.19 2004-12-26 10:28:56 obarthel Exp $
+# $Id: GNUmakefile.68k,v 1.84 2006-04-05 08:39:45 obarthel Exp $
 #
 # :ts=8
 #
@@ -12,7 +12,7 @@ RANLIB = ranlib
 COPY = copy clone buf=0
 DELETE = delete all quiet
 MAKEDIR = makedir
-MAKE = make -f GNUmakefile.68k
+MAKE = $(MAKE_COMMAND) -f GNUmakefile.68k
 
 ##############################################################################
 
@@ -21,7 +21,6 @@ LIBC_OBJS	= libc_objs
 LIBUNIX_OBJS	= libunix_objs
 LIBM_OBJS	= libm_objs
 LIBM881_OBJS	= libm881_objs
-LIBSTACK_OBJS	= libstack_objs
 LIBNET_OBJS	= libnet_objs
 LIBDEBUG_OBJS	= libdebug_objs
 LIBAMIGA_OBJS	= libamiga_objs
@@ -30,7 +29,6 @@ LIBC_OBJS	= $(TYPE)/libc_objs
 LIBUNIX_OBJS	= $(TYPE)/libunix_objs
 LIBM_OBJS	= $(TYPE)/libm_objs
 LIBM881_OBJS	= $(TYPE)/libm881_objs
-LIBSTACK_OBJS	= $(TYPE)/libstack_objs
 LIBNET_OBJS	= $(TYPE)/libnet_objs
 LIBDEBUG_OBJS	= $(TYPE)/libdebug_objs
 LIBAMIGA_OBJS	= $(TYPE)/libamiga_objs
@@ -58,10 +56,6 @@ $(LIBM881_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):m881]"
 	@$(CC) -o $(LIBM881_OBJS)/$*.o -c $(CFLAGS) -DM68881_FLOATING_POINT_SUPPORT -m68881 $<
 
-$(LIBSTACK_OBJS)/%.o : %.c
-	@echo "Compiling $< [$(TYPE):stack]"
-	@$(CC) -o $(LIBSTACK_OBJS)/$*.o -c $(CFLAGS) -DSTACK_EXTENSION $<
-
 $(LIBNET_OBJS)/%.o : %.c
 	@echo "Compiling $< [$(TYPE):net]"
 	@$(CC) -o $(LIBNET_OBJS)/$*.o -c $(CFLAGS) -DSOCKET_SUPPORT -DUSERGROUP_SUPPORT $<
@@ -77,40 +71,51 @@ $(LIBAMIGA_OBJS)/%.o : %.c
 ##############################################################################
 
 ifeq (small_data_020,$(TYPE))
-CODE_TYPE := -fbaserel -DSMALL_DATA -m68020-60 -DM68020
+CODE_TYPE	:= -m68020-60
+CODE_FLAGS	:= -fbaserel -DSMALL_DATA -DM68020 -DUSE_64_BIT_INTS
 endif
 
 ifeq (small_data,$(TYPE))
-CODE_TYPE := -fbaserel -DSMALL_DATA -m68000
+CODE_TYPE	:= -m68000
+CODE_FLAGS	:= -fbaserel -DSMALL_DATA
 endif
 
 ifeq (small_data32,$(TYPE))
-CODE_TYPE := -fbaserel32 -DSMALL_DATA32 -m68020-60 -DM68020
+CODE_TYPE	:= -m68020-60
+CODE_FLAGS	:= -fbaserel32 -DSMALL_DATA32 -DM68020 -DUSE_64_BIT_INTS
 endif
 
 ifeq (large_data_020,$(TYPE))
-CODE_TYPE := -m68020-60 -DM68020
+CODE_TYPE	:= -m68020-60
+CODE_FLAGS	:= -DM68020 -DUSE_64_BIT_INTS
 endif
 
 ifeq (large_data,$(TYPE))
-CODE_TYPE := -m68000
+CODE_TYPE	:= -m68000
+CODE_FLAGS	:=
 endif
 
 ##############################################################################
 
 WARNINGS = \
-	-Wall -W -Wshadow -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
-	-Wundef -Wbad-function-cast -Wmissing-declarations -Wconversion
+	-Wall -W -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
+	-Wundef -Wbad-function-cast -Wmissing-declarations -Wunused
+
+#	-Wconversion -Wshadow
 
 INCLUDES = -Iinclude -I. -Inetinclude
- OPTIONS = -DNDEBUG -fno-builtin
-#OPTIONS = -D__MEM_DEBUG -fno-builtin
-#OPTIONS = -DDEBUG -D__MEM_DEBUG -DNO_INLINE_STDARG -fno-builtin
-#OPTIMIZE = -O -fomit-frame-pointer -fstrength-reduce -finline-functions
+#OPTIONS = -fno-builtin -fno-common -DDEBUG
+ OPTIONS = -fno-builtin -fno-common -DNDEBUG
+#OPTIONS = -fno-builtin -fno-common -DNDEBUG -D__THREAD_SAFE
+#OPTIONS = -fno-builtin -fno-common -D__MEM_DEBUG
+#OPTIONS = -fno-builtin -fno-common -DDEBUG -D__MEM_DEBUG -DNO_INLINE_STDARG
+ OPTIMIZE = -O -fomit-frame-pointer -fstrength-reduce -finline-functions
 #OPTIMIZE = -O2 -fomit-frame-pointer
-#DEBUG = -g2
+#DEBUG = -g
 
-CFLAGS = $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(CODE_TYPE) $(INCLUDES)
+CFLAGS = \
+	$(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) \
+	$(CODE_FLAGS) $(CODE_TYPE) $(INCLUDES)
 
 ##############################################################################
 
@@ -119,6 +124,7 @@ C_LIB = \
 	ctype_isalnum.o \
 	ctype_isalpha.o \
 	ctype_isascii.o \
+	ctype_isblank.o \
 	ctype_iscntrl.o \
 	ctype_isdigit.o \
 	ctype_isgraph.o \
@@ -128,27 +134,34 @@ C_LIB = \
 	ctype_isspace.o \
 	ctype_isupper.o \
 	ctype_isxdigit.o \
+	ctype_table.o \
 	ctype_tolower.o \
 	ctype_toupper.o \
-	ctype_table.o \
 	dirent_closedir.o \
-	dirent_data.o \
-	dirent_rewinddir.o \
 	dirent_opendir.o \
 	dirent_readdir.o \
+	dirent_rewinddir.o \
 	errno_data.o \
 	fcntl_close.o \
 	fcntl_creat.o \
 	fcntl_fcntl.o \
+	fcntl_get_default_file.o \
+	fcntl_lock.o \
 	fcntl_lseek.o \
 	fcntl_open.o \
 	fcntl_read.o \
 	fcntl_write.o \
-	fcntl_get_default_file.o \
+	ftw_ftw.o \
+	ftw_nftw.o \
+	inttypes_imaxdiv.o \
+	inttypes_imaxabs.o \
+	inttypes_strtoimax.o \
+	inttypes_strtoumax.o \
 	libgen_basename.o \
 	libgen_dirname.o \
 	locale_init_exit.o \
 	locale_localeconv.o \
+	locale_open_locale.o \
 	locale_setlocale.o \
 	mount_convertinfo.o \
 	mount_fstatfs.o \
@@ -156,6 +169,7 @@ C_LIB = \
 	signal_checkabort.o \
 	signal_data.o \
 	signal_kill.o \
+	signal_mask.o \
 	signal_raise.o \
 	signal_sigaddset.o \
 	signal_sigblock.o \
@@ -166,7 +180,6 @@ C_LIB = \
 	signal_sigsetmask.o \
 	stat_chmod.o \
 	stat_convertfileinfo.o \
-	stat_data.o \
 	stat_fchmod.o \
 	stat_fstat.o \
 	stat_lstat.o \
@@ -176,21 +189,23 @@ C_LIB = \
 	stat_umask.o \
 	stdio_asprintf.o \
 	stdio_clearerr.o \
-	stdio_data.o \
 	stdio_dropiobreadbuffer.o \
 	stdio_duplicate_fd.o \
+	stdio_examine_fh.o \
 	stdio_fclose.o \
 	stdio_fdhookentry.o \
 	stdio_feof.o \
 	stdio_ferror.o \
 	stdio_fflush.o \
-	stdio_flush.o \
 	stdio_fgetc.o \
 	stdio_fgetpos.o \
 	stdio_fgets.o \
 	stdio_filliobreadbuffer.o \
 	stdio_findvacantfdentry.o \
 	stdio_findvacantiobentry.o \
+	stdio_flockfile.o \
+	stdio_flush.o \
+	stdio_flush_all_files.o \
 	stdio_flushiobwritebuffer.o \
 	stdio_fopen.o \
 	stdio_fprintf.o \
@@ -200,29 +215,42 @@ C_LIB = \
 	stdio_freopen.o \
 	stdio_fscanf.o \
 	stdio_fseek.o \
+	stdio_fseeko.o \
 	stdio_fsetpos.o \
 	stdio_ftell.o \
+	stdio_ftello.o \
+	stdio_ftrylockfile.o \
+	stdio_funlockfile.o \
 	stdio_fwrite.o \
 	stdio_getc.o \
+	stdio_getc_unlocked.o \
 	stdio_getchar.o \
-	stdio_get_file_descriptor.o \
+	stdio_getchar_unlocked.o \
 	stdio_gets.o \
+	stdio_get_file_descriptor.o \
 	stdio_growfdtable.o \
 	stdio_growiobtable.o \
+	stdio_grow_file.o \
 	stdio_initializefd.o \
 	stdio_initializeiob.o \
 	stdio_init_exit.o \
+	stdio_file_init.o \
 	stdio_iobhookentry.o \
+	stdio_lock.o \
 	stdio_locksemaphorename.o \
 	stdio_nostdio.o \
 	stdio_openiob.o \
+	stdio_parent_of_fh.o \
 	stdio_perror.o \
 	stdio_popen.o \
 	stdio_printf.o \
 	stdio_putc.o \
+	stdio_putc_unlocked.o \
 	stdio_putchar.o \
+	stdio_putchar_unlocked.o \
 	stdio_puts.o \
 	stdio_remove.o \
+	stdio_remove_fd_alias.o \
 	stdio_rename.o \
 	stdio_rewind.o \
 	stdio_scanf.o \
@@ -236,6 +264,7 @@ C_LIB = \
 	stdio_tmpnam.o \
 	stdio_translateioerror.o \
 	stdio_ungetc.o \
+	stdio_unlockfile.o \
 	stdio_vasprintf.o \
 	stdio_vasprintf_hook_entry.o \
 	stdio_vfprintf.o \
@@ -245,20 +274,23 @@ C_LIB = \
 	stdio_vsnprintf_hook_entry.o \
 	stdio_vsprintf.o \
 	stdio_vsprintf_hook_entry.o \
+	stdio_vsscanf.o \
+	stdio_vscanf.o \
 	stdlib_abort.o \
 	stdlib_abs.o \
 	stdlib_alloca.o \
+	stdlib_alloca_cleanup.o \
+	stdlib_alloca_trap.o \
 	stdlib_assertion_failure.o \
 	stdlib_atexit.o \
 	stdlib_atoi.o \
 	stdlib_atol.o \
+	stdlib_atoll.o \
 	stdlib_bsearch.o \
 	stdlib_calloc.o \
 	stdlib_checkdetach.o \
 	stdlib_constructor.o \
 	stdlib_constructor_begin.o \
-	stdlib_constructor_end.o \
-	stdlib_data.o \
 	stdlib_default_pool_size.o \
 	stdlib_default_puddle_size.o \
 	stdlib_destructor.o \
@@ -272,12 +304,19 @@ C_LIB = \
 	stdlib_free.o \
 	stdlib_getdefstacksize.o \
 	stdlib_getenv.o \
+	stdlib_getmemstats.o \
 	stdlib_getsp.o \
-	stdlib_init_exit.o \
+	stdlib_get_errno.o \
 	stdlib_isresident.o \
 	stdlib_labs.o \
+	stdlib_llabs.o \
 	stdlib_ldiv.o \
+	stdlib_lldiv.o \
+	stdlib_lib_main.o \
+	stdlib_lib_startup.o \
 	stdlib_machine_test.o \
+	stdlib_main.o \
+	stdlib_main_stub.o \
 	stdlib_malloc.o \
 	stdlib_math.o \
 	stdlib_mkdtemp.o \
@@ -290,17 +329,21 @@ C_LIB = \
 	stdlib_oslibversion.o \
 	stdlib_priority.o \
 	stdlib_process_name.o \
+	stdlib_program_name.o \
 	stdlib_putenv.o \
 	stdlib_qsort.o \
 	stdlib_rand.o \
+	stdlib_rand_r.o \
 	stdlib_realloc.o \
 	stdlib_red_black.o \
+	stdlib_resetmemstats.o \
+	stdlib_semaphore.o \
 	stdlib_setenv.o \
 	stdlib_setjmp.o \
+	stdlib_set_errno.o \
 	stdlib_set_process_window.o \
 	stdlib_shell_escape.o \
 	stdlib_showerror.o \
-	stdlib_socket.o \
 	stdlib_srand.o \
 	stdlib_stackargbytes.o \
 	stdlib_stackcheck.o \
@@ -308,22 +351,23 @@ C_LIB = \
 	stdlib_stacksafezone.o \
 	stdlib_stacksize.o \
 	stdlib_stack_usage.o \
-	stdlib_startup.o \
+	stdlib_arg.o \
+	stdlib_stdio_window_spec.o \
 	stdlib_strtol.o \
-	stdlib_strtoul.o \
 	stdlib_strtoll.o \
+	stdlib_strtoul.o \
 	stdlib_strtoull.o \
 	stdlib_swapstack.o \
 	stdlib_sysbase.o \
 	stdlib_system.o \
 	stdlib_termination_message.o \
 	stdlib_threshold.o \
+	stdlib_utilitybase.o \
 	stdlib_udivsi3.o \
 	stdlib_udivsi4.o \
 	stdlib_umodsi3.o \
 	stdlib_unsetenv.o \
-	stdlib_wildcard_expand.o \
-	stdlib_stdio_window_spec.o \
+	strings_ffs.o \
 	strings_strcasecmp.o \
 	strings_strncasecmp.o \
 	string_bcmp.o \
@@ -361,9 +405,12 @@ C_LIB = \
 	time_asctime_r.o \
 	time_clock.o \
 	time_converttime.o \
+	time_convert_datestamp.o \
+	time_convert_time.o \
 	time_ctime.o \
 	time_ctime_r.o \
 	time_data.o \
+	time_days_per_date.o \
 	time_gettimeofday.o \
 	time_gmtime.o \
 	time_gmtime_r.o \
@@ -373,6 +420,9 @@ C_LIB = \
 	time_numbertostring.o \
 	time_strftime.o \
 	time_time.o \
+	time_weekday.o \
+	uio_readv.o \
+	uio_writev.o \
 	unistd_access.o \
 	unistd_chdir.o \
 	unistd_chdir_exit.o \
@@ -381,8 +431,10 @@ C_LIB = \
 	unistd_dup.o \
 	unistd_dup2.o \
 	unistd_fchown.o \
+	unistd_fdatasync.o \
 	unistd_fdopen.o \
 	unistd_fileno.o \
+	unistd_fsync.o \
 	unistd_ftruncate.o \
 	unistd_getcwd.o \
 	unistd_getopt.o \
@@ -391,21 +443,23 @@ C_LIB = \
 	unistd_isatty.o \
 	unistd_lchown.o \
 	unistd_link.o \
+	unistd_lockf.o \
 	unistd_readlink.o \
 	unistd_realpath.o \
 	unistd_sleep.o \
 	unistd_symlink.o \
+	unistd_sync_fd.o \
 	unistd_timer.o \
 	unistd_time_delay.o \
 	unistd_truncate.o \
 	unistd_unlink.o \
 	unistd_usleep.o \
-	utime_utime.o
+	utime_utime.o \
+	utsname_uname.o
 
 UNIX_LIB = \
 	unix.lib_rev.o \
 	dirent_closedir.o \
-	dirent_data.o \
 	dirent_rewinddir.o \
 	dirent_opendir.o \
 	dirent_readdir.o \
@@ -413,6 +467,7 @@ UNIX_LIB = \
 	fcntl_fcntl.o \
 	fcntl_open.o \
 	fcntl_get_default_file.o \
+	getopt_getopt_long.o \
 	mount_convertinfo.o \
 	mount_statfs.o \
 	stat_chmod.o \
@@ -421,19 +476,46 @@ UNIX_LIB = \
 	stat_mkdir.o \
 	stat_rmdir.o \
 	stat_stat.o \
+	stdio_ctermid.o \
 	stdio_fdhookentry.o \
 	stdio_fflush.o \
 	stdio_fopen.o \
 	stdio_init_exit.o \
+	stdio_file_init.o \
 	stdio_locksemaphorename.o \
 	stdio_openiob.o \
 	stdio_popen.o \
+	stdio_record_locking.o \
 	stdio_remove.o \
 	stdio_rename.o \
+	stdlib_alloca.o \
+	stdlib_alloca_cleanup.o \
+	stdlib_alloca_trap.o \
+	stdlib_arg.o \
+	stdlib_getmemstats.o \
+	stdlib_main.o \
+	stdlib_main_stub.o \
 	stdlib_mkdtemp.o \
 	stdlib_mkstemp.o \
 	stdlib_mktemp.o \
+	stdlib_malloc.o \
+	stdlib_realloc.o \
+	stdlib_resetmemstats.o \
 	stdlib_system.o \
+	termios_cfgetispeed.o \
+	termios_cfgetospeed.o \
+	termios_cfmakeraw.o \
+	termios_cfsetispeed.o \
+	termios_cfsetospeed.o \
+	termios_console_fdhookentry.o \
+	termios_tcdrain.o \
+	termios_tcflow.o \
+	termios_tcflush.o \
+	termios_tcgetattr.o \
+	termios_tcsendbreak.o \
+	termios_tcsetattr.o \
+	uio_readv.o \
+	uio_writev.o \
 	unistd_access.o \
 	unistd_chdir.o \
 	unistd_chdir_exit.o \
@@ -441,53 +523,164 @@ UNIX_LIB = \
 	unistd_getcwd.o \
 	unistd_lchown.o \
 	unistd_link.o \
+	unistd_lockf.o \
 	unistd_readlink.o \
 	unistd_realpath.o \
 	unistd_restorepathname.o \
 	unistd_setcurrentpath.o \
 	unistd_strip_double_slash.o \
+	unistd_symlink.o \
 	unistd_translatea2u.o \
 	unistd_translaterel.o \
 	unistd_translateu2a.o \
 	unistd_truncate.o \
+	unistd_ttyname.o \
+	unistd_ttyname_r.o \
 	unistd_unix_path_semantics.o \
 	unistd_unlink.o \
 	unistd_wildcard_expand.o \
 	utime_utime.o
 
 MATH_LIB = \
+	complex_carg.o \
+	complex_cargf.o \
+	complex_cargl.o \
+	complex_cimag.o \
+	complex_cimagf.o \
+	complex_cimagl.o \
+	complex_conj.o \
+	complex_conjf.o \
+	complex_conjl.o \
+	complex_creal.o \
+	complex_crealf.o \
+	complex_creall.o \
+	fenv_feclearexcept.o \
+	fenv_fegetenv.o \
+	fenv_fegetexceptflag.o \
+	fenv_fegetround.o \
+	fenv_feholdexcept.o \
+	fenv_feraiseexcept.o \
+	fenv_fesetenv.o \
+	fenv_fesetexceptflag.o \
+	fenv_fetestexcept.o \
+	fenv_fetestround.o \
+	fenv_feupdateenv.o \
 	math_acos.o \
+	math_acosf.o \
+	math_acosh.o \
+	math_acoshf.o \
 	math_asin.o \
+	math_asinf.o \
+	math_asinh.o \
+	math_asinhf.o \
 	math_atan.o \
 	math_atan2.o \
+	math_atan2f.o \
+	math_atanf.o \
+	math_atanh.o \
+	math_atanhf.o \
+	math_cbrt.o \
+	math_cbrtf.o \
 	math_ceil.o \
+	math_ceilf.o \
+	math_copysign.o \
+	math_copysignf.o \
 	math_cos.o \
+	math_cosf.o \
 	math_cosh.o \
-	math_data.o \
+	math_coshf.o \
+	math_erf.o \
+	math_erfc.o \
+	math_erfcf.o \
+	math_erff.o \
 	math_exp.o \
+	math_exp2.o \
+	math_exp2f.o \
+	math_expf.o \
+	math_expm1.o \
+	math_expm1f.o \
 	math_fabs.o \
+	math_fabsf.o \
 	math_floor.o \
+	math_floorf.o \
+	math_fma.o \
+	math_fmaf.o \
 	math_fmod.o \
+	math_fmodf.o \
+	math_fpclassify.o \
 	math_frexp.o \
+	math_frexpf.o \
+	math_huge_val.o \
+	math_huge_valf.o \
 	math_hypot.o \
+	math_hypotf.o \
+	math_ilogb.o \
+	math_ilogbf.o \
+	math_inf.o \
+	math_inff.o \
 	math_init_exit.o \
-	math_isinf.o \
-	math_isnan.o \
+	math_isfinite.o \
+	math_isunordered.o \
+	math_kernel_cosf.o \
+	math_kernel_sinf.o \
+	math_kernel_tanf.o \
 	math_ldexp.o \
+	math_ldexpf.o \
+	math_lgamma.o \
+	math_lgammaf.o \
 	math_log.o \
 	math_log10.o \
+	math_log10f.o \
+	math_log1p.o \
+	math_log1pf.o \
+	math_log2.o \
+	math_log2f.o \
 	math_logb.o \
+	math_logbf.o \
+	math_logf.o \
+	math_lrint.o \
+	math_lrintf.o \
+	math_lround.o \
+	math_lroundf.o \
 	math_modf.o \
+	math_modff.o \
+	math_nan.o \
+	math_nanf.o \
+	math_nearbyint.o \
+	math_nearbyintf.o \
+	math_nextafter.o \
+	math_nextafterf.o \
 	math_pow.o \
+	math_powf.o \
+	math_remainder.o \
+	math_remainderf.o \
+	math_remquo.o \
+	math_remquof.o \
+	math_rem_pio2f.o \
 	math_rint.o \
 	math_rintf.o \
+	math_round.o \
+	math_roundf.o \
+	math_scalbn.o \
+	math_scalbnf.o \
+	math_signbit.o \
 	math_sin.o \
+	math_sinf.o \
 	math_sinh.o \
+	math_sinhf.o \
 	math_sqrt.o \
+	math_sqrtf.o \
 	math_tan.o \
+	math_tanf.o \
 	math_tanh.o \
+	math_tanhf.o \
+	math_tgamma.o \
+	math_tgammaf.o \
+	math_trunc.o \
+	math_truncf.o \
 	stdio_asprintf.o \
 	stdio_flush.o \
+	stdio_flush_all_files.o \
 	stdio_fprintf.o \
 	stdio_fscanf.o \
 	stdio_printf.o \
@@ -498,12 +691,14 @@ MATH_LIB = \
 	stdio_vasprintf.o \
 	stdio_vfprintf.o \
 	stdio_vfscanf.o \
+	stdio_vsscanf.o \
+	stdio_vscanf.o \
 	stdio_vprintf.o \
 	stdio_vsnprintf.o \
 	stdio_vsprintf.o \
 	stdlib_atof.o \
-	stdlib_machine_test.o \
 	stdlib_strtod.o \
+	stdlib_strtof.o \
 	time_difftime.o
 
 MATH_LIB_881 = \
@@ -544,20 +739,12 @@ MATH_LIB_IEEE = \
 	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_check_daemon.o \
 	socket_connect.o \
-	socket_data.o \
 	socket_gethostbyaddr.o \
 	socket_gethostbyname.o \
 	socket_gethostid.o \
@@ -583,10 +770,13 @@ NET_LIB = \
 	socket_ioctl.o \
 	socket_isdaemon.o \
 	socket_listen.o \
+	socket_obtain_daemon.o \
 	socket_recv.o \
 	socket_recvfrom.o \
 	socket_recvmsg.o \
+	socket_select_signal.o \
 	socket_select.o \
+	socket_wait_select.o \
 	socket_send.o \
 	socket_sendmsg.o \
 	socket_sendto.o \
@@ -595,6 +785,8 @@ NET_LIB = \
 	socket_socket.o \
 	socket_hook_entry.o \
 	socket_hstrerror.o \
+	socket_get_h_errno.o \
+	socket_set_h_errno.o \
 	stat_umask.o \
 	usergroup_crypt.o \
 	usergroup_data.o \
@@ -624,7 +816,8 @@ NET_LIB = \
 	usergroup_setregid.o \
 	usergroup_setreuid.o \
 	usergroup_setsid.o \
-	usergroup_setuid.o
+	usergroup_setuid.o \
+	utsname_uname.o
 
 DEBUG_LIB = \
 	debug.lib_rev.o \
@@ -706,7 +899,7 @@ MEMDEBUG_LIB = \
 
 ##############################################################################
 
-LIBS_68K := $(LIBC_OBJS)/libc.a $(LIBSTACK_OBJS)/libstack.a $(LIBUNIX_OBJS)/libunix.a \
+LIBS_68K := $(LIBC_OBJS)/libc.a $(LIBUNIX_OBJS)/libunix.a \
             $(LIBNET_OBJS)/libnet.a $(LIBDEBUG_OBJS)/libdebug.a $(LIBAMIGA_OBJS)/libamiga.a \
             $(LIBM_OBJS)/libm.a
 LIBS_020 := $(LIBM881_OBJS)/libm881.a $(LIBS_68K)
@@ -714,7 +907,7 @@ LIBS_020 := $(LIBM881_OBJS)/libm881.a $(LIBS_68K)
 ##############################################################################
 
 # The 881 math library won't build in plain 68k mode
-ifneq (,$(findstring 68020,$(CODE_TYPE)))
+ifneq (,$(findstring 68020,$(CODE_FLAGS)))
 LIBS := $(LIBS_020)
 else
 LIBS := $(LIBS_68K)
@@ -722,7 +915,7 @@ endif
 
 ##############################################################################
 
-STARTUPS := nrcrt0.o nbcrt0.o nr32crt0.o nb32crt0.o ncrt0.o mainnb.o mainb.o mainb32.o
+STARTUPS := nrcrt0.o nbcrt0.o nr32crt0.o nb32crt0.o ncrt0.o
 
 ##############################################################################
 
@@ -732,9 +925,6 @@ all: \
 	lib/ncrt0.o \
 	lib/n32bcrt0.o \
 	lib/n32rcrt0.o \
-	lib/mainnb.o \
-	lib/mainb.o \
-	lib/mainb32.o \
 	lib/libm020/libm.a \
 	lib/libm.a \
 	lib/libb/libm.a \
@@ -746,7 +936,7 @@ all: \
 clean:
 	-$(DELETE) $(TYPE) $(LIBS_020) $(STARTUPS) \
 		$(LIBC_OBJS) $(LIBUNIX_OBJS) $(LIBM_OBJS) \
-		$(LIBM881_OBJS) $(LIBSTACK_OBJS) $(LIBNET_OBJS) $(LIBDEBUG_OBJS) \
+		$(LIBM881_OBJS) $(LIBNET_OBJS) $(LIBDEBUG_OBJS) \
 		$(LIBAMIGA_OBJS)
 
 realclean:
@@ -762,7 +952,6 @@ version:
 	copy clone c.lib_rev.rev m.lib_rev.rev
 	copy clone c.lib_rev.rev m881.lib_rev.rev
 	copy clone c.lib_rev.rev net.lib_rev.rev
-	copy clone c.lib_rev.rev stack.lib_rev.rev
 	copy clone c.lib_rev.rev unix.lib_rev.rev
 	bumprev 1 amiga.lib
 	bumprev 1 c.lib
@@ -770,7 +959,6 @@ version:
 	bumprev 1 m.lib
 	bumprev 1 m881.lib
 	bumprev 1 net.lib
-	bumprev 1 stack.lib
 	bumprev 1 unix.lib
 
 ##############################################################################
@@ -811,47 +999,38 @@ lib/libm020 : lib
 
 lib/libb/libm020/libm.a: lib lib/libb/libm020
 	$(MAKE) TYPE=small_data_020 kitchen_sink
-	$(COPY) $(foreach file,$(LIBS_020),small_data_020/$(file)) lib/libb/libm020
+	@$(COPY) $(foreach file,$(LIBS_020),small_data_020/$(file)) lib/libb/libm020
 
 lib/libb/libm.a: lib lib/libb
 	$(MAKE) TYPE=small_data kitchen_sink
-	$(COPY) $(foreach file,$(LIBS_68K),small_data/$(file)) lib/libb
+	@$(COPY) $(foreach file,$(LIBS_68K),small_data/$(file)) lib/libb
 
 lib/libb32/libm020/libm.a: lib lib/libb32 lib/libb32/libm020
 	$(MAKE) TYPE=small_data32 kitchen_sink
-	$(COPY) $(foreach file,$(LIBS_020),small_data32/$(file)) lib/libb32/libm020
+	@$(COPY) $(foreach file,$(LIBS_020),small_data32/$(file)) lib/libb32/libm020
 
 lib/libm020/libm.a: lib lib/libm020
 	$(MAKE) TYPE=large_data_020 kitchen_sink
-	$(COPY) $(foreach file,$(LIBS_020),large_data_020/$(file)) lib/libm020
+	@$(COPY) $(foreach file,$(LIBS_020),large_data_020/$(file)) lib/libm020
 
 lib/libm.a: lib
 	$(MAKE) TYPE=large_data kitchen_sink
-	$(COPY) $(foreach file,$(LIBS_68K),large_data/$(file)) lib
+	@$(COPY) $(foreach file,$(LIBS_68K),large_data/$(file)) lib
 
 lib/nrcrt0.o : lib nrcrt0.o
-	$(COPY) nrcrt0.o lib
+	@$(COPY) nrcrt0.o lib
 
 lib/nbcrt0.o : lib nbcrt0.o
-	$(COPY) nbcrt0.o lib
+	@$(COPY) nbcrt0.o lib
 
 lib/ncrt0.o : lib ncrt0.o
-	$(COPY) ncrt0.o lib
+	@$(COPY) ncrt0.o lib
 
 lib/n32bcrt0.o : lib nb32crt0.o
-	$(COPY) nb32crt0.o lib
+	@$(COPY) nb32crt0.o lib
 
 lib/n32rcrt0.o : lib nr32crt0.o
-	$(COPY) nr32crt0.o lib
-
-lib/mainnb.o : lib mainnb.o
-	$(COPY) mainnb.o lib
-
-lib/mainb.o : lib mainb.o
-	$(COPY) mainb.o lib
-
-lib/mainb32.o : lib mainb32.o
-	$(COPY) mainb32.o lib
+	@$(COPY) nr32crt0.o lib
 
 ##############################################################################
 
@@ -863,8 +1042,6 @@ $(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)/c.lib_rev.o : c.lib_rev.c c.lib_rev.h
@@ -875,8 +1052,6 @@ $(LIBM_OBJS)/m.lib_rev.o : m.lib_rev.c m.lib_rev.h
 
 $(LIBM881_OBJS)/m881.lib_rev.o : m881.lib_rev.c m881.lib_rev.h
 
-$(LIBSTACK_OBJS)/stack.lib_rev.o : stack.lib_rev.c stack.lib_rev.h
-
 $(LIBNET_OBJS)/net.lib_rev.o : net.lib_rev.c net.lib_rev.h
 
 $(LIBDEBUG_OBJS)/debug.lib_rev.o : debug.lib_rev.c debug.lib_rev.h
@@ -887,21 +1062,46 @@ $(LIBAMIGA_OBJS)/amiga.lib_rev.o : amiga.lib_rev.c amiga.lib_rev.h
 
 $(LIBC_OBJS)/stdlib_stacksize.o : stdlib_stacksize.c stdlib_gcc_help.h
 
+$(LIBC_OBJS)/stdlib_getdefstacksize.o : stdlib_getdefstacksize.c stdlib_gcc_help.h
+
 $(LIBC_OBJS)/stdlib_shell_escape.o : stdlib_shell_escape.c stdlib_gcc_help.h
 
-$(LIBC_OBJS)/stdlib_alloca.o : stdlib_alloca.c stdlib_mem_debug.h
+$(LIBC_OBJS)/stdlib_alloca.o : stdlib_alloca.c stdlib_memory.h
 
-$(LIBC_OBJS)/stdlib_calloc.o : stdlib_calloc.c stdlib_mem_debug.h
+$(LIBC_OBJS)/stdlib_calloc.o : stdlib_calloc.c stdlib_memory.h
 
-$(LIBC_OBJS)/stdlib_free.o : stdlib_free.c stdlib_mem_debug.h
+$(LIBC_OBJS)/stdlib_free.o : stdlib_free.c stdlib_memory.h
 
-$(LIBC_OBJS)/stdlib_init_exit.o : stdlib_init_exit.c stdlib_mem_debug.h
+$(LIBC_OBJS)/stdlib_malloc.o : stdlib_malloc.c stdlib_memory.h
 
-$(LIBC_OBJS)/stdlib_malloc.o : stdlib_malloc.c stdlib_mem_debug.h
+$(LIBC_OBJS)/stdlib_realloc.o : stdlib_realloc.c stdlib_memory.h
 
-$(LIBC_OBJS)/stdlib_realloc.o : stdlib_realloc.c stdlib_mem_debug.h
+$(LIBC_OBJS)/stdlib_red_black.o : stdlib_red_black.c stdlib_memory.h
 
-$(LIBC_OBJS)/stdlib_red_black.o : stdlib_red_black.c stdlib_mem_debug.h
+##############################################################################
+
+# The -fbaserel32 option requires the CPU type to be 68020, too.
+ifneq (,$(findstring fbaserel32,$(CODE_FLAGS)))
+LOCAL_CODE_FLAGS := $(CODE_FLAGS) $(CODE_TYPE)
+else
+LOCAL_CODE_FLAGS := $(CODE_FLAGS)
+endif
+
+$(LIBM881_OBJS)/math_init_exit.o : math_init_exit.c
+	@echo "Compiling $< [$(TYPE):m881]"
+	@$(CC) -o $(LIBM881_OBJS)/math_init_exit.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) -DM68881_FLOATING_POINT_SUPPORT $(INCLUDES) $<
+
+$(LIBC_OBJS)/stdlib_machine_test.o : stdlib_machine_test.c
+	@echo "Compiling $< [$(TYPE):c]"
+	@$(CC) -o $(LIBC_OBJS)/stdlib_machine_test.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) $<
+
+$(LIBC_OBJS)/stdlib_showerror.o : stdlib_showerror.c
+	@echo "Compiling $< [$(TYPE):c]"
+	@$(CC) -o $(LIBC_OBJS)/stdlib_showerror.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) $<
+
+$(LIBC_OBJS)/stdlib_main.o : stdlib_main.c
+	@echo "Compiling $< [$(TYPE):c]"
+	@$(CC) -o $(LIBC_OBJS)/stdlib_main.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(LOCAL_CODE_FLAGS) $(INCLUDES) stdlib_main.c
 
 ##############################################################################
 
@@ -991,16 +1191,6 @@ $(LIBM881_OBJS)/libm881.a : $(LIBM881_OBJS) $(foreach file,$(MATH_LIB_881),$(LIB
 
 ##############################################################################
 
-$(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) $@
 
@@ -1032,25 +1222,49 @@ $(LIBAMIGA_OBJS)/libamiga.a : $(LIBAMIGA_OBJS) $(foreach file,$(AMIGA_LIB),$(LIB
 ##############################################################################
 
 nrcrt0.o : nrcrt0.S
-	$(CC) -traditional -o $@ -c nrcrt0.S
+	@echo "Assembling $< [resident]"
+	@$(CC) -traditional -o $@ -c nrcrt0.S
 
 nr32crt0.o : nrcrt0.S
-	$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c nrcrt0.S
+	@echo "Assembling $< [resident32]"
+	@$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c nrcrt0.S
 
 nbcrt0.o : ncrt0.S
-	$(CC) -traditional -DSMALL_DATA -o $@ -c ncrt0.S
+	@echo "Assembling $< [small_data]"
+	@$(CC) -traditional -DSMALL_DATA -o $@ -c ncrt0.S
 
 nb32crt0.o : ncrt0.S
-	$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c ncrt0.S
+	@echo "Assembling $< [small_data32]"
+	@$(CC) -traditional -m68020 -DSMALL_DATA32 -o $@ -c ncrt0.S
 
 ncrt0.o : ncrt0.S
-	$(CC) -traditional -o $@ -c ncrt0.S
+	@echo "Assembling $< [large_data]"
+	@$(CC) -traditional -o $@ -c ncrt0.S
 
-mainb32.o : stdlib_main.c
-	$(CC) -o mainb32.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -fbaserel32 -DSMALL_DATA32 -m68020-60 -DM68020 stdlib_main.c
+##############################################################################
 
-mainb.o : stdlib_main.c
-	$(CC) -o mainb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -fbaserel -DSMALL_DATA -m68000 stdlib_main.c
+CONSTRUCTOR_FILES = \
+	amiga_rexxvars.c \
+	dirent_closedir.c \
+	locale_init_exit.c \
+	math_init_exit.c \
+	sas_profile.c \
+	socket_init_exit.c \
+	stdio_file_init.c \
+	stdio_init_exit.c \
+	stdlib_alloca.c \
+	stdlib_arg.c \
+	stdlib_malloc.c \
+	stdlib_program_name.c \
+	stdlib_setenv.c \
+	stdlib_stackcheck.c \
+	stdlib_stackextension.c \
+	time_clock.c \
+	unistd_chdir_exit.c \
+	unistd_init_exit.c \
+	unistd_timer.c \
+	unistd_wildcard_expand.c \
+	usergroup_init_exit.c
 
-mainnb.o : stdlib_main.c
-	$(CC) -o mainnb.o -c $(WARNINGS) $(OPTIMIZE) $(DEBUG) $(OPTIONS) $(INCLUDES) -m68000 stdlib_main.c
+touch_constructor_files:
+	touch $(CONSTRUCTOR_FILES)

library/TODO

@@ -0,0 +1,5 @@
+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.

library/amiga.lib_rev.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga.lib_rev.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga.lib_rev.c,v 1.3 2006-01-08 12:04:21 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	185
-#define DATE		"2.1.2005"
-#define VERS		"amiga.lib 1.185"
-#define VSTRING		"amiga.lib 1.185 (2.1.2005)\r\n"
-#define VERSTAG		"\0$VER: amiga.lib 1.185 (2.1.2005)"
+#define REVISION	200
+#define DATE		"17.4.2006"
+#define VERS		"amiga.lib 1.200"
+#define VSTRING		"amiga.lib 1.200 (17.4.2006)\r\n"
+#define VERSTAG		"\0$VER: amiga.lib 1.200 (17.4.2006)"

library/amiga.lib_rev.rev

@@ -1 +1 @@
-185
+200

library/amiga_acrypt.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_acrypt.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_acrypt.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -31,10 +31,14 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define ACrypt __ACrypt
+
 #include <exec/types.h>
 #include <string.h>
 #include <clib/alib_protos.h>
 
+#undef ACrypt
+
 /****************************************************************************/
 
 #include "debug.h"

library/amiga_addtof.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_addtof.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_addtof.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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;

library/amiga_argarraydone.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argarraydone.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_argarraydone.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_argarrayinit.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argarrayinit.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_argarrayinit.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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)
 {
-	unsigned char ** result = NULL;
+	STRPTR * result = NULL;
 
 	if(argc != 0) /* run from CLI */
 	{
-		int i;
+		LONG i;
 
 		if(argc == 1)
 			goto out; /* skip command name */

library/amiga_argint.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argint.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_argint.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_argstring.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_argstring.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_argstring.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_beginio.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_beginio.c,v 1.3 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_beginio.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_callhook.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_callhook.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_callhook.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_callhooka.asm

@@ -1,10 +1,10 @@
 *
-*	$Id: amiga_callhooka.asm,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+*	$Id: amiga_callhooka.asm,v 1.3 2006-01-08 12:04:22 obarthel Exp $
 *
 *	:ts=8
 *
 *	Portable ISO 'C' (1994) runtime library for the Amiga computer
-*	Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+*	Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
 *	All rights reserved.
 *
 *	Redistribution and use in source and binary forms, with or without

library/amiga_callhooka.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_callhooka.c,v 1.2 2005-01-02 09:07:06 obarthel Exp $
+ * $Id: amiga_callhooka.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_coercemethod.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_coercemethod.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_coercemethod.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_createextio.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createextio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_createextio.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_createport.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createport.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_createport.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_createstdio.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createstdio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_createstdio.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_createtask.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_createtask.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_createtask.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,6 +46,12 @@
 
 /****************************************************************************/
 
+#ifndef _STDLIB_PROFILE_H
+#include "stdlib_profile.h"
+#endif /* _STDLIB_PROFILE_H */
+
+/****************************************************************************/
+
 #include "macros.h"
 #include "debug.h"
 

library/amiga_deleteextio.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deleteextio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_deleteextio.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_deleteport.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deleteport.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_deleteport.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_deletestdio.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deletestdio.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_deletestdio.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_deletetask.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_deletetask.c,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_deletetask.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_domethod.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_domethod.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_domethod.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_dosupermethod.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_dosupermethod.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_dosupermethod.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_dotimer.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_dotimer.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_dotimer.c,v 1.8 2006-04-05 06:43:56 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -44,11 +44,34 @@
 
 /****************************************************************************/
 
+#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)
 {
@@ -58,18 +81,38 @@ DoTimer(struct timeval *tv,LONG unit,LONG command)
 
 	assert( tv != NULL );
 
-	mp = AllocVec(sizeof(*mp),MEMF_ANY|MEMF_PUBLIC|MEMF_CLEAR);
-	if(mp == NULL)
+	#if defined(__amigaos4__)
 	{
-		error = IOERR_OPENFAIL;
-		goto out;
-	}
+		mp = AllocSysObjectTags(ASOT_PORT,
+			ASOPORT_Action,		PA_SIGNAL,
+			ASOPORT_AllocSig,	FALSE,
+			ASOPORT_Signal,		SIGB_SINGLE,
+			ASOPORT_Target,		FindTask(NULL),
+		TAG_DONE);
 
-	mp->mp_Node.ln_Type	= NT_MSGPORT;
-	mp->mp_Flags		= PA_SIGNAL;
-	mp->mp_SigBit		= SIGB_SINGLE;
-	mp->mp_SigTask		= FindTask(NULL);
-	NewList(&mp->mp_MsgList);
+		if(mp == NULL)
+		{
+			error = IOERR_OPENFAIL;
+			goto out;
+		}
+	}
+	#else
+	{
+		mp = AllocVec(sizeof(*mp),MEMF_ANY|MEMF_PUBLIC|MEMF_CLEAR);
+		if(mp == NULL)
+		{
+			error = IOERR_OPENFAIL;
+			goto out;
+		}
+
+		mp->mp_Node.ln_Type	= NT_MSGPORT;
+		mp->mp_Flags		= PA_SIGNAL;
+		mp->mp_SigBit		= SIGB_SINGLE;
+		mp->mp_SigTask		= FindTask(NULL);
+
+		NewList(&mp->mp_MsgList);
+	}
+	#endif /* __amigaos4__ */
 
 	tr = (struct timerequest *)CreateIORequest(mp,sizeof(*tr));
 	if(tr == NULL)
@@ -88,7 +131,7 @@ DoTimer(struct timeval *tv,LONG unit,LONG command)
 
 	PROFILE_OFF();
 
-	SetSignal(0,SIGF_SINGLE);
+	SetSignal(0,(1UL << mp->mp_SigBit));
 
 	error = DoIO((struct IORequest *)tr);
 
@@ -107,7 +150,16 @@ DoTimer(struct timeval *tv,LONG unit,LONG command)
 		DeleteIORequest((struct IORequest *)tr);
 	}
 
-	FreeVec(mp);
+	#if defined(__amigaos4__)
+	{
+		if(mp != NULL)
+			FreeSysObject(ASOT_PORT,mp);
+	}
+	#else
+	{
+		FreeVec(mp);
+	}
+	#endif /* __amigaos4__ */
 
 	return(error);
 }

library/amiga_fastrand.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_fastrand.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_fastrand.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_freeievents.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_freeievents.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_freeievents.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_hookentry.asm

@@ -1,10 +1,10 @@
 *
-*	$Id: amiga_hookentry.asm,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+*	$Id: amiga_hookentry.asm,v 1.3 2006-01-08 12:04:22 obarthel Exp $
 *
 *	:ts=8
 *
 *	Portable ISO 'C' (1994) runtime library for the Amiga computer
-*	Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+*	Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
 *	All rights reserved.
 *
 *	Redistribution and use in source and binary forms, with or without

library/amiga_hookentry.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_hookentry.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_hookentry.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_hotkey.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_hotkey.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_hotkey.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_invertstring.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_invertstring.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_invertstring.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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;

library/amiga_newlist.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_newlist.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_newlist.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_rangerand.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_rangerand.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_rangerand.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_remtof.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_remtof.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_remtof.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_rexxvars.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_rexxvars.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_rexxvars.c,v 1.7 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,12 +34,20 @@
 /* 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>
 
@@ -50,17 +58,17 @@
 
 /****************************************************************************/
 
-STATIC struct Library * RexxSysBase;
+static struct Library * RexxSysBase;
 
 /****************************************************************************/
 
 #if defined(__amigaos4__)
-STATIC struct RexxSysIFace * IRexxSys;
+static struct RexxSysIFace * IRexxSys;
 #endif /* __amigaos4__ */
 
 /****************************************************************************/
 
-CLIB_CONSTRUCTOR(__rexxvars_init)
+CLIB_CONSTRUCTOR(rexxvars_init)
 {
 	ENTER();
 
@@ -80,12 +88,14 @@ CLIB_CONSTRUCTOR(__rexxvars_init)
 	}
 	#endif /* __amigaos4__ */
 
+	LEAVE();
+
 	CONSTRUCTOR_SUCCEED();
 }
 
 /****************************************************************************/
 
-CLIB_DESTRUCTOR(__rexxvars_exit)
+CLIB_DESTRUCTOR(rexxvars_exit)
 {
 	ENTER();
 
@@ -144,7 +154,7 @@ CheckRexxMsg(struct RexxMsg *message)
 LONG
 GetRexxVar(struct RexxMsg *message,STRPTR variable_name,STRPTR *buffer_pointer)
 {
-	STATIC TEXT buffer[256];
+	static UBYTE buffer[256];
 	LONG result;
 
 	/* The following uses a function which was added to rexxsyslib.library V45.

library/amiga_setsuperattrs.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_setsuperattrs.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_setsuperattrs.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/amiga_timedelay.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_timedelay.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_timedelay.c,v 1.4 2006-04-05 06:43:56 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -39,6 +39,19 @@
 
 /****************************************************************************/
 
+/* 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)
 {

library/amiga_waitbeam.c

@@ -1,10 +1,10 @@
 /*
- * $Id: amiga_waitbeam.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: amiga_waitbeam.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/build_archive_amiga

@@ -0,0 +1,31 @@
+; 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
+

library/build_archive_unix.sh

@@ -0,0 +1,27 @@
+#!/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}
+

library/c.lib_rev.c

@@ -1,10 +1,10 @@
 /*
- * $Id: c.lib_rev.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: c.lib_rev.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/c.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	185
-#define DATE		"2.1.2005"
-#define VERS		"c.lib 1.185"
-#define VSTRING		"c.lib 1.185 (2.1.2005)\r\n"
-#define VERSTAG		"\0$VER: c.lib 1.185 (2.1.2005)"
+#define REVISION	200
+#define DATE		"17.4.2006"
+#define VERS		"c.lib 1.200"
+#define VSTRING		"c.lib 1.200 (17.4.2006)\r\n"
+#define VERSTAG		"\0$VER: c.lib 1.200 (17.4.2006)"

library/c.lib_rev.rev

@@ -1 +1 @@
-185
+200

library/complex_carg.c

@@ -1,10 +1,10 @@
 /*
- * $Id: stdlib_constructor_end.c,v 1.2 2005-01-02 09:07:08 obarthel Exp $
+ * $Id: complex_carg.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-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * 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
@@ -31,14 +31,22 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if defined(__amigaos4__)
+#ifndef _COMPLEX_HEADERS_H
+#include "complex_headers.h"
+#endif /* _COMPLEX_HEADERS_H */
 
 /****************************************************************************/
 
-/* End markers for the CTOR and DTOR list. */
-static volatile void (*__CTOR_LIST__[1]) (void) __attribute__((section(".ctors"))) = { (void *)0 };
-static volatile void (*__DTOR_LIST__[1]) (void) __attribute__((section(".dtors"))) = { (void *)0 };
+#if defined(COMPLEX_SUPPORT)
 
 /****************************************************************************/
 
-#endif /*__amigaos4__ */
+double
+carg(double complex z)
+{
+	return(atan2(IMAG(z),REAL(z)));
+}
+
+/****************************************************************************/
+
+#endif /* COMPLEX_SUPPORT */

library/complex_cargf.c

@@ -0,0 +1,52 @@
+/*
+ * $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 */

library/complex_cargl.c

@@ -0,0 +1,52 @@
+/*
+ * $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 */

library/complex_cimag.c

@@ -0,0 +1,52 @@
+/*
+ * $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 */

library/complex_cimagf.c

@@ -0,0 +1,52 @@
+/*
+ * $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 */

library/complex_cimagl.c

@@ -0,0 +1,52 @@
+/*
+ * $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 */

library/complex_conj.c

@@ -0,0 +1,52 @@
+/*
+ * $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 */

library/complex_conjf.c

@@ -0,0 +1,52 @@
+/*
+ * $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 */

library/complex_conjl.c

@@ -0,0 +1,52 @@
+/*
+ * $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 */

library/complex_creal.c

@@ -0,0 +1,52 @@
+/*
+ * $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 */

library/complex_crealf.c

@@ -0,0 +1,52 @@
+/*
+ * $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 */

library/complex_creall.c

@@ -0,0 +1,52 @@
+/*
+ * $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 */

library/complex_headers.h

@@ -0,0 +1,68 @@
+/*
+ * $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 */

library/crt0.S

@@ -1,11 +1,12 @@
 //
-//	$Id: crt0.S,v 1.2 2004-11-28 12:31:27 tfrieden Exp $
+//	$Id: crt0.S,v 1.6 2005-10-11 09:28:29 obarthel Exp $
 //
 //	:ts=4
 //
 
 	.text
 
+	.globl  main	/* This enforces linkage against the main() function */
 	.globl  _main
 	.globl  _start
 
@@ -25,16 +26,3 @@ _start:
 #endif
 
 	b	_main
-
-#if defined(BASEREL_DATA)
-	.section .rodata
-
-	.globl __data_segment_descriptor
-__data_segment_descriptor:
-	.long __data_start
-	.long __data_end
-	.long _DATA_BASE_
-
-	.section .dend, "wa", @nobits
-	.space 	4
-#endif

library/crtbegin.c

@@ -1,132 +1,43 @@
 /* 
- * $Id: crtbegin.c,v 1.3 2004-09-29 16:54:54 obarthel Exp $
+ * $Id: crtbegin.c,v 1.10 2005-03-18 12:38:22 obarthel Exp $
  *
  * :ts=4
  *
- * Handles global constructors and destructors.
+ * Handles global constructors and destructors for the OS4 GCC build.
  */
 
-#include <exec/types.h>
-
-/****************************************************************************/
-
-#include <stdlib.h>
-#include <setjmp.h>
-
-/****************************************************************************/
-
 #if defined(__amigaos4__)
 
 /****************************************************************************/
 
+#ifndef EXEC_TYPES_H
+#include <exec/types.h>
+#endif /* EXEC_TYPES_H */
+
+/****************************************************************************/
+
 /*
  * Dummy constructor and destructor array. The linker script will put these at the
  * very beginning of section ".ctors" and ".dtors". crtend.o contains a similar entry
  * 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__((section(".ctors"))) = { (void *)-1 };
-static void (*__DTOR_LIST__[1]) (void) __attribute__((section(".dtors"))) = { (void *)-1 };
-
-/****************************************************************************/
-
-static void
-_do_ctors(void)
-{
-	void (**pFuncPtr)(void);
-
-	/* Skip the first entry in the list (it's -1 anyway) */
-	pFuncPtr = __CTOR_LIST__ + 1;
-
-	/* Call all constructors in forward order */
-	while (*pFuncPtr != NULL)
-		(**pFuncPtr++)();
-}
-
-/****************************************************************************/
-
-static void
-_do_dtors(void)
-{
-	ULONG i = (ULONG)__DTOR_LIST__[0];
-	void (**pFuncPtr)(void);
-
-	if (i == ~0UL)
-	{
-		/* Find the end of the destructors list */
-		i = 1;
-
-		while (__DTOR_LIST__[i] != NULL)
-			i++;
-
-		/* We're at the NULL entry now. Go back by one */
-		i--;
-	}
-
-	/* Call all destructors in reverse order */
-	pFuncPtr = __DTOR_LIST__ + i;
-	while (i-- > 0)
-		(**pFuncPtr--)();
-}
-
-/****************************************************************************/
-
-#else
-
-/****************************************************************************/
-
-typedef void (*func_ptr)(void);
-
-/****************************************************************************/
-
-static void
-_do_ctors(void)
-{
-	extern func_ptr __CTOR_LIST__[];
-	ULONG nptrs = (ULONG)__CTOR_LIST__[0];
-	ULONG i;
-
-	for(i = nptrs ; i > 0 ; i--)
-		__CTOR_LIST__[i]();
-}
-
-/****************************************************************************/
-
-static void
-_do_dtors(void)
-{
-	extern func_ptr __DTOR_LIST__[];
-	extern jmp_buf __exit_jmp_buf;
-	ULONG nptrs = (ULONG)__DTOR_LIST__[0];
-	static ULONG i;
-
-	/* If one of the destructors drops into
-	 * exit(), processing will continue with
-	 * the next following destructor.
-	 */
-	(void)setjmp(__exit_jmp_buf);
-
-	while(i++ < nptrs)
-		__DTOR_LIST__[i]();
-}
-
-/****************************************************************************/
-
-#endif /*__amigaos4__ */
-
-/****************************************************************************/
-
-/* FIXME: Do we need to put these in .init/.fini sections? */
-
-//void _init(void) __attribute__((section(".init")));
-//void _fini(void) __attribute__((section(".fini")));
+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))) ));
 
 /****************************************************************************/
 
 void
 _init(void)
 {
-	_do_ctors();
+	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]();
 }
 
 /****************************************************************************/
@@ -134,5 +45,16 @@ _init(void)
 void
 _fini(void)
 {
-	_do_dtors();
+	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]();
 }
+
+/****************************************************************************/
+
+#endif /*__amigaos4__ */

library/crtend.c

@@ -1,5 +1,5 @@
 /* 
- * $Id: crtend.c,v 1.1.1.1 2004-07-26 16:30:22 obarthel Exp $
+ * $Id: crtend.c,v 1.2 2005-03-09 21:07:25 obarthel Exp $
  *
  * :ts=4
  *
@@ -10,9 +10,10 @@
 
 /****************************************************************************/
 
-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 };
+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))) ));
 
 /****************************************************************************/
 
 #endif /*__amigaos4__ */
+

library/ctype_headers.h

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_headers.h,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_headers.h,v 1.6 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,18 +42,25 @@
 
 /****************************************************************************/
 
-#ifndef _STDLIB_LOCALE_UTILITY_H
-#include "stdlib_locale_utility.h"
-#endif /* _STDLIB_LOCALE_UTILITY_H */
+#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 _MACROS_H
 #include "macros.h"
+#endif /* _MACROS_H */
 
 /****************************************************************************/
 
 #include <locale.h>
 #include <assert.h>
+#include <limits.h>
 #include <ctype.h>
 
 /****************************************************************************/

library/ctype_isalnum.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isalnum.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isalnum.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -49,16 +49,26 @@ isalnum(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
+	__locale_lock();
+
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
 
-		result = IsAlNum(__locale_table[LC_CTYPE],(ULONG)c);
+		/* 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;
 	}
 	else
 	{
 		result = isalpha(c) || isdigit(c);
 	}
 
+	__locale_unlock();
+
 	return(result);
 }

library/ctype_isalpha.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isalpha.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isalpha.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,11 +47,19 @@ isalpha(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
+	__locale_lock();
+
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
 
-		result = IsAlpha(__locale_table[LC_CTYPE],(ULONG)c);
+		/* 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;
 	}
 	else
 	{
@@ -59,5 +67,7 @@ isalpha(int c)
 		          ('A' <= c && c <= 'Z'));
 	}
 
+	__locale_unlock();
+
 	return(result);
 }

library/ctype_isascii.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isascii.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isascii.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/ctype_isblank.c

@@ -0,0 +1,52 @@
+/*
+ * $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);
+}

library/ctype_iscntrl.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_iscntrl.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_iscntrl.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,16 +47,26 @@ iscntrl(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
+	__locale_lock();
+
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
 
-		result = IsCntrl(__locale_table[LC_CTYPE],(ULONG)c);
+		/* 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;
 	}
 	else
 	{
 		result = (('\0' <= c && c < ' ') || (c == 127));
 	}
 
+	__locale_unlock();
+
 	return(result);
 }

library/ctype_isdigit.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isdigit.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isdigit.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,16 +47,26 @@ isdigit(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
+	__locale_lock();
+
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
 
-		result = IsDigit(__locale_table[LC_CTYPE],(ULONG)c);
+		/* 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;
 	}
 	else
 	{
 		result = ('0' <= c && c <= '9');
 	}
 
+	__locale_unlock();
+
 	return(result);
 }

library/ctype_isgraph.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isgraph.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isgraph.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,16 +47,26 @@ isgraph(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
+	__locale_lock();
+
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
 
-		result = IsGraph(__locale_table[LC_CTYPE],(ULONG)c);
+		/* 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;
 	}
 	else
 	{
 		result = (' ' < c && c < 127);
 	}
 
+	__locale_unlock();
+
 	return(result);
 }

library/ctype_islower.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_islower.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_islower.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,16 +47,26 @@ islower(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
+	__locale_lock();
+
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
 
-		result = IsLower(__locale_table[LC_CTYPE],(ULONG)c);
+		/* 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;
 	}
 	else
 	{
 		result = ('a' <= c && c <= 'z');
 	}
 
+	__locale_unlock();
+
 	return(result);
 }

library/ctype_isprint.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isprint.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isprint.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,16 +47,26 @@ isprint(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
+	__locale_lock();
+
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
 
-		result = IsPrint(__locale_table[LC_CTYPE],(ULONG)c);
+		/* 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;
 	}
 	else
 	{
 		result = (' ' <= c && c <= '~');
 	}
 
+	__locale_unlock();
+
 	return(result);
 }

library/ctype_ispunct.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_ispunct.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_ispunct.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,11 +47,19 @@ ispunct(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
+	__locale_lock();
+
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
 
-		result = IsPunct(__locale_table[LC_CTYPE],(ULONG)c);
+		/* 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;
 	}
 	else
 	{
@@ -61,5 +69,7 @@ ispunct(int c)
 		          ('{' <= c && c <= '~'));
 	}
 
+	__locale_unlock();
+
 	return(result);
 }

library/ctype_isspace.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isspace.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isspace.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,11 +47,19 @@ isspace(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
+	__locale_lock();
+
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
 
-		result = IsSpace(__locale_table[LC_CTYPE],(ULONG)c);
+		/* 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;
 	}
 	else
 	{
@@ -63,5 +71,7 @@ isspace(int c)
 		          c == ' ');
 	}
 
+	__locale_unlock();
+
 	return(result);
 }

library/ctype_isupper.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isupper.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isupper.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,16 +47,26 @@ isupper(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
+	__locale_lock();
+
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
 
-		result = IsUpper(__locale_table[LC_CTYPE],(ULONG)c);
+		/* 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;
 	}
 	else
 	{
 		result = ('A' <= c && c <= 'Z');
 	}
 
+	__locale_unlock();
+
 	return(result);
 }

library/ctype_isxdigit.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_isxdigit.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_isxdigit.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -47,11 +47,19 @@ isxdigit(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
+	__locale_lock();
+
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
 
-		result = IsXDigit(__locale_table[LC_CTYPE],(ULONG)c);
+		/* 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;
 	}
 	else
 	{
@@ -60,5 +68,7 @@ isxdigit(int c)
 		          ('A' <= c && c <= 'F'));
 	}
 
+	__locale_unlock();
+
 	return(result);
 }

library/ctype_table.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_table.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_table.c,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-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * 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
@@ -36,22 +36,8 @@
 
 /****************************************************************************/
 
-/* 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] =
+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,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 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,
@@ -190,7 +176,3 @@ 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
 };
-
-/****************************************************************************/
-
-const unsigned char * const __ctype_table = &__ctype_data[128];

library/ctype_tolower.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_tolower.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_tolower.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,16 +43,26 @@ tolower(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
+	__locale_lock();
+
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
 
-		result = ConvToLower(__locale_table[LC_CTYPE],(ULONG)c);
+		/* 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;
 	}
 	else
 	{
 		result = ('A' <= c && c <= 'Z') ? (c + ('a' - 'A')) : c;
 	}
 
+	__locale_unlock();
+
 	return(result);
 }

library/ctype_toupper.c

@@ -1,10 +1,10 @@
 /*
- * $Id: ctype_toupper.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: ctype_toupper.c,v 1.5 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -43,16 +43,26 @@ toupper(int c)
 	DECLARE_LOCALEBASE();
 	int result;
 
+	__locale_lock();
+
 	if(__locale_table[LC_CTYPE] != NULL)
 	{
 		assert( LocaleBase != NULL );
 
-		result = ConvToUpper(__locale_table[LC_CTYPE],(ULONG)c);
+		/* 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;
 	}
 	else
 	{
 		result = ('a' <= c && c <= 'z') ? (c - ('a' - 'A')) : c;
 	}
 
+	__locale_unlock();
+
 	return(result);
 }

library/debug.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug.c,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=8
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) 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)

library/debug.h

@@ -1,10 +1,10 @@
 /*
- * $Id: debug.h,v 1.3 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug.h,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=8
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug.lib_rev.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug.lib_rev.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug.lib_rev.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug.lib_rev.h

@@ -1,6 +1,6 @@
 #define VERSION		1
-#define REVISION	185
-#define DATE		"2.1.2005"
-#define VERS		"debug.lib 1.185"
-#define VSTRING		"debug.lib 1.185 (2.1.2005)\r\n"
-#define VERSTAG		"\0$VER: debug.lib 1.185 (2.1.2005)"
+#define REVISION	200
+#define DATE		"17.4.2006"
+#define VERS		"debug.lib 1.200"
+#define VSTRING		"debug.lib 1.200 (17.4.2006)\r\n"
+#define VERSTAG		"\0$VER: debug.lib 1.200 (17.4.2006)"

library/debug.lib_rev.rev

@@ -1 +1 @@
-185
+200

library/debug_cmpstrexec.c

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_cmpstrexec.c,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_cmpstrexec.c,v 1.3 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

library/debug_headers.h

@@ -1,10 +1,10 @@
 /*
- * $Id: debug_headers.h,v 1.2 2005-01-02 09:07:07 obarthel Exp $
+ * $Id: debug_headers.h,v 1.4 2006-01-08 12:04:22 obarthel Exp $
  *
  * :ts=4
  *
  * Portable ISO 'C' (1994) runtime library for the Amiga computer
- * Copyright (c) 2002-2005 by Olaf Barthel <olsen@sourcery.han.de>
+ * Copyright (c) 2002-2006 by Olaf Barthel <olsen (at) sourcery.han.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,14 +36,15 @@
 
 /****************************************************************************/
 
+#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);
@@ -57,7 +58,11 @@ VOID RawPutChar(UBYTE c);
 /****************************************************************************/
 
 #if defined(__amigaos4__)
+
+#ifndef EXEC_EMULATION_H
 #include <exec/emulation.h>
+#endif /* EXEC_EMULATION_H */
+
 #endif /* __amigaos4__ */
 
 /****************************************************************************/
@@ -106,11 +111,13 @@ VOID RawPutChar(UBYTE c);
 
 /****************************************************************************/
 
-#include "debug.h"
-
-/****************************************************************************/
-
+#ifndef _MACROS_H
 #include "macros.h"
+#endif /* _MACROS_H */
+
+#ifndef _DEBUG_H
+#include "debug.h"
+#endif /* _DEBUG_H */
 
 /****************************************************************************/