1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00

S/390: Revert the jmp_buf/ucontext_t ABI change.

This commit is contained in:
Stefan Liebler
2014-07-31 20:04:54 +02:00
committed by Andreas Krebbel
parent 6c9578a24b
commit 2f438e20ab
36 changed files with 251 additions and 786 deletions

View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013 Free Software Foundation, Inc.
/* Copyright (C) 2014 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
@ -15,30 +15,34 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>.
This is a copy of debug/longjmp_chk.c extended for symbol
versioning. */
Versioned copy of debug/longjmp_chk.c modified for versioning
the reverted jmpbuf extension. */
#include <shlib-compat.h>
#include <setjmp.h>
/* This place is the only user of these functions. */
extern void ____v2__longjmp_chk (__jmp_buf __env, int __val)
#if !defined NOT_IN_libc && defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_19, GLIBC_2_20)
/* this is a copy from debug/longjmp_chk.c because we need an unique name
for __longjmp_chk, but it is already named via a define
for __libc_siglongjmp in debug/longjmp_chk.c. */
# include <setjmp.h>
// XXX Should move to include/setjmp.h
extern void ____longjmp_chk (__jmp_buf __env, int __val)
__attribute__ ((__noreturn__));
#if defined NOT_IN_libc
# define __longjmp ____longjmp_chk
# define __libc_siglongjmp __v1__longjmp_chk
# define __v2__longjmp ____longjmp_chk
# define __v2__libc_siglongjmp __longjmp_chk
# include <setjmp/longjmp.c>
# include <longjmp.c>
/* In glibc release 2.19 a new versions of __longjmp_chk was introduced,
but was reverted before 2.20. Thus both versions are the same function. */
strong_alias (__v1__longjmp_chk, __v2__longjmp_chk);
versioned_symbol (libc, __v1__longjmp_chk, __longjmp_chk, GLIBC_2_11);
compat_symbol (libc, __v2__longjmp_chk, __longjmp_chk, GLIBC_2_19);
#else
# define __v2__longjmp ____v2__longjmp_chk
# define __v2__libc_siglongjmp __v2__libc_siglongjmp_chk
# include <longjmp.c>
versioned_symbol (libc, __v2__libc_siglongjmp_chk, __longjmp_chk, GLIBC_2_19);
# include <debug/longjmp_chk.c>
#endif