about summary refs log tree commit diff
path: root/sysdeps/unix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-12-18 21:09:20 +0000
committerUlrich Drepper <drepper@redhat.com>2005-12-18 21:09:20 +0000
commit7725f8749a850972980349ca05259ea09d0b514f (patch)
treec7f9f3722de34955f71bab07249e6082d43e61ed /sysdeps/unix
parentd87921ee19b8c228490345fe2375b216fb7b0edd (diff)
downloadglibc-7725f8749a850972980349ca05259ea09d0b514f.tar.gz
glibc-7725f8749a850972980349ca05259ea09d0b514f.tar.xz
glibc-7725f8749a850972980349ca05259ea09d0b514f.zip
* sysdeps/unix/sysv/linux/x86_64/sysdep.h (PTR_MANGLE): Define C
	version for inside ld.so.

	* elf/rtld.c (dl_main): Don't use hp timing code unless it's available.
Diffstat (limited to 'sysdeps/unix')
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/sysdep.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
index bb0b604aea..5dfffca455 100644
--- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
@@ -320,7 +320,9 @@
 #  define PTR_MANGLE(reg)	xorq __pointer_chk_guard_local(%rip), reg
 #  define PTR_DEMANGLE(reg)	PTR_MANGLE (reg)
 # else
-#  error "Define these if necessary"
+#  define PTR_MANGLE(reg)	asm ("xorq __pointer_chk_guard_local(%%rip), %0"\
+				     : "=r" (reg) : "0" (reg))
+#  define PTR_DEMANGLE(reg)	PTR_MANGLE (reg)
 # endif
 #else
 # ifdef __ASSEMBLER__