diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9dddeb18c965cd59e8004d34e2200e025ab9953c..d353dfbb61dc99fd8dfa1a565e1b77c25a52fce1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-06  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	PR bootstrap/44427
+	PR bootstrap/44428
+	genautomata.c (SET_BIT, CLEAR_BIT, TEST_BIT): Make these macros
+	endianness-independent.
+
 2010-06-05  Steven Bosscher  <steven@gcc.gnu.org>
 
 	* c-common.c: Move to c-family/.
diff --git a/gcc/genautomata.c b/gcc/genautomata.c
index ad7caa611b595e9a4d77ff62d41b1a62c1b4a4db..f7493c7071de23378efbceafb4734cf00a8ca629 100644
--- a/gcc/genautomata.c
+++ b/gcc/genautomata.c
@@ -3314,15 +3314,18 @@ finish_alt_states (void)
 /* Set bit number bitno in the bit string.  The macro is not side
    effect proof.  */
 #define SET_BIT(bitstring, bitno)					  \
-  (((char *) (bitstring)) [(bitno) / CHAR_BIT] |= 1 << (bitno) % CHAR_BIT)
+  ((bitstring)[(bitno) / (sizeof (*(bitstring)) * CHAR_BIT)] |=		  \
+	(HOST_WIDE_INT)1 << (bitno) % (sizeof (*(bitstring)) * CHAR_BIT))
 
 #define CLEAR_BIT(bitstring, bitno)					  \
-  (((char *) (bitstring)) [(bitno) / CHAR_BIT] &= ~(1 << (bitno) % CHAR_BIT))
+  ((bitstring)[(bitno) / (sizeof (*(bitstring)) * CHAR_BIT)] &=		  \
+	~((HOST_WIDE_INT)1 << (bitno) % (sizeof (*(bitstring)) * CHAR_BIT)))
 
 /* Test if bit number bitno in the bitstring is set.  The macro is not
    side effect proof.  */
-#define TEST_BIT(bitstring, bitno)                                        \
-  (((char *) (bitstring)) [(bitno) / CHAR_BIT] >> (bitno) % CHAR_BIT & 1)
+#define TEST_BIT(bitstring, bitno)					  \
+  ((bitstring)[(bitno) / (sizeof (*(bitstring)) * CHAR_BIT)] >>		  \
+	(bitno) % (sizeof (*(bitstring)) * CHAR_BIT) & 1)