diff --git a/ChangeLog b/ChangeLog
index fc80eb54cb..95443cabfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2007-08-16  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/sparc/sparc32/sparcv9b/memcpy.S: Moved to...
+	* sysdeps/sparc/sparc32/sparcv9/sparcv9b/memcpy.S: ... here.  New
+	file.
+	(ASI_PNF, ASI_BLK_P): Don't define.
+	* sysdeps/sparc/sparc32/sparcv9v/memcpy.S: Moved to...
+	* sysdeps/sparc/sparc32/sparcv9/sparcv9v/memcpy.S: ... here.  New
+	file.
+	* sysdeps/sparc/sparc32/sparcv9v/memset.S: Moved to...
+	* sysdeps/sparc/sparc32/sparcv9/sparcv9v/memset.S: ... here.  New
+	file.
+
 2007-08-15  Jakub Jelinek  <jakub@redhat.com>
 
 	* sysdeps/sparc/fpu/fraiseexcpt.c (__feraiseexcept): Fix raising
diff --git a/sysdeps/sparc/sparc32/sparcv9b/memcpy.S b/sysdeps/sparc/sparc32/sparcv9/sparcv9b/memcpy.S
similarity index 51%
rename from sysdeps/sparc/sparc32/sparcv9b/memcpy.S
rename to sysdeps/sparc/sparc32/sparcv9/sparcv9b/memcpy.S
index 1404dead73..61960dce61 100644
--- a/sysdeps/sparc/sparc32/sparcv9b/memcpy.S
+++ b/sysdeps/sparc/sparc32/sparcv9/sparcv9b/memcpy.S
@@ -1,4 +1,2 @@
-#define ASI_PNF     0x82
-#define ASI_BLK_P   0xf0
 #define XCC icc
 #include <sparc64/sparcv9b/memcpy.S>
diff --git a/sysdeps/sparc/sparc32/sparcv9v/memcpy.S b/sysdeps/sparc/sparc32/sparcv9/sparcv9v/memcpy.S
similarity index 100%
rename from sysdeps/sparc/sparc32/sparcv9v/memcpy.S
rename to sysdeps/sparc/sparc32/sparcv9/sparcv9v/memcpy.S
diff --git a/sysdeps/sparc/sparc32/sparcv9v/memset.S b/sysdeps/sparc/sparc32/sparcv9/sparcv9v/memset.S
similarity index 100%
rename from sysdeps/sparc/sparc32/sparcv9v/memset.S
rename to sysdeps/sparc/sparc32/sparcv9/sparcv9v/memset.S