Permalink
Browse files

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

svn path=/tags/MONO_1_0_4/mono/; revision=35454
  • Loading branch information...
16 parents 26c7b44 + de4717d + 3747fde + cd43890 + 8b95383 + 255302e + d1b7ee7 + 214dbb1 + 3e535bd + 99a49e2 + 7100587 + 51f5800 + f292038 + cabb02a + 06aeb1a + 2372f9b commit 408a59e440bbe3dd331ad8ebba505eabcef56157 nobody committed Oct 29, 2004
Showing with 2,955 additions and 1,537 deletions.
  1. +42 −0 ChangeLog
  2. +123 −10 configure.in
  3. +0 −246 doc/pending-classes.in
  4. +1 −1 man/mono.1
  5. +1 −0 mono/dis/get.c
  6. +6 −0 mono/interpreter/ChangeLog
  7. +1 −1 mono/interpreter/interp.c
  8. +10 −0 mono/interpreter/mintops.h
  9. +125 −0 mono/io-layer/ChangeLog
  10. +35 −27 mono/io-layer/daemon.c
  11. +8 −0 mono/io-layer/error.c
  12. +80 −0 mono/io-layer/handles-private.h
  13. +141 −25 mono/io-layer/handles.c
  14. +1 −5 mono/io-layer/io-private.h
  15. +564 −131 mono/io-layer/io.c
  16. +18 −2 mono/io-layer/mutexes.c
  17. +1 −1 mono/io-layer/socket-private.h
  18. +174 −207 mono/io-layer/sockets.c
  19. +9 −3 mono/io-layer/threads.c
  20. +2 −0 mono/io-layer/timed-thread.c
  21. +9 −3 mono/io-layer/wait.c
  22. +15 −1 mono/io-layer/wapi-private.h
  23. +243 −1 mono/metadata/ChangeLog
  24. +35 −13 mono/metadata/appdomain.c
  25. +15 −2 mono/metadata/assembly.c
  26. +1 −1 mono/metadata/class.c
  27. +227 −223 mono/metadata/culture-info-tables.h
  28. +29 −8 mono/metadata/debug-mono-symfile.c
  29. +9 −4 mono/metadata/filewatcher.c
  30. +63 −12 mono/metadata/gc.c
  31. +6 −0 mono/metadata/icall.c
  32. +21 −8 mono/metadata/image.c
  33. +54 −16 mono/metadata/loader.c
  34. +12 −10 mono/metadata/locales.c
  35. +184 −71 mono/metadata/marshal.c
  36. +55 −51 mono/metadata/metadata.c
  37. +49 −17 mono/metadata/mono-debug.c
  38. +25 −14 mono/metadata/object.c
  39. +6 −0 mono/metadata/object.h
  40. +4 −2 mono/metadata/process.c
  41. +45 −3 mono/metadata/reflection.c
  42. +1 −0 mono/metadata/reflection.h
  43. +51 −1 mono/metadata/socket-io.c
  44. +14 −1 mono/metadata/socket-io.h
  45. +35 −10 mono/metadata/threadpool.c
  46. +5 −6 mono/metadata/threads.c
  47. +86 −0 mono/mini/ChangeLog
  48. +6 −0 mono/mini/basic-long.cs
  49. +2 −0 mono/mini/cpu-g4.md
  50. +2 −0 mono/mini/cpu-pentium.md
  51. +2 −0 mono/mini/cpu-s390.md
  52. +2 −0 mono/mini/cpu-sparc.md
  53. +3 −3 mono/mini/exceptions-x86.c
  54. +19 −4 mono/mini/inssel-long32.brg
  55. +10 −10 mono/mini/inssel-ppc.brg
  56. +2 −0 mono/mini/inssel-x86.brg
  57. +8 −1 mono/mini/inssel.brg
  58. +2 −0 mono/mini/mini-ops.h
  59. +34 −12 mono/mini/mini-ppc.c
  60. +4 −0 mono/mini/mini-s390.c
  61. +3 −0 mono/mini/mini-sparc.c
  62. +4 −0 mono/mini/mini-x86.c
  63. +77 −25 mono/mini/mini.c
  64. +1 −0 mono/mini/mini.h
  65. +1 −1 mono/mini/trace.c
  66. +6 −0 mono/tests/ChangeLog
  67. +1 −0 mono/tests/Makefile.am
  68. +40 −0 mono/tests/libtest.c
  69. +18 −0 mono/tests/pinvoke2.cs
  70. +14 −0 mono/tests/pinvoke3.cs
  71. +26 −0 mono/tests/typeof-ptr.cs
  72. +4 −0 mono/utils/ChangeLog
  73. +4 −0 mono/utils/mono-codeman.c
  74. +6 −0 tools/locale-builder/supp/ChangeLog
  75. +12 −0 tools/locale-builder/supp/pt.xml
  76. +1 −1 tools/locale-builder/supp/pt_BR.xml
  77. +0 −246 web/pending-classes.in
  78. +0 −1 web/web/masterinfos/.cvsignore
  79. +0 −96 web/web/masterinfos/Makefile
View
@@ -1,3 +1,45 @@
+2004-10-14 Joe Shaw <joeshaw@novell.com>
+
+ * man/mono.1: Fix the syntax of the M: trace syntax
+
+2004-10-10 Zoltan Varga <vargaz@freemail.hu>
+
+ * configure.in: Add some checks for cygwin weirdness.
+
+2004-09-04 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+ * configure.in: added check for kqueue. Patch from Geoff Norton
+ in HEAD.
+
+2004-08-17 Dick Porter <dick@ximian.com>
+
+ * configure.in: Correct intl library for FreeBSD and OpenBSD.
+ Fixes bug 62884, patch by Tom McLaughlin (tmclaugh@sdf.lonestar.org).
+
+2004-07-27 John Merryweather Cooper <john_m_cooper@yahoo.com>
+ * configure.in: Disable __thread test (TLS) for FreeBSD as
+ it succeeds on FreeBSD 5.x when it should fail. Fix pthread
+ library detection for FreeBSD 4.x since pthread is embedded
+ in libc_r on this platform. Fix some typos in my host
+ regexes for freebsd.
+
+2004-07-23 Dick Porter <dick@ximian.com>
+
+ * configure.in: Changes for FreeBSD thread support by John
+ Merryweather Cooper <john_m_cooper@yahoo.com>.
+
+2004-07-03 Zoltan Varga <vargaz@freemail.hu>
+
+ * configure.in: Add --with-tls option to replace the misnamed
+ --with-nptl option.
+
+2004-06-30 Zoltan Varga <vargaz@freemail.hu>
+
+ * configure.in: Fix trunc check + add SPARC64 defines.
+
+ * marshal.c (mono_marshal_get_managed_wrapper): Handle returning
+ delegates from a delegate. Fixes #61033.
+
2004-06-29 Jackson Harper <jackson@ximian.com>
* man/gacutil.1: Update man with new command line options.
View
@@ -1,7 +1,7 @@
AC_INIT(README)
AC_CANONICAL_SYSTEM
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,1.0)
+AM_INIT_AUTOMAKE(mono,1.0.4)
AM_MAINTAINER_MODE
AC_PROG_LN_S
@@ -67,7 +67,62 @@ case "$host" in
libdl=
libgc_threads=no
;;
- *-*-*freebsd*|*-*-*openbsd*)
+# these flags will work for all versions of -STABLE
+#
+ *-*-*freebsd4*)
+ platform_win32=no
+ if test "x$PTHREAD_CFLAGS" = "x"; then
+ CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS"
+ libmono_cflags="-D_THREAD_SAFE"
+ else
+ CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS"
+ libmono_cflags="$PTHREAD_CFLAGS"
+ fi
+ if test "x$PTHREAD_LIBS" = "x"; then
+ LDFLAGS="$LDFLAGS -pthread"
+ libmono_ldflags="-pthread"
+ else
+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
+ libmono_ldflags="$PTHREAD_LIBS"
+ fi
+ need_link_unlink=yes
+ AC_DEFINE(PTHREAD_POINTER_ID)
+ libdl=
+ libgc_threads=pthreads
+# TLS isn't implemented at all on -STABLE
+ with_nptl=no
+ with_tls=pthread
+ ;;
+# older versions of -CURRENT will break with these flags but testing
+# indicates these older versions won't run Mono anyway
+#
+ *-*-*freebsd5*)
+ platform_win32=no
+ if test "x$PTHREAD_CFLAGS" = "x"; then
+ CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
+ libmono_cflags=
+ else
+ CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS"
+ libmono_cflags="$PTHREAD_CFLAGS"
+ fi
+ if test "x$PTHREAD_LIBS" = "x"; then
+ LDFLAGS="$LDFLAGS -lpthread"
+ libmono_ldflags="-lpthread"
+ else
+ LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
+ libmono_ldflags="$PTHREAD_LIBS"
+ fi
+ need_link_unlink=yes
+ AC_DEFINE(PTHREAD_POINTER_ID)
+ libdl=
+ libgc_threads=pthreads
+# TLS is only partially implemented on -CURRENT (compiler support
+# but NOT library support)
+#
+ with_nptl=no
+ with_tls=pthread
+ ;;
+ *-*-*openbsd*)
platform_win32=no
CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE -DGC_FREEBSD_THREADS"
libmono_cflags="-D_THREAD_SAFE"
@@ -244,13 +299,46 @@ AC_SUBST(GLIB_LIBS)
AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GMODULE_LIBS)
+if test x$platform_win32 = xyes; then
+ AC_MSG_CHECKING(for cygwin glib2-dev package)
+ if [ cygcheck --f /usr/lib/libglib-2.0.dll.a | grep -q glib2-devel ]; then
+ AC_MSG_RESULT(found)
+ AC_MSG_ERROR([Mono cannot be built with the cygwin glib2-devel package installed, because that package doesn't work with -mno-cygwin. Please uninstall it then re-run configure.])
+ else
+ AC_MSG_RESULT(not found, ok)
+ fi
+
+ AC_MSG_CHECKING(for broken gwin32.h)
+ glib_include=`$PKG_CONFIG --cflags-only-I glib-2.0 | sed -e 's/ -I.*//g' | sed -e 's/-I//g'`
+ if test -f $glib_include/glib/gwin32.h; then
+ if [ grep ftruncate $glib_include/glib/gwin32.h | grep -q define ]; then
+ AC_MSG_RESULT(failed)
+ hashmark='#'
+ AC_MSG_ERROR([Your version of gwin32.h is broken and will cause compilation errors when building mono. Please fix it by deleting the line: '$hashmark define ftruncate...' from '$glib_include/glib/gwin32.h' then re-run configure.])
+ fi
+ fi
+ AC_MSG_RESULT(ok)
+fi
+
AC_ARG_WITH(gc, [ --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default])
# Enable support for fast thread-local storage
# Some systems have broken support, so we allow to disable it.
-# This is misnamed: __thread support has no relation to NPTL,
-# but people already use it...
-AC_ARG_WITH(nptl, [ --with-nptl=yes,no enable/disable support for __thread support],[],[with_nptl=yes])
+AC_ARG_WITH(tls, [ --with-tls=__thread,pthread select Thread Local Storage implementation],[],[with_tls=__thread])
+
+# Kept for compatibility
+AC_ARG_WITH(nptl, [ --with-nptl=yes,no deprecated, use --with-tls instead],[],[with_nptl=default])
+
+if test "x$with_nptl" != "xdefault"; then
+ if test "x$with_nptl" = "xyes"; then
+ AC_MSG_WARN([--with-nptl=yes is deprecated, use --with-tls=__thread option instead.])
+ with_tls=__thread
+ fi
+ if test "x$with_nptl" = "xno"; then
+ AC_MSG_WARN([--with-nptl=no is deprecated, use --with-tls=pthread option instead.])
+ with_tls=pthread
+ fi
+fi
# Enable support for using sigaltstack for SIGSEGV and stack overflow handling
# This does not work on some platforms (bug #55253)
@@ -399,6 +487,7 @@ if test x$platform_win32 = xno; then
AC_CHECK_FUNCS(getpwuid_r)
AC_CHECK_FUNCS(getresuid)
AC_CHECK_FUNCS(setresuid)
+ AC_CHECK_FUNCS(kqueue)
dnl ******************************************************************
dnl *** Check for large file support ***
@@ -641,7 +730,17 @@ if test x$platform_win32 = xno; then
dnl *****************************
dnl *** Checks for libpthread ***
dnl *****************************
- AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
+# on FreeBSD -STABLE, the pthreads functions all reside in libc_r
+# and libpthread does not exist
+#
+ case "${host}" in
+ *-*-*freebsd4*)
+ AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
+ ;;
+ *)
+ AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
+ ;;
+ esac
AC_CHECK_HEADERS(pthread.h)
AC_CHECK_FUNCS(pthread_mutex_timedlock)
AC_CHECK_FUNCS(pthread_getattr_np pthread_attr_get_np)
@@ -662,7 +761,7 @@ if test x$platform_win32 = xno; then
dnl *** Checks for working __thread ***
dnl ***********************************
AC_MSG_CHECKING(for working __thread)
- if test "x$with_nptl" != "xyes"; then
+ if test "x$with_tls" != "x__thread"; then
AC_MSG_RESULT(disabled)
else
AC_TRY_RUN([
@@ -954,8 +1053,9 @@ ac_cv_c_socklen_t=yes
])
AC_CHECK_FUNCS(trunc, , AC_MSG_CHECKING(for trunc in math.h)
+ # Simply calling trunc (0.0) is no good since gcc will optimize the call away
AC_TRY_LINK([#include <math.h>],
- [ trunc(0.0); ],
+ [ static void *p = &trunc; ],
[
AC_DEFINE(HAVE_TRUNC)
AC_MSG_RESULT(yes)
@@ -1096,7 +1196,11 @@ case "$host" in
JIT_SUPPORTED=no
;;
sparc*-*-*)
- TARGET=SPARC;
+ if test "x$ac_cv_sizeof_void_p" = "x8"; then
+ TARGET=SPARC64
+ else
+ TARGET=SPARC
+ fi
arch_target=sparc;
JIT_SUPPORTED=yes
ACCESS_UNALIGNED="no"
@@ -1184,6 +1288,14 @@ case "$host" in
LIBC="libc.so.12"
INTL="libintl.so.0"
;;
+ *-*-*freebsd*)
+ LIBC="libc.so"
+ INTL="libintl.so"
+ ;;
+ *-*-*openbsd*)
+ LIBC="libc.so"
+ INTL="libintl.so"
+ ;;
esac
AC_SUBST(libsuffix)
@@ -1227,6 +1339,7 @@ AM_CONDITIONAL(INSTALL_2_0, test x$PREVIEW = xyes)
AM_CONDITIONAL(MIPS_GCC, test ${TARGET}${ac_cv_prog_gcc} = MIPSyes)
AM_CONDITIONAL(MIPS_SGI, test ${TARGET}${ac_cv_prog_gcc} = MIPSno)
AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
+AM_CONDITIONAL(SPARC64, test x$TARGET = xSPARC64)
AM_CONDITIONAL(X86, test x$TARGET = xX86)
AM_CONDITIONAL(AMD64, test x$TARGET = xAMD64)
AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA)
@@ -1299,7 +1412,7 @@ echo "
GC: $gc
ICU: $enable_icu
- __thread: $with_nptl
+ TLS: $with_tls
SIGALTSTACK: $with_sigaltstack
Engine: $jit_status
2.0 Alpha: $PREVIEW
Oops, something went wrong.

0 comments on commit 408a59e

Please sign in to comment.