2002-02-11 Adam Megacz <adam@xwt.org>

        * gcc/boehm-gc/configure.in: support for win32, saner
        cross-compile options


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@49681 138bc75d-0d04-0410-961f-82ee72b054a4

3 files changed, 21 insertions, 17 deletions

diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index 2e03111751e..8512374d017 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-11  Adam Megacz <adam@xwt.org
+
+        * gcc/boehm-gc/configure.in: support for win32, saner
+	cross-compile options
+
 2001-02-08  Anthony Green  <green@redhat.com>
 
 	* include/private/gcconfig.h: Add XSCALE NOSYS support for bare
diff --git a/boehm-gc/configure b/boehm-gc/configure
index fc67f49736c..6e2a89cb137 100755
--- a/boehm-gc/configure
+++ b/boehm-gc/configure
@@ -2723,7 +2723,13 @@ EOF
 	;;
     esac
     ;;
- decosf1 | irix | mach | os2 | solaris | win32 | dce | vxworks)
+ win32)
+    cat >> confdefs.h <<\EOF
+#define GC_WIN32_THREADS 1
+EOF
+
+    ;;
+ decosf1 | irix | mach | os2 | solaris | dce | vxworks)
     { echo "configure: error: thread package $THREADS not yet supported" 1>&2; exit 1; }
     ;;
  *)
@@ -2733,7 +2739,7 @@ esac
 
 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:2737: checking for dlopen in -ldl" >&5
+echo "configure:2743: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -2741,7 +2747,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 2745 "configure"
+#line 2751 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -2752,7 +2758,7 @@ int main() {
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:2756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -2939,14 +2945,6 @@ if test -n "${with_cross_host}"; then
 EOF
 
    cat >> confdefs.h <<\EOF
-#define NO_CLOCK 1
-EOF
-
-   cat >> confdefs.h <<\EOF
-#define SMALL_CONFIG 1
-EOF
-
-   cat >> confdefs.h <<\EOF
 #define NO_DEBUGGING 1
 EOF
 
diff --git a/boehm-gc/configure.in b/boehm-gc/configure.in
index 2d5803b0f57..661d0189725 100644
--- a/boehm-gc/configure.in
+++ b/boehm-gc/configure.in
@@ -108,7 +108,10 @@ case "$THREADS" in
 	;;
     esac
     ;;
- decosf1 | irix | mach | os2 | solaris | win32 | dce | vxworks)
+ win32)
+    AC_DEFINE(GC_WIN32_THREADS)
+    ;;
+ decosf1 | irix | mach | os2 | solaris | dce | vxworks)
     AC_MSG_ERROR(thread package $THREADS not yet supported)
     ;;
  *)
@@ -226,12 +229,10 @@ AC_DEFINE(GC_GCJ_SUPPORT)
 AC_DEFINE(ATOMIC_UNCOLLECTABLE)
 
 dnl This is something of a hack.  When cross-compiling we turn off
-dnl some functionality.  We also enable the "small" configuration.
-dnl These is only correct when targetting an embedded system.  FIXME.
+dnl some functionality. These is only correct when targetting an
+dnl embedded system.  FIXME.
 if test -n "${with_cross_host}"; then
    AC_DEFINE(NO_SIGSET)
-   AC_DEFINE(NO_CLOCK)
-   AC_DEFINE(SMALL_CONFIG)
    AC_DEFINE(NO_DEBUGGING)
 fi