about summary refs log tree commit diff
path: root/sysdeps/i386/i586/bzero.S
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2015-08-19 13:43:30 -0700
committerH.J. Lu <hjl.tools@gmail.com>2015-08-20 15:22:48 -0700
commit884e3dc2fa14543c475af0e280cff07c8d468c3a (patch)
tree1074337a8c94c74f8687d9d8ceec1f11230bc34a /sysdeps/i386/i586/bzero.S
parent25f6f0832d1778e7af436af649fd49c252b1cc86 (diff)
downloadglibc-884e3dc2fa14543c475af0e280cff07c8d468c3a.tar.gz
glibc-884e3dc2fa14543c475af0e280cff07c8d468c3a.tar.xz
glibc-884e3dc2fa14543c475af0e280cff07c8d468c3a.zip
Replace BZERO_P/PIC with USE_AS_BZERO/SHARED
Replace BZERO_P with USE_AS_BZERO in i586/i686 memset.S to support i386
multi-arch memset.  Also we should check SHARED not PIC for libc.so
since libc.a may be compiled with PIC.

	* sysdeps/i386/i586/bzero.S (USE_AS_BZERO): New.
	* sysdeps/i386/i686/bzero.S (USE_AS_BZERO): Likewise.
	* sysdeps/i386/i586/memset.S (BZERO_P): Removed.
	Check USE_AS_BZERO/SHARED instead of BZERO_P/PIC.
	(__memset_zero_constant_len_parameter): New.
	* sysdeps/i386/i686/memset.S (BZERO_P): Removed.
	Check USE_AS_BZERO/SHARED instead of BZERO_P/PIC.
	(__memset_zero_constant_len_parameter): Don't define if
	__memset_chk or USE_AS_BZERO are defined.
Diffstat (limited to 'sysdeps/i386/i586/bzero.S')
-rw-r--r--sysdeps/i386/i586/bzero.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/sysdeps/i386/i586/bzero.S b/sysdeps/i386/i586/bzero.S
index 84d2f709c1..2a106719a4 100644
--- a/sysdeps/i386/i586/bzero.S
+++ b/sysdeps/i386/i586/bzero.S
@@ -1,3 +1,4 @@
+#define USE_AS_BZERO
 #define memset __bzero
 #include <sysdeps/i386/i586/memset.S>
 weak_alias (__bzero, bzero)