picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Remove obsolete SHLIB_COMPAT conditionalization in Versions files.

Browse source
This commit is contained in:
Roland McGrath 2014-02-22 01:19:45 -08:00
parent 098ad55cf5
commit d4ec6ae19e
4 changed files with 9 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,5 +1,14 @@
2014-02-22 Roland McGrath <roland@hack.frob.com>
* Makerules ($(common-objpfx)Versions.v.i): No longer depend
on $(common-objpfx)abi-versions.h; using <shlib-compat.h> inside
Versions files is now verboten.
* hurd/Versions (libc: GLIBC_2.0):
Remove various [SHLIB_COMPAT (libc, GLIBC_2_0, ...)] sections.
(libc: HURD_CTHREADS_0.3): Remove conditionalization, was under
[!SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)].
* mach/Versions: Likewise.
* csu/Versions: Remove unused %include.
* resolv/Versions: Likewise.

1
Makerules
View file

@ -311,7 +311,6 @@ $(common-objpfx)Versions.all: $(..)scripts/firstversions.awk \
# See %.v/%.v.i implicit rules in Makeconfig.
$(common-objpfx)Versions.v.i: $(wildcard $(subdirs:%=$(..)%/Versions)) \
$(wildcard $(sysdirs:%=%/Versions)) \
$(common-objpfx)abi-versions.h \
$(sysd-versions-force)
$(common-objpfx)sysd-versions: $(common-objpfx)Versions.all \
$(common-objpfx)Versions.v \

29
hurd/Versions
View file

@ -1,32 +1,5 @@
%define SHARED
%include <shlib-compat.h>
libc {
GLIBC_2.0 {
%if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
# These few symbols are here only for binary compatibility
# with the pre-versioning libc.so.0.2 ABI. Their replacements
# are in the GLIBC_2.1 version set. When the soname changes,
# these can be removed.
__getuids;
__hurd_file_name_lookup;
_hurd_proc_init; _hurd_umask;
%endif
# These go into a different version set if GLIBC_2.0 compatibility
# is not required. See below.
%if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
# variables used for detecting cthreads
_cthread_exit_routine; _cthread_init_routine;
# cthreads functions with stubs in libc
cthread_keycreate; cthread_getspecific; cthread_setspecific;
__libc_getspecific;
# weak refs to libthreads functions that libc calls iff libthreads in use
cthread_fork; cthread_detach;
%endif
# necessary for the Hurd brk implementation
_end;
@ -157,7 +130,6 @@ libc {
__errno_location;
}
%if !SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
HURD_CTHREADS_0.3 {
# weak refs to libthreads functions that libc calls iff libthreads in use
cthread_fork; cthread_detach;
@ -169,5 +141,4 @@ libc {
cthread_keycreate; cthread_getspecific; cthread_setspecific;
__libc_getspecific;
}
%endif
}

18
mach/Versions
View file

@ -1,27 +1,11 @@
%define SHARED
%include <shlib-compat.h>
libc {
GLIBC_2.0 {
%if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
# This symbol is here only for binary compatibility with the
# pre-versioning libc.so.0.2 ABI. When the soname changes,
# it can be removed.
__vm_allocate;
%endif
# variables used in Mach-specific macros
__mach_task_self_;
__vm_page_size;
# functions used in inline functions and macros
__mach_port_deallocate; __mach_thread_self;
%if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
__mutex_init; __mutex_lock; __mutex_lock_solid; __mutex_trylock;
__mutex_unlock; __mutex_unlock_solid;
__spin_lock; __spin_lock_init; __spin_lock_solid; __spin_try_lock;
__spin_unlock;
%endif
# functions used by RPC stubs
__mach_msg; __mach_msg_overwrite;
@ -71,12 +55,10 @@ libc {
mig_strncpy;
}
%if !SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_2)
HURD_CTHREADS_0.3 {
__mutex_init; __mutex_lock; __mutex_lock_solid; __mutex_trylock;
__mutex_unlock; __mutex_unlock_solid;
__spin_lock; __spin_lock_init; __spin_lock_solid; __spin_try_lock;
__spin_unlock;
}
%endif
}