about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSiddhesh Poyarekar <siddhesh@redhat.com>2013-06-15 00:09:26 +0530
committerSiddhesh Poyarekar <siddhesh@redhat.com>2013-06-15 00:09:26 +0530
commit747ef469ffc9c9179ca9d76854167925b4e44346 (patch)
tree9f8a3db8f6ddc37fd676f76ef9c35e4213f5ae13
parent1b2feed2640d7304f742b2f427f0b9b964e1dfc4 (diff)
downloadglibc-747ef469ffc9c9179ca9d76854167925b4e44346.tar.gz
glibc-747ef469ffc9c9179ca9d76854167925b4e44346.tar.xz
glibc-747ef469ffc9c9179ca9d76854167925b4e44346.zip
Add rtld-memset.S for x86_64
Resolves: BZ #15627

Add an assembler version of rtld-memset to avoid using SSE registers.
-rw-r--r--ChangeLog7
-rw-r--r--NEWS2
-rw-r--r--sysdeps/x86_64/rtld-memset.S37
-rw-r--r--sysdeps/x86_64/rtld-memset.c1
4 files changed, 45 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 0405645be4..77ac80380c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-06-14  Siddhesh Poyarekar  <siddhesh@redhat.com>
+	    H.J. Lu  <hjl.tools@gmail.com>
+
+	[BZ #15627]
+	* sysdeps/x86_64/rtld-memset.c: Remove file.
+	* sysdeps/x86_64/rtld-memset.S: New file.
+
 2013-06-14  Joseph Myers  <joseph@codesourcery.com>
 
 	* stdlib/tst-strtod-round.c: Include <math-tests.h>.
diff --git a/NEWS b/NEWS
index afbcacc7ef..6de51bf7e0 100644
--- a/NEWS
+++ b/NEWS
@@ -20,7 +20,7 @@ Version 2.18
   15380, 15381, 15394, 15395, 15405, 15406, 15409, 15416, 15418, 15419,
   15423, 15424, 15426, 15429, 15431, 15432, 15441, 15442, 15448, 15465,
   15480, 15485, 15488, 15490, 15493, 15497, 15506, 15529, 15536, 15553,
-  15577, 15583, 15618.
+  15577, 15583, 15618, 15627.
 
 * CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
   #15078).
diff --git a/sysdeps/x86_64/rtld-memset.S b/sysdeps/x86_64/rtld-memset.S
new file mode 100644
index 0000000000..18b4903109
--- /dev/null
+++ b/sysdeps/x86_64/rtld-memset.S
@@ -0,0 +1,37 @@
+/* memset implementation for the dynamic linker.  This is separate from the
+   libc implementation to avoid writing to SSE registers.
+   Copyright (C) 2013 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
+
+   The GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   The GNU C Library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.  */
+
+#include <sysdep.h>
+#include "asm-syntax.h"
+
+
+	.text
+/* void *memset (void *dest, char c, size_t count)
+   dest	 => %rdi
+   c	 => %rsi
+   count => %rdx  */
+ENTRY (memset)
+	mov	%rdx, %rcx
+	movzbl	%sil, %eax
+	mov	%rdi, %rdx
+	rep	stosb
+	mov	%rdx, %rax
+	ret
+END (memset)
+libc_hidden_builtin_def (memset)
diff --git a/sysdeps/x86_64/rtld-memset.c b/sysdeps/x86_64/rtld-memset.c
deleted file mode 100644
index 55f3835790..0000000000
--- a/sysdeps/x86_64/rtld-memset.c
+++ /dev/null
@@ -1 +0,0 @@
-#include <string/memset.c>