~ chicken-core (chicken-5) 0fca63be7a7d78d8f6f7cd5d4a17864f184ef29a
commit 0fca63be7a7d78d8f6f7cd5d4a17864f184ef29a
Author: felix <felix@call-with-current-continuation.org>
AuthorDate: Sat May 22 01:03:37 2010 +0200
Commit: felix <felix@call-with-current-continuation.org>
CommitDate: Sat May 22 01:03:37 2010 +0200
added support for Haiku (thanks to Chris Roberts)
diff --git a/Makefile b/Makefile
index 3837cad6..7b9b27e4 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,7 @@ $(STANDARD_TARGETS):
@echo " $(MAKE) PLATFORM=cygwin"
@echo " $(MAKE) PLATFORM=solaris"
@echo " $(MAKE) PLATFORM=cross-linux-mingw"
+ @echo " $(MAKE) PLATFORM=haiku"
@echo ""
@echo "For more information, consult the README file."
@exit 1
diff --git a/Makefile.haiku b/Makefile.haiku
new file mode 100644
index 00000000..4491e9d6
--- /dev/null
+++ b/Makefile.haiku
@@ -0,0 +1,106 @@
+# Makefile.haiku - configuration for Haiku -*- Makefile -*-
+#
+# Copyright (c) 2010, The Chicken Team
+# 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.
+# Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided with the distribution.
+# Neither the name of the author nor the names of its 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 HOLDERS 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.
+
+
+ifneq ($(CONFIG),)
+include $(CONFIG)
+endif
+
+SRCDIR ?= ./
+
+# platform configuration
+
+ARCH ?= $(shell sh $(SRCDIR)/config-arch.sh)
+
+# options
+
+C_COMPILER_OPTIONS ?= -fno-strict-aliasing -DHAVE_CHICKEN_CONFIG_H
+ifdef DEBUGBUILD
+C_COMPILER_OPTIMIZATION_OPTIONS ?= -g -Wall -Wno-unused
+else
+ifdef OPTIMIZE_FOR_SPEED
+C_COMPILER_OPTIMIZATION_OPTIONS ?= -O3 -fomit-frame-pointer
+else
+C_COMPILER_OPTIMIZATION_OPTIONS ?= -Os -fomit-frame-pointer
+endif
+endif
+LINKER_LINK_SHARED_LIBRARY_OPTIONS = -shared
+LINKER_LINK_SHARED_DLOADABLE_OPTIONS = -L. -shared -Wl,-R$(RUNTIME_LINKER_PATH)
+LINKER_LINK_SHARED_PROGRAM_OPTIONS = -Wl,-R$(RUNTIME_LINKER_PATH)
+LIBCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,libchicken.so$(SONAME_VERSION)
+LIBUCHICKEN_SO_LINKER_OPTIONS = -Wl,-soname,libuchicken.so$(SONAME_VERSION)
+LIBRARIES = -lnetwork
+NEEDS_RELINKING = yes
+USES_SONAME = yes
+
+# special files
+
+CHICKEN_CONFIG_H = chicken-config.h
+
+# select default and internal settings
+
+include $(SRCDIR)/defaults.make
+
+chicken-config.h: chicken-defaults.h
+ echo "/* GENERATED */" >$@
+ echo "#define HAVE_DIRENT_H 1" >>$@
+ echo "#define HAVE_DLFCN_H 1" >>$@
+ echo "#define HAVE_INTTYPES_H 1" >>$@
+ echo "#define HAVE_LIMITS_H 1" >>$@
+ echo "#define HAVE_LONG_LONG 1" >>$@
+ echo "#define HAVE_MEMMOVE 1" >>$@
+ echo "#define HAVE_MEMORY_H 1" >>$@
+ echo "#define HAVE_STDINT_H 1" >>$@
+ echo "#define HAVE_STDLIB_H 1" >>$@
+ echo "#define HAVE_STRERROR 1" >>$@
+ echo "#define HAVE_STRINGS_H 1" >>$@
+ echo "#define HAVE_STRING_H 1" >>$@
+ echo "#define HAVE_STRTOLL 1" >>$@
+ echo "#define HAVE_STRTOQ 1" >>$@
+ echo "#define HAVE_SYS_STAT_H 1" >>$@
+ echo "#define HAVE_SYS_TYPES_H 1" >>$@
+ echo "#define HAVE_UNISTD_H 1" >>$@
+ echo "#define HAVE_UNSIGNED_LONG_LONG 1" >>$@
+ echo "#define STDC_HEADERS 1" >>$@
+ echo "#define HAVE_ALLOCA 1" >>$@
+ echo "#define HAVE_ALLOCA_H 1" >>$@
+ echo "#define HAVE_GRP_H 1" >>$@
+ echo "#define HAVE_ERRNO_H 1" >>$@
+ echo "#define HAVE_GCVT 1" >>$@
+ echo "#define HAVE_MEMMOVE 1" >>$@
+ echo "#define C_STACK_GROWS_DOWNWARD 1" >>$@
+ echo "#define SIGIO 0" >>$@
+ifdef GCHOOKS
+ echo "#define C_GC_HOOKS" >>$@
+endif
+ifdef SYMBOLGC
+ echo "#define C_COLLECT_ALL_SYMBOLS" >>$@
+endif
+ifneq ($(HACKED_APPLY),)
+ echo "#define C_HACKED_APPLY" >>$@
+endif
+ cat chicken-defaults.h >>$@
+
+include $(SRCDIR)/rules.make
diff --git a/chicken.h b/chicken.h
index f4d08711..c05965d2 100644
--- a/chicken.h
+++ b/chicken.h
@@ -94,6 +94,10 @@
# include <sys/types.h>
#endif
+#if defined(__HAIKU__)
+# include <kernel/image.h>
+#endif
+
/* Byteorder in machine word */
#if defined(__MINGW32__)
@@ -665,6 +669,8 @@ typedef unsigned __int64 uint64_t;
# define C_SOFTWARE_VERSION "hpux"
#elif defined(__DragonFly__)
# define C_SOFTWARE_VERSION "dragonfly"
+#elif defined(__HAIKU__)
+# define C_SOFTWARE_VERSION "haiku"
#elif defined(__sun__)
# if defined(__svr4__)
# define C_SOFTWARE_VERSION "solaris"
@@ -2339,6 +2345,25 @@ C_path_to_executable(C_char *fname)
return NULL;
}
+# elif defined(__HAIKU__)
+{
+ image_info info;
+ int32 cookie = 0;
+ int32 i;
+
+ while (get_next_image_info(0, &cookie, &info) == B_OK) {
+ if (info.type == B_APP_IMAGE) {
+ C_strcat(buffer, info.name);
+
+ for(i = C_strlen(buffer); i >= 0 && buffer[ i ] != '/'; --i);
+
+ buffer[ i ] = '\0';
+
+ return buffer;
+ }
+ }
+}
+ return NULL;
# else
return NULL;
# endif
diff --git a/config-arch.sh b/config-arch.sh
index 87bb4017..acd30705 100644
--- a/config-arch.sh
+++ b/config-arch.sh
@@ -27,7 +27,7 @@
case "`uname -m`" in
- i*86) echo "x86";;
+ i*86|BePC) echo "x86";;
"Power Macintosh"|ppc|powerpc|macppc)
case "`uname -s`" in
Darwin) echo "ppc.darwin";;
diff --git a/manual/Acknowledgements b/manual/Acknowledgements
index a564ecd1..9d5eb54f 100644
--- a/manual/Acknowledgements
+++ b/manual/Acknowledgements
@@ -32,8 +32,8 @@ Moukayed, Chris Moline, Eric E. Moore, Julian Morrison, Dan Muresan,
David N. Murray, Lars Nilsson, Ian Oversby, o.t., Gene Pavlovsky, Levi
Pearson, Jeronimo Pellegrini, Nicolas Pelletier, Derrell Piper, Carlos
Pita, Robin Lee Powell, Pupeno, Davide Puricelli, presto, Doug Quale,
-Eric Raible, Ivan Raikov, Joel Reymont, Eric Rochester, Paul
-Romanchenko, Andreas Rottman, David Rush, Lars Rustemeier, Daniel
+Eric Raible, Ivan Raikov, Joel Reymont, Chris Roberts, Eric Rochester,
+Paul Romanchenko, Andreas Rottman, David Rush, Lars Rustemeier, Daniel
Sadilek, Oskar Schirmer, Burton Samograd, Reed Sheridan, Ronald
Schroeder, Spencer Schumann, Ivan Shcheklein, Alex Shinn, Ivan
Shmakov, Shmul, Tony Sidaway, Jeffrey B. Siegal, Andrey Sidorenko,
Trap