mirror of git://sourceware.org/git/glibc.git
(JB_SIZE): Undefine before including __longjmp-common.S again.
This commit is contained in:
parent
9852f6dcff
commit
2e56087703
|
@ -21,7 +21,7 @@
|
||||||
#include <shlib-compat.h>
|
#include <shlib-compat.h>
|
||||||
|
|
||||||
#if defined NOT_IN_libc
|
#if defined NOT_IN_libc
|
||||||
/* Build a none versioned object for rtld-*. */
|
/* Build a non-versioned object for rtld-*. */
|
||||||
# include "__longjmp-common.S"
|
# include "__longjmp-common.S"
|
||||||
|
|
||||||
#else /* !NOT_IN_libc */
|
#else /* !NOT_IN_libc */
|
||||||
|
@ -32,6 +32,7 @@ default_symbol_version (__vmx__longjmp,__longjmp,GLIBC_2.3.4);
|
||||||
|
|
||||||
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
|
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_3_4)
|
||||||
# define __NO_VMX__
|
# define __NO_VMX__
|
||||||
|
# undef JB_SIZE
|
||||||
symbol_version (__novmx__longjmp,__longjmp,GLIBC_2.0);
|
symbol_version (__novmx__longjmp,__longjmp,GLIBC_2.0);
|
||||||
# undef __longjmp
|
# undef __longjmp
|
||||||
# define __longjmp __novmx__longjmp
|
# define __longjmp __novmx__longjmp
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
#include <shlib-compat.h>
|
#include <shlib-compat.h>
|
||||||
|
|
||||||
#if defined NOT_IN_libc
|
#if defined NOT_IN_libc
|
||||||
/* Build a none versioned object for rtld-*. */
|
/* Build a non-versioned object for rtld-*. */
|
||||||
# include "__longjmp-common.S"
|
# include "__longjmp-common.S"
|
||||||
|
|
||||||
#else /* !NOT_IN_libc */
|
#else /* !NOT_IN_libc */
|
||||||
|
@ -34,6 +34,7 @@ default_symbol_version (__vmx__longjmp,__longjmp,GLIBC_2.3.4)
|
||||||
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)
|
# if defined SHARED && SHLIB_COMPAT (libc, GLIBC_2_3, GLIBC_2_3_4)
|
||||||
# define __NO_VMX__
|
# define __NO_VMX__
|
||||||
# undef __longjmp
|
# undef __longjmp
|
||||||
|
# undef JB_SIZE
|
||||||
symbol_version(__novmx__longjmp,__longjmp,GLIBC_2.3)
|
symbol_version(__novmx__longjmp,__longjmp,GLIBC_2.3)
|
||||||
# define __longjmp __novmx__longjmp
|
# define __longjmp __novmx__longjmp
|
||||||
# include "__longjmp-common.S"
|
# include "__longjmp-common.S"
|
||||||
|
|
Loading…
Reference in New Issue