about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-09-14 13:43:24 -0400
committerUlrich Drepper <drepper@gmail.com>2011-09-14 13:43:24 -0400
commitee4d03150a65018f367e3250887ec9c5b2133ce4 (patch)
tree53359d26fc08073b5b210e4f4968c1332697e7ca
parentcd20565401bfb2abc41203667aba681c44a96697 (diff)
downloadglibc-ee4d03150a65018f367e3250887ec9c5b2133ce4.tar.gz
glibc-ee4d03150a65018f367e3250887ec9c5b2133ce4.tar.xz
glibc-ee4d03150a65018f367e3250887ec9c5b2133ce4.zip
Use correct section to allow merging
-rw-r--r--ChangeLog2
-rw-r--r--sysdeps/x86_64/fpu/s_copysign.S4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ce8cefd110..57195c220b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-09-14  Ulrich Drepper  <drepper@gmail.com>
 
+	* sysdeps/x86_64/fpu/s_copysign.S [ELF]: Use correct section.
+
 	* sysdeps/x86_64/fpu/bits/mathinline.h (__MATH_INLINE): Use
 	__extern_always_inline.
 	Define lrint{f,} and llrint{f,} for 64-bit and in some situations for
diff --git a/sysdeps/x86_64/fpu/s_copysign.S b/sysdeps/x86_64/fpu/s_copysign.S
index f3d9b0cbb4..66c36c88eb 100644
--- a/sysdeps/x86_64/fpu/s_copysign.S
+++ b/sysdeps/x86_64/fpu/s_copysign.S
@@ -1,5 +1,5 @@
 /* copy sign, double version.
-   Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006, 2011 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Andreas Jaeger <aj@suse.de>, 2002.
 
@@ -21,7 +21,7 @@
 #include <machine/asm.h>
 
 #ifdef __ELF__
-	.section .rodata
+	.section .rodata.cst16,"aM",@progbits,16
 #else
 	.text
 #endif