diff --git a/ChangeLog b/ChangeLog
index 66435308d8..556dc4a099 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,14 @@
 2002-07-16  Ulrich Drepper  <drepper@redhat.com>
 
+	* catgets/tst-catgets.c (main): Don't expect results for
+	untranslated messages.
+
 	* glibcbug.in: Fix little typo.  Remove STDIO.
 
 	* config.h.in: Fail if __FAST_MATH__ is defined.
+	* math/Makefile (CPPFLAGS-test-ifloat.c): Also define TEST_FAST_MATH.
+	(CPPFLAGS-test-idouble.c): Likewise.
+	(CPPFLAGS-test-ildouble.c): Likewise.
 
 2002-07-15  Ulrich Drepper  <drepper@redhat.com>
 
diff --git a/catgets/tst-catgets.c b/catgets/tst-catgets.c
index 20e2738232..249e89f7e0 100644
--- a/catgets/tst-catgets.c
+++ b/catgets/tst-catgets.c
@@ -41,14 +41,14 @@ main (void)
 	  char *trans;
 
 	  trans = catgets (cd, 1, 1 + cnt,
-			   "+#+# is this comes backs it's an error");
+			   "+#+# if this comes backs it's an error");
 
 	  if (trans == NULL)
 	    {
 	      printf ("catgets return NULL for %d\n", cnt);
 	      result = 1;
 	    }
-	  else if (strcmp (trans, msgs[cnt]) != 0)
+	  else if (strcmp (trans, msgs[cnt]) != 0 && msgs[cnt][0] != '\0')
 	    {
 	      printf ("expected \"%s\", got \"%s\"\n", msgs[cnt], trans);
 	      result = 1;
diff --git a/config.h.in b/config.h.in
index 5bafd13a6e..b3dd601f3b 100644
--- a/config.h.in
+++ b/config.h.in
@@ -4,7 +4,7 @@
 
 /* Another evil option when it comes to compiling the C library is
    --ffast-math since it alters the ABI.  */
-#ifdef __FAST_MATH__
+#if defined __FAST_MATH__ && !defined TEST_FAST_MATH
 # error "glibc must not be compiled with -ffast-math"
 #endif
 
diff --git a/linuxthreads_db/td_thr_validate.c b/linuxthreads_db/td_thr_validate.c
index 8334ef74b7..6f893d3f7f 100644
--- a/linuxthreads_db/td_thr_validate.c
+++ b/linuxthreads_db/td_thr_validate.c
@@ -28,19 +28,26 @@ td_thr_validate (const td_thrhandle_t *th)
   struct pthread_handle_struct *handles = th->th_ta_p->handles;
   int pthread_threads_max = th->th_ta_p->pthread_threads_max;
   int cnt;
+  struct pthread_handle_struct phc;
 
   LOG ("td_thr_validate");
 
   /* A special case: if the program just starts up the handle is
      NULL.  */
   if (th->th_unique == NULL)
-    return TD_OK;
+    {
+      /* Read the first handle.  If the pointer to the thread
+	 descriptor is not NULL this is an error.  */
+      if (ps_pdread (th->th_ta_p->ph, handles, &phc,
+		     sizeof (struct pthread_handle_struct)) != PS_OK)
+	return TD_ERR;	/* XXX Other error value?  */
+
+      return phc.h_descr == NULL ? TD_OK : TD_NOTHR;
+    }
 
   /* Now get all descriptors, one after the other.  */
   for (cnt = 0; cnt < pthread_threads_max; ++cnt, ++handles)
     {
-      struct pthread_handle_struct phc;
-
       if (ps_pdread (th->th_ta_p->ph, handles, &phc,
 		     sizeof (struct pthread_handle_struct)) != PS_OK)
 	return TD_ERR;	/* XXX Other error value?  */
diff --git a/math/Makefile b/math/Makefile
index 2887aed649..d59b054fce 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -122,9 +122,12 @@ CFLAGS-test-float.c = -fno-inline -ffloat-store
 CFLAGS-test-double.c = -fno-inline -ffloat-store
 CFLAGS-test-ldouble.c = -fno-inline -ffloat-store
 CFLAGS-test-tgmath.c = -fno-builtin
-CPPFLAGS-test-ifloat.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__
-CPPFLAGS-test-idouble.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__
-CPPFLAGS-test-ildoubl.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__
+CPPFLAGS-test-ifloat.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__ \
+			 -DTEST_FAST_MATH
+CPPFLAGS-test-idouble.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__ \
+			 -DTEST_FAST_MATH
+CPPFLAGS-test-ildoubl.c = -U__LIBC_INTERNAL_MATH_INLINES -D__FAST_MATH__ \
+			  -DTEST_FAST_MATH
 
 distribute += libm-test.inc gen-libm-test.pl README.libm-test