Index: head/contrib/libgnuregex/regcomp.c
===================================================================
--- head/contrib/libgnuregex/regcomp.c
+++ head/contrib/libgnuregex/regcomp.c
@@ -930,26 +930,30 @@
   int ch = 0;
   if (BE (dfa->map_notascii == 0, 1))
     {
-      if (sizeof (dfa->word_char[0]) == 8)
+      /* Avoid uint32_t and uint64_t as some non-GCC platforms lack
+	 them, an issue when this code is used in Gnulib.  */
+      bitset_word_t bits0 = 0x00000000;
+      bitset_word_t bits1 = 0x03ff0000;
+      bitset_word_t bits2 = 0x87fffffe;
+      bitset_word_t bits3 = 0x07fffffe;
+
+      if (BITSET_WORD_BITS == 64)
 	{
-          /* The extra temporaries here avoid "implicitly truncated"
-             warnings in the case when this is dead code, i.e. 32-bit.  */
-          const uint64_t wc0 = UINT64_C (0x03ff000000000000);
-          const uint64_t wc1 = UINT64_C (0x07fffffe87fffffe);
-	  dfa->word_char[0] = wc0;
-	  dfa->word_char[1] = wc1;
+          /* Pacify gcc -Woverflow on 32-bit platformns.  */
+          dfa->word_char[0] = bits1 << 31 << 1 | bits0;
+          dfa->word_char[1] = bits3 << 31 << 1 | bits2;
 	  i = 2;
 	}
-      else if (sizeof (dfa->word_char[0]) == 4)
+      else if (BITSET_WORD_BITS == 32)
 	{
-	  dfa->word_char[0] = UINT32_C (0x00000000);
-	  dfa->word_char[1] = UINT32_C (0x03ff0000);
-	  dfa->word_char[2] = UINT32_C (0x87fffffe);
-	  dfa->word_char[3] = UINT32_C (0x07fffffe);
+          dfa->word_char[0] = bits0;
+          dfa->word_char[1] = bits1;
+          dfa->word_char[2] = bits2;
+          dfa->word_char[3] = bits3;
 	  i = 4;
 	}
       else
-	abort ();
+	goto general_case;
       ch = 128;
 
       if (BE (dfa->is_utf8, 1))
@@ -959,6 +963,7 @@
 	}
     }
 
+general_case:
   for (; i < BITSET_WORDS; ++i)
     for (int j = 0; j < BITSET_WORD_BITS; ++j, ++ch)
       if (isalnum (ch) || ch == '_')