mirror of
https://sourceware.org/git/glibc.git
synced 2025-12-06 12:01:08 +03:00
37d13b179c
For each function setjmp, longjmp, getcontext, there exist a symbol <func> and a default/versioned symbol <func>@@GLIBC_2.x in the build obj-files. This is wrong because it should only exist an unversioned or a default-versioned symbol with the same name in an obj-file. Glibc can't be build with recent binutils. See the already fixed linker bug https://sourceware.org/bugzilla/show_bug.cgi?id=19073. Nevertheless, this patch cleans this up. Furthermore the BSD entry points setjmp, _setjmp were marked as weak, but should be strong as on other architectures. (see https://sourceware.org/ml/libc-alpha/2014-07/msg00568.html for an older discussion with Andreas Schwab) Some whitespace issues are corrected in sysdeps/s390/s390-64/setjmp.S, too. But there is no change in the assembler code. ChangeLog: * sysdeps/s390/longjmp.c (longjmp, _longjmp, siglongjmp): Don't create weak aliases, because versioned symbols are created later. * sysdeps/s390/s390-32/setjmp.S (setjmp, _setjmp): Remove weak and rename to an unique name in SHARED case due to existing versioned symbols. * sysdeps/s390/s390-64/setjmp.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/getcontext.S (getcontext): Create weak alias only in non SHARED case. * sysdeps/unix/sysv/linux/s390/s390-64/getcontext.S: Likewise.
53 lines
2.2 KiB
C
53 lines
2.2 KiB
C
/* Copyright (C) 2014-2015 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
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>.
|
|
|
|
Versioned copy of setjmp/longjmp.c modified for versioning
|
|
the reverted jmpbuf extension. */
|
|
|
|
#include <shlib-compat.h>
|
|
|
|
#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
|
|
/* We don't want the weak alias to longjmp, _longjmp, siglongjmp here,
|
|
because we create the default/versioned symbols later. */
|
|
# define __libc_siglongjmp __libc_siglongjmp
|
|
#endif /* SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */
|
|
|
|
#include <setjmp/longjmp.c>
|
|
|
|
#if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
|
|
/* In glibc release 2.19 new versions of longjmp-functions were introduced,
|
|
but were reverted before 2.20. Thus both versions are the same function. */
|
|
|
|
strong_alias (__libc_siglongjmp, __libc_longjmp)
|
|
libc_hidden_def (__libc_longjmp)
|
|
|
|
weak_alias (__libc_siglongjmp, __v1_longjmp)
|
|
weak_alias (__libc_siglongjmp, __v2_longjmp)
|
|
versioned_symbol (libc, __v1_longjmp, _longjmp, GLIBC_2_0);
|
|
compat_symbol (libc, __v2_longjmp, _longjmp, GLIBC_2_19);
|
|
|
|
weak_alias (__libc_siglongjmp, __v1longjmp)
|
|
weak_alias (__libc_siglongjmp, __v2longjmp)
|
|
versioned_symbol (libc, __v1longjmp, longjmp, GLIBC_2_0);
|
|
compat_symbol (libc, __v2longjmp, longjmp, GLIBC_2_19);
|
|
|
|
weak_alias (__libc_siglongjmp, __v1siglongjmp)
|
|
weak_alias (__libc_siglongjmp, __v2siglongjmp)
|
|
versioned_symbol (libc, __v1siglongjmp, siglongjmp, GLIBC_2_0);
|
|
compat_symbol (libc, __v2siglongjmp, siglongjmp, GLIBC_2_19);
|
|
#endif /* SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20) */
|