about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sysdeps/sparc/fpu/bits/mathinline.h6
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 701ce3c7b8..d50ca4fdbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-09-14  Jakub Jelinek  <jakub@redhat.com>
+
+	* posix/regex.c (compile_range): Cast collseq index to unsigned char
+	to avoid accessing data before collseq.
+
+	* sysdeps/sparc/fpu/bits/mathinline.h (__unordered_v9cmp): Avoid
+	pasting strings together.
+
 2000-09-14  Greg McGary  <greg@mcgary.org>
 
 	* bp-checks.h: Remove bogus reference to GNU MP in copyright notice.
diff --git a/sysdeps/sparc/fpu/bits/mathinline.h b/sysdeps/sparc/fpu/bits/mathinline.h
index 7adebd3ec0..50e296d9b4 100644
--- a/sysdeps/sparc/fpu/bits/mathinline.h
+++ b/sysdeps/sparc/fpu/bits/mathinline.h
@@ -1,7 +1,7 @@
 /* Inline math functions for SPARC.
    Copyright (C) 1999, 2000 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Jakub Jelinek <jj@ultra.linux.cz>.
+   Contributed by Jakub Jelinek <jakub@redhat.com>.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -62,13 +62,13 @@
       if (sizeof(x) == 4 && sizeof(y) == 4)				      \
 	{								      \
 	  float __x = (x); float __y = (y);				      \
-	  __asm__("fcmps\t%%fcc3,%1,%2\n\tmov" ## op ## "\t%%fcc3,1,%0"	      \
+	  __asm__("fcmps\t%%fcc3,%1,%2\n\tmov" op "\t%%fcc3,1,%0"	      \
 		  : "=r" (__r) : "f" (__x), "f" (__y), "0" (0) : "cc");	      \
 	}								      \
       else if (sizeof(x) <= 8 && sizeof(y) <= 8)			      \
 	{								      \
 	  double __x = (x); double __y = (y);				      \
-	  __asm__("fcmpd\t%%fcc3,%1,%2\n\tmov" ## op ## "\t%%fcc3,1,%0"	      \
+	  __asm__("fcmpd\t%%fcc3,%1,%2\n\tmov" op "\t%%fcc3,1,%0"	      \
 		  : "=r" (__r) : "f" (__x), "f" (__y), "0" (0) : "cc");	      \
 	}								      \
       else								      \