diff --git a/ChangeLog b/ChangeLog
index a3cc377113..3f3831cd9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-01-20  Jakub Jelinek  <jakub@redhat.com>
 
+	* sysdeps/ieee754/ldbl-64-128/s_nexttowardfd.c: Moved to...
+	* sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c: ... here.  New file.
+	* sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h (long_double_symbol_1): For
+	C define again using _weak_alias, for assembler use weak_alias.
+
 	* sysdeps/powerpc/powerpc64/fpu/e_sqrt.c: New file.
 	* sysdeps/powerpc/powerpc64/fpu/e_sqrtf.c: New file.
 	* sysdeps/powerpc/fpu/bits/mathinline.h (__CPU_HAS_FSQRT): New macro.
diff --git a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
index bba00c1565..692b0c53c7 100644
--- a/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
+++ b/sysdeps/ieee754/ldbl-opt/math_ldbl_opt.h
@@ -24,10 +24,15 @@
 # define ldbl_hidden_def(local, name) libc_hidden_def (name)
 # define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname)
 # define ldbl_weak_alias(name, aliasname) weak_alias (name, aliasname)
+# ifndef __ASSEMBLER__
 /* Note that weak_alias cannot be used - it is defined to nothing
-   in most of the files.  */
-# define long_double_symbol_1(lib, local, symbol, version) \
+   in most of the C files.  */
+#  define long_double_symbol_1(lib, local, symbol, version) \
+  _weak_alias (local, symbol)
+# else
+#  define long_double_symbol_1(lib, local, symbol, version) \
   weak_alias (local, symbol)
+# endif
 #else
 # define ldbl_hidden_def(local, name) libc_hidden_def (name)
 # define ldbl_strong_alias(name, aliasname) strong_alias (name, aliasname)
diff --git a/sysdeps/ieee754/ldbl-64-128/s_nexttowardfd.c b/sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c
similarity index 100%
rename from sysdeps/ieee754/ldbl-64-128/s_nexttowardfd.c
rename to sysdeps/ieee754/ldbl-opt/s_nexttowardfd.c