Merge branch 'upstream'

Former-commit-id: 4f7fdadd212c5dafe25173be3f767ead2ba1f58f

libgc/blacklst.c

@@ -21,7 +21,7 @@
  * See the definition of page_hash_table in gc_private.h.
  * False hits from the stack(s) are much more dangerous than false hits
  * from elsewhere, since the former can pin a large object that spans the
- * block, eventhough it does not start on the dangerous block.
+ * block, even though it does not start on the dangerous block.
  */
  
 /*

libgc/doc/README.changes.REMOVED.git-id

@@ -1 +1 @@
-fa6f279f518a5fac4b4778e9e869e4d82bb0539c
+c30d2fc2184751a5b49d4b1c65c76655d8af6006

libgc/doc/README.macros

@@ -19,7 +19,7 @@ relatively easy to adapt to new compilers with a different set of predefined
 macros.  Currently these macros generally identify platforms instead of
 features.  In many cases, this is a mistake.
 
-3) The code currently avoids #elif, eventhough that would make it more
+3) The code currently avoids #elif, even though that would make it more
 readable.  This was done since #elif would need to be understood by ALL
 compilers used to build the collector, and that hasn't always been the case.
 It makes sense to reconsider this decision at some point, since #elif has been

libgc/mark.c

@@ -936,7 +936,7 @@ void GC_do_local_mark(mse *local_mark_stack, mse *local_top)
 	    /* Try to share the load, since the main stack is empty,	*/
 	    /* and helper threads are waiting for a refill.		*/
 	    /* The entries near the bottom of the stack are likely	*/
-	    /* to require more work.  Thus we return those, eventhough	*/
+	    /* to require more work.  Thus we return those, even though	*/
 	    /* it's harder.						*/
 	    mse * p;
  	    mse * new_bottom = local_mark_stack