diff --git a/ChangeLog b/ChangeLog
index 97b80aa23e..5e7b766cdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-05-20  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/x86_64/rawmemchr.S (L(return_null)): Removed.
+
 2017-05-20  Zack Weinberg  <zackw@panix.com>
 
 	* sysdeps/arm/sysdep.h
diff --git a/sysdeps/x86_64/rawmemchr.S b/sysdeps/x86_64/rawmemchr.S
index 021a0aec79..0405c7bb99 100644
--- a/sysdeps/x86_64/rawmemchr.S
+++ b/sysdeps/x86_64/rawmemchr.S
@@ -196,11 +196,6 @@ L(matches32):
 	lea	32(%rax, %rdi), %rax
 	ret
 
-	.p2align 4
-L(return_null):
-	xor	%rax, %rax
-	ret
-
 END (__rawmemchr)
 
 weak_alias (__rawmemchr, rawmemchr)