summary refs log tree commit diff
path: root/linuxthreads/weaks.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-03-22 08:01:35 +0000
committerUlrich Drepper <drepper@redhat.com>2000-03-22 08:01:35 +0000
commitef7dddd01c9b2c2e6e676c023b9b6ae63ae9e49d (patch)
tree6f95b7b9c141fb01f711138c8a2ea84a34c80d2d /linuxthreads/weaks.c
parent1ab1ea76bf65a1cf97dd734a75a08e1d79913b37 (diff)
downloadglibc-ef7dddd01c9b2c2e6e676c023b9b6ae63ae9e49d.tar.gz
glibc-ef7dddd01c9b2c2e6e676c023b9b6ae63ae9e49d.tar.xz
glibc-ef7dddd01c9b2c2e6e676c023b9b6ae63ae9e49d.zip
Update.
	* sysdeps/unix/sysv/linux/errlist.c: Likewise.
Diffstat (limited to 'linuxthreads/weaks.c')
-rw-r--r--linuxthreads/weaks.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/linuxthreads/weaks.c b/linuxthreads/weaks.c
index d6d028f2ec..a91f5cfb02 100644
--- a/linuxthreads/weaks.c
+++ b/linuxthreads/weaks.c
@@ -1,5 +1,5 @@
 /* The weak pthread functions for Linux.
-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999, 2000 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
@@ -20,20 +20,19 @@
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
+#include <shlib-compat.h>
 
 extern int __pthread_return_0 (void);
 extern int __pthread_return_1 (void);
 extern void __pthread_return_void (void);
 
 /* Those are pthread functions which return 0 if successful. */
-#if defined HAVE_ELF && defined PIC && defined DO_VERSIONING
-weak_alias (__pthread_return_0, __libc_pthread_attr_init_2_0)
-symbol_version (__libc_pthread_attr_init_2_0, pthread_attr_init, GLIBC_2.0);
 weak_alias (__pthread_return_0, __libc_pthread_attr_init_2_1)
-default_symbol_version (__libc_pthread_attr_init_2_1, pthread_attr_init,
-			GLIBC_2.1);
-#else
-weak_alias (__pthread_return_0, pthread_attr_init)
+versioned_symbol (libpthread, __libc_pthread_attr_init_2_1, pthread_attr_init,
+		  GLIBC_2_1);
+#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
+weak_alias (__pthread_return_0, __libc_pthread_attr_init_2_0)
+symbol_version (__libc_pthread_attr_init_2_, pthread_attr_init, GLIBC_2.0);
 #endif
 weak_alias (__pthread_return_0, pthread_attr_destroy)
 weak_alias (__pthread_return_0, pthread_attr_setdetachstate)