diff options
| author | John David Anglin <danglin@gcc.gnu.org> | 2024-07-19 10:10:17 -0400 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2024-07-19 21:22:02 +0200 |
| commit | f6a75fddf4e71545c63dfcad99cc2df9bac38093 (patch) | |
| tree | 2962d4569dca1f1c68c67e0141757f6b56bf552e | |
| parent | e8f521709731ce3ae8d6f1eca30135d5c0606f02 (diff) | |
| download | glibc-f6a75fddf4e71545c63dfcad99cc2df9bac38093.tar.gz glibc-f6a75fddf4e71545c63dfcad99cc2df9bac38093.tar.xz glibc-f6a75fddf4e71545c63dfcad99cc2df9bac38093.zip | |
Fix usage of _STACK_GROWS_DOWN and _STACK_GROWS_UP defines [BZ 31989]
Signed-off-by: John David Anglin <dave.anglin@bell.net> Reviewed-By: Andreas K. Hüttel <dilfridge@gentoo.org> (cherry picked from commit 8cfa4ecff21adf226984f135aa576dd8063bbba3)
| -rw-r--r-- | malloc/memusage.c | 2 | ||||
| -rw-r--r-- | stdlib/tst-swapcontext2.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/____longjmp_chk.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/malloc/memusage.c b/malloc/memusage.c index e8ae80dc74..f80225b95a 100644 --- a/malloc/memusage.c +++ b/malloc/memusage.c @@ -172,7 +172,7 @@ update_data (struct header *result, size_t len, size_t old_len) start_sp = __thread_stack_pointer (); uintptr_t sp = __thread_stack_pointer (); -#ifdef _STACK_GROWS_UP +#if _STACK_GROWS_UP /* This can happen in threads where we didn't catch the thread's stack early enough. */ if (__glibc_unlikely (sp < start_sp)) diff --git a/stdlib/tst-swapcontext2.c b/stdlib/tst-swapcontext2.c index f679755649..a9c1dc827c 100644 --- a/stdlib/tst-swapcontext2.c +++ b/stdlib/tst-swapcontext2.c @@ -85,7 +85,7 @@ do_test (void) { /* ____longjmp_chk has */ #if 0 -#ifdef _STACK_GROWS_DOWN +#if _STACK_GROWS_DOWN #define called_from(this, saved) ((this) < (saved)) #else #define called_from(this, saved) ((this) > (saved)) @@ -98,7 +98,7 @@ do_test (void) /* Arrange stacks for uctx_func1 and uctx_func2 so that called_from is true when setjmp is called from uctx_func1 and longjmp is called from uctx_func2. */ -#ifdef _STACK_GROWS_DOWN +#if _STACK_GROWS_DOWN # define UCTX_FUNC1_STACK 1 # define UCTX_FUNC2_STACK 0 #else diff --git a/sysdeps/unix/sysv/linux/____longjmp_chk.c b/sysdeps/unix/sysv/linux/____longjmp_chk.c index 0896dc5755..3c66a4638e 100644 --- a/sysdeps/unix/sysv/linux/____longjmp_chk.c +++ b/sysdeps/unix/sysv/linux/____longjmp_chk.c @@ -23,7 +23,7 @@ #include <stdio.h> #include <stackinfo.h> -#ifdef _STACK_GROWS_DOWN +#if _STACK_GROWS_DOWN #define called_from(this, saved) ((this) < (saved)) #else #define called_from(this, saved) ((this) > (saved)) |