libjava:

2004-08-13  Bryce McKinlay  <mckinlay@redhat.com>

	* configure.in (GCINCS): Don't use "boehm-cflags". Instead, -I
	boehm-gc's include dirs.
	* configure: Rebuilt.
	* include/boehm-gc.h: Include gc_config.h.

boehm-gc:
2004-08-13  Bryce McKinlay  <mckinlay@redhat.com>

	* configure.ac (gc_cflags): Add -Iinclude.
	(AC_CONFIG_HEADERS): New. Configure gc_config.h header.
	Don't write DEFS to boehm-cflags file.
	* configure: Rebuilt.
	* gcj_mlc.c: Check #ifdef GC_GCJ_SUPPORT after including headers.
	* specific.c: Check #ifdef GC_LINUX_THREADS after including headers.
	* include/gc_config_macros.h: Remove backward-compatibility
	redefinitions of GC_ names.
	* include/gc.h: Include <gc_config.h>.

2004-08-13  Bryce McKinlay  <mckinlay@redhat.com>

	Import Boehm GC version 6.3.


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

4 files changed, 12 insertions, 6 deletions

diff --git a/boehm-gc/cord/cordprnt.c b/boehm-gc/cord/cordprnt.c
index 6ecc00e8410..ad937b02d4e 100644
--- a/boehm-gc/cord/cordprnt.c
+++ b/boehm-gc/cord/cordprnt.c
@@ -261,7 +261,7 @@ int CORD_vsprintf(CORD * out, CORD format, va_list args)
 #		    ifdef __va_copy
                       __va_copy(vsprintf_args, args);
 #		    else
-#		      if defined(__GNUC__) /* and probably in other cases */
+#		      if defined(__GNUC__) && !defined(__DJGPP__) /* and probably in other cases */
                         va_copy(vsprintf_args, args);
 #		      else
 			vsprintf_args = args;
diff --git a/boehm-gc/cord/cordtest.c b/boehm-gc/cord/cordtest.c
index d54c65fe0d7..8f4836a2333 100644
--- a/boehm-gc/cord/cordtest.c
+++ b/boehm-gc/cord/cordtest.c
@@ -11,6 +11,7 @@
  * modified is included with the above copyright notice.
  */
 /* Boehm, August 24, 1994 11:58 am PDT */
+# include "gc.h"	/* For GC_INIT() only */
 # include "cord.h"
 # include <string.h>
 # include <stdio.h>
@@ -116,7 +117,7 @@ void test_basics()
 
 void test_extras()
 {
-#   if defined(__OS2__)
+#   if defined(__OS2__) || defined(__DJGPP__)
 #	define FNAME1 "tmp1"
 #	define FNAME2 "tmp2"
 #   elif defined(AMIGA)
@@ -162,6 +163,10 @@ void test_extras()
         x = CORD_cat(x,x);
     }
     if ((f = fopen(FNAME2, "w")) == 0) ABORT("2nd open failed");
+#   ifdef __DJGPP__
+      /* FIXME: DJGPP workaround.  Why does this help? */
+      if (fflush(f) != 0) ABORT("fflush failed");
+#   endif
     if (CORD_put(x,f) == EOF) ABORT("CORD_put failed");
     if (fclose(f) == EOF) ABORT("fclose failed");
     w = CORD_from_file(f2 = fopen(FNAME2, "rb"));
@@ -221,6 +226,7 @@ main()
 #   ifdef THINK_C
         printf("cordtest:\n");
 #   endif
+    GC_INIT();
     test_basics();
     test_extras();
     test_printf();
diff --git a/boehm-gc/cord/cordxtra.c b/boehm-gc/cord/cordxtra.c
index a5be10de58a..b0a746226cb 100644
--- a/boehm-gc/cord/cordxtra.c
+++ b/boehm-gc/cord/cordxtra.c
@@ -385,9 +385,9 @@ size_t CORD_str(CORD x, size_t start, CORD s)
         mask <<= 8;
         mask |= 0xff;
         s_buf <<= 8;
-        s_buf |= s_start[i];
+        s_buf |= (unsigned char)s_start[i];
         x_buf <<= 8;
-        x_buf |= CORD_pos_fetch(xpos);
+        x_buf |= (unsigned char)CORD_pos_fetch(xpos);
         CORD_next(xpos);
     }
     for (match_pos = start; ; match_pos++) {
@@ -402,7 +402,7 @@ size_t CORD_str(CORD x, size_t start, CORD s)
 	    return(CORD_NOT_FOUND);
 	}
     	x_buf <<= 8;
-        x_buf |= CORD_pos_fetch(xpos);
+        x_buf |= (unsigned char)CORD_pos_fetch(xpos);
         CORD_next(xpos);
     }
 }
diff --git a/boehm-gc/cord/de.c b/boehm-gc/cord/de.c
index fda71424176..989e19a8881 100644
--- a/boehm-gc/cord/de.c
+++ b/boehm-gc/cord/de.c
@@ -569,9 +569,9 @@ char ** argv;
 #if defined(MACINTOSH)
 	console_options.title = "\pDumb Editor";
 	cshow(stdout);
-	GC_init();
 	argc = ccommand(&argv);
 #endif
+    GC_INIT();
     
     if (argc != 2) goto usage;
     arg_file_name = argv[1];