qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use #include instead of duplication for i386 vs i686 dl-sysdep.h in NPTL.

This commit is contained in:
Roland McGrath 2009-11-22 17:49:21 -08:00
parent 6503cfe2de
commit 57a299fe47
2 changed files with 10 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nptl/ChangeLog
View File

@ -1,3 +1,8 @@
2009-11-22 Roland McGrath <roland@redhat.com>
* sysdeps/unix/sysv/linux/i386/dl-sysdep.h: # include "i686/dl-sysdep.h"
instead of recapitulating its contents.
2009-11-18 Ulrich Drepper <drepper@redhat.com> 2009-11-18 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S: Minor * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.S: Minor

53
nptl/sysdeps/unix/sysv/linux/i386/dl-sysdep.h
View File

@ -1,5 +1,5 @@
/* System-specific settings for dynamic linker code. IA-32 version. /* System-specific settings for dynamic linker code. i386 version.
Copyright (C) 2002, 2003, 2008 Free Software Foundation, Inc. Copyright (C) 2002,2003,2008,2009 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -18,56 +18,11 @@
02111-1307 USA. */ 02111-1307 USA. */
#ifndef _DL_SYSDEP_H #ifndef _DL_SYSDEP_H
#define _DL_SYSDEP_H 1 # include "i686/dl-sysdep.h"
/* This macro must be defined to either 0 or 1. /* sysenter/syscall is not useful on i386 through i586, but the dynamic
If 1, then an errno global variable hidden in ld.so will work right with
all the errno-using libc code compiled for ld.so, and there is never a
need to share the errno location with libc. This is appropriate only if
all the libc functions that ld.so uses are called without PLT and always
get the versions linked into ld.so rather than the libc ones. */
#ifdef IS_IN_rtld
# define RTLD_PRIVATE_ERRNO 1
#else
# define RTLD_PRIVATE_ERRNO 0
#endif
/* Traditionally system calls have been made using int $0x80. A
second method was introduced which, if possible, will use the
sysenter/syscall instructions. To signal the presence and where to
find the code the kernel passes an AT_SYSINFO value in the
auxiliary vector to the application.
sysenter/syscall is not useful on i386 through i586, but the dynamic
linker and dl code in libc.a has to be able to load i686 compiled linker and dl code in libc.a has to be able to load i686 compiled
libraries. */ libraries. */
#define NEED_DL_SYSINFO 1
# undef USE_DL_SYSINFO # undef USE_DL_SYSINFO
#if defined NEED_DL_SYSINFO && !defined __ASSEMBLER__
extern void _dl_sysinfo_int80 (void) attribute_hidden;
# define DL_SYSINFO_DEFAULT (uintptr_t) _dl_sysinfo_int80
# define DL_SYSINFO_IMPLEMENTATION \
asm (".text\n\t" \
".type _dl_sysinfo_int80,@function\n\t" \
".hidden _dl_sysinfo_int80\n\t" \
CFI_STARTPROC "\n" \
"_dl_sysinfo_int80:\n\t" \
"int $0x80;\n\t" \
"ret;\n\t" \
CFI_ENDPROC "\n" \
".size _dl_sysinfo_int80,.-_dl_sysinfo_int80\n\t" \
".previous;");
#endif
/* The _dl_discover_osversion function is so far only needed in sysconf
to check for kernels later than 2.6.23. */
#if !defined __ASSEMBLER__ && __LINUX_KERNEL_VERSION < 0x020617
/* Get version of the OS. */
extern int _dl_discover_osversion (void) attribute_hidden;
# define HAVE_DL_DISCOVER_OSVERSION 1
#endif
#endif /* dl-sysdep.h */ #endif /* dl-sysdep.h */