There are a few minor issues that prevent or1ksim from building on Mac OS X; the following patch should resolve them.

Index: configure.ac

--- configure.ac (revision 59) +++ configure.ac (working copy) @@ -137,6 +137,8 @@

check for GNU readline

AC_CHECK_LIB(readline, add_history) +# Not all versions of readline have rl_event_hook (e.g., Mac OS X) +AC_CHECK_DECLS(rl_event_hook, [], [], #include <readline/readline.h>)

yuck

case "$host_os" in

Index: sim-cmd.c

--- sim-cmd.c (revision 59) +++ sim-cmd.c (working copy) @@ -837,8 +837,10 @@ / Tell the completer that we want a crack first. / rl_attempted_completion_function = sim_completion;

+#if HAVE_DECL_RL_EVENT_HOOK / Handle the gdb socket while waiting for input / rl_event_hook = check_gdb_comm; +#endif }

/* Attempt to complete on the contents of TEXT. START and END bound the

Index: peripheral/atadevice.c

--- peripheral/atadevice.c (revision 59) +++ peripheral/atadevice.c (working copy) @@ -30,8 +30,16 @@ #include "port.h"

/ System includes / +#ifdef APPLE +#include <libkern/OSByteOrder.h> +#define bswap_16(x) OSSwapInt16(x) +#define bswap_32(x) OSSwapInt32(x) +#define bswap_64(x) OSSwapInt64(x) +#else #include <byteswap.h> +#endif

+ / Package includes / #include "atadevice.h" #include "atadevice-cmdi.h"

Index: port/strndup.c

--- port/strndup.c (revision 59) +++ port/strndup.c (working copy) @@ -29,7 +29,8 @@

#ifndef HAVE_STRNDUP

+/ the definition of size_t is provided in stddef.h / +#include <stddef.h> / Taken from glibc / char strndup (const char s, size_t n)

Er... formatting didn't come through. At any rate, the patch is clean if you "View source" on the page. I've uploaded a copy to http://jarv.in/or1ksim.svn.min.patch, just in case.

check for GNU readline

AC_CHECK_LIB(readline, add_history) +# Not all versions of readline have rl_event_hook (e.g., Mac OS X) +AC_CHECK_DECLS(rl_event_hook, [], [], #include <readline/readline.h>)

yuck

case "$host_os" in

Index: sim-cmd.c

--- sim-cmd.c (revision 59) +++ sim-cmd.c (working copy) @@ -837,8 +837,10 @@ / Tell the completer that we want a crack first. / rl_attempted_completion_function = sim_completion;

+#if HAVE_DECL_RL_EVENT_HOOK / Handle the gdb socket while waiting for input / rl_event_hook = check_gdb_comm; +#endif }

/* Attempt to complete on the contents of TEXT. START and END bound the

Index: peripheral/atadevice.c

--- peripheral/atadevice.c (revision 59) +++ peripheral/atadevice.c (working copy) @@ -30,8 +30,16 @@ #include "port.h"

/ System includes / +#ifdef APPLE +#include <libkern/OSByteOrder.h>

+#define bswap_16(x) OSSwapInt16(x) +#define bswap_32(x) OSSwapInt32(x) +#define bswap_64(x) OSSwapInt64(x) +#else #include <byteswap.h> +#endif

+ / Package includes / #include "atadevice.h" #include "atadevice-cmdi.h"

Index: port/strndup.c

--- port/strndup.c (revision 59) +++ port/strndup.c (working copy) @@ -29,7 +29,8 @@

#ifndef HAVE_STRNDUP

+/ the definition of size_t is provided in stddef.h / +#include <stddef.h> / Taken from glibc / char strndup (const char s, size_t n)

Thanks for applying the patch. The code more-or-less builds cleanly from SVN on my Macbook (10.6.2). Presently, I have to execute the following to get the build to complete: