From: David B. <dbr...@us...> - 2010-01-10 19:12:02
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Main OpenOCD repository". The branch, master has been updated via c8267930c7cff5685b33cd0174deb75a46dbb09b (commit) from 5e221fa3a72dcdde92cf749495131748d32f7d8a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c8267930c7cff5685b33cd0174deb75a46dbb09b Author: David Brownell <dbr...@us...> Date: Sun Jan 10 10:06:58 2010 -0800 FreeBSD build fixes Based on notes from Tomek Cedro <tom...@gm...> and Steve Franks <bah...@gm...>. In the User's Guide, sort the list of operating systems reported through Tcl with $ocd_HOSTOS ... and include FreeBSD. Signed-off-by: David Brownell <dbr...@us...> diff --git a/doc/openocd.texi b/doc/openocd.texi index 6466d6d..0eb40b1 100644 --- a/doc/openocd.texi +++ b/doc/openocd.texi @@ -6913,11 +6913,12 @@ variables. JimTCL, as implemented in OpenOCD creates $ocd_HOSTOS which holds one of the following values: @itemize @bullet -@item @b{winxx} Built using Microsoft Visual Studio -@item @b{linux} Linux is the underlying operating sytem -@item @b{darwin} Darwin (mac-os) is the underlying operating sytem. @item @b{cygwin} Running under Cygwin +@item @b{darwin} Darwin (Mac-OS) is the underlying operating sytem. +@item @b{freebsd} Running under FreeBSD +@item @b{linux} Linux is the underlying operating sytem @item @b{mingw32} Running under MingW32 +@item @b{winxx} Built using Microsoft Visual Studio @item @b{other} Unknown, none of the above. @end itemize diff --git a/src/helper/command.c b/src/helper/command.c index 288ed72..568596d 100644 --- a/src/helper/command.c +++ b/src/helper/command.c @@ -1358,6 +1358,7 @@ struct command_context* command_init(const char *startup_tcl, Jim_Interp *interp #endif context->interp = interp; + /* Stick to lowercase for HostOS strings. */ #if defined(_MSC_VER) /* WinXX - is generic, the forward * looking problem is this: @@ -1377,6 +1378,8 @@ struct command_context* command_init(const char *startup_tcl, Jim_Interp *interp HostOs = "mingw32"; #elif defined(__ECOS) HostOs = "ecos"; +#elif defined(__FreeBSD__) + HostOs = "freebsd"; #else #warning "Unrecognized host OS..." HostOs = "other"; ----------------------------------------------------------------------- Summary of changes: doc/openocd.texi | 7 ++++--- src/helper/command.c | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) hooks/post-receive -- Main OpenOCD repository |