diff options
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/config.in | 7 | ||||
| -rwxr-xr-x | gdb/configure | 74 | ||||
| -rw-r--r-- | gdb/linux-nat.c | 4 | ||||
| -rw-r--r-- | gdb/nat/linux-personality.c | 12 | ||||
| -rw-r--r-- | gdbserver/ChangeLog | 7 | ||||
| -rw-r--r-- | gdbserver/config.in | 7 | ||||
| -rwxr-xr-x | gdbserver/configure | 74 | ||||
| -rw-r--r-- | gdbserver/linux-low.cc | 4 | ||||
| -rw-r--r-- | gdbsupport/ChangeLog | 4 | ||||
| -rw-r--r-- | gdbsupport/common.m4 | 23 |
11 files changed, 22 insertions, 204 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 41fe042..3061bb9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2021-05-08 Pedro Alves <pedro@palves.net> + + * linux-nat.c (linux_nat_target::supports_disable_randomization): + Remove references to HAVE_PERSONALITY. + * nat/linux-personality.c: Remove references to HAVE_PERSONALITY. + (maybe_disable_address_space_randomization) + (~maybe_disable_address_space_randomizatio): Remove references to + HAVE_PERSONALITY. + * config.in, configure: Regenerate. + 2021-05-07 Andrew Burgess <andrew.burgess@embecosm.com> * cli/cli-cmds.c: Add 'gdbsupport/gdb_tilde_expand.h' diff --git a/gdb/config.in b/gdb/config.in index 5d10377..99c924f 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -96,10 +96,6 @@ /* define if the compiler supports basic C++11 syntax */ #undef HAVE_CXX11 -/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if - you don't. */ -#undef HAVE_DECL_ADDR_NO_RANDOMIZE - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you don't. */ #undef HAVE_DECL_ASPRINTF @@ -301,9 +297,6 @@ /* Define to 1 if you have the <nlist.h> header file. */ #undef HAVE_NLIST_H -/* Define if you support the personality syscall. */ -#undef HAVE_PERSONALITY - /* Define to 1 if you have the `pipe' function. */ #undef HAVE_PIPE diff --git a/gdb/configure b/gdb/configure index b47de77..cdc112e 100755 --- a/gdb/configure +++ b/gdb/configure @@ -13819,80 +13819,6 @@ fi done - ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include <sys/personality.h> -" -if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -_ACEOF - - - if test "$cross_compiling" = yes; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/personality.h> -int -main () -{ - - # if !HAVE_DECL_ADDR_NO_RANDOMIZE - # define ADDR_NO_RANDOMIZE 0x0040000 - # endif - /* Test the flag could be set and stays set. */ - personality (personality (0xffffffff) | ADDR_NO_RANDOMIZE); - if (!(personality (personality (0xffffffff)) & ADDR_NO_RANDOMIZE)) - return 1 - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - have_personality=true -else - have_personality=false -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/personality.h> -int -main () -{ - - # if !HAVE_DECL_ADDR_NO_RANDOMIZE - # define ADDR_NO_RANDOMIZE 0x0040000 - # endif - /* Test the flag could be set and stays set. */ - personality (personality (0xffffffff) | ADDR_NO_RANDOMIZE); - if (!(personality (personality (0xffffffff)) & ADDR_NO_RANDOMIZE)) - return 1 - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - have_personality=true -else - have_personality=false -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - if $have_personality - then - -$as_echo "#define HAVE_PERSONALITY 1" >>confdefs.h - - fi - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" if test "x$ac_cv_have_decl_strstr" = xyes; then : ac_have_decl=1 diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c index c45e335..e595c71 100644 --- a/gdb/linux-nat.c +++ b/gdb/linux-nat.c @@ -4022,11 +4022,7 @@ linux_nat_target::supports_multi_process () bool linux_nat_target::supports_disable_randomization () { -#ifdef HAVE_PERSONALITY return true; -#else - return false; -#endif } /* SIGCHLD handler that serves two purposes: In non-stop/async mode, diff --git a/gdb/nat/linux-personality.c b/gdb/nat/linux-personality.c index 87d1921..9ce345b 100644 --- a/gdb/nat/linux-personality.c +++ b/gdb/nat/linux-personality.c @@ -20,12 +20,7 @@ #include "gdbsupport/common-defs.h" #include "nat/linux-personality.h" -#ifdef HAVE_PERSONALITY -# include <sys/personality.h> -# if !HAVE_DECL_ADDR_NO_RANDOMIZE -# define ADDR_NO_RANDOMIZE 0x0040000 -# endif /* ! HAVE_DECL_ADDR_NO_RANDOMIZE */ -#endif /* HAVE_PERSONALITY */ +#include <sys/personality.h> /* See comment on nat/linux-personality.h. */ @@ -34,7 +29,6 @@ maybe_disable_address_space_randomization (int disable_randomization) : m_personality_set (false), m_personality_orig (0) { -#ifdef HAVE_PERSONALITY if (disable_randomization) { errno = 0; @@ -49,14 +43,11 @@ maybe_disable_address_space_randomization (int disable_randomization) warning (_("Error disabling address space randomization: %s"), safe_strerror (errno)); } -#endif /* HAVE_PERSONALITY */ } maybe_disable_address_space_randomization:: ~maybe_disable_address_space_randomization () { -#ifdef HAVE_PERSONALITY - if (m_personality_set) { errno = 0; @@ -65,5 +56,4 @@ maybe_disable_address_space_randomization:: warning (_("Error restoring address space randomization: %s"), safe_strerror (errno)); } -#endif /* HAVE_PERSONALITY */ } diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 1047697..6483d65 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,5 +1,12 @@ 2021-05-08 Pedro Alves <pedro@palves.net> + * linux-low.cc: + (linux_process_target::supports_disable_randomization): Remove + reference to HAVE_PERSONALITY. + * config.in, configure: Regenerate. + +2021-05-08 Pedro Alves <pedro@palves.net> + * linux-low.cc: Don't include sys/personality.h or define ADDR_NO_RANDOMIZE. diff --git a/gdbserver/config.in b/gdbserver/config.in index 99391b4..611bfd7 100644 --- a/gdbserver/config.in +++ b/gdbserver/config.in @@ -31,10 +31,6 @@ /* define if the compiler supports basic C++11 syntax */ #undef HAVE_CXX11 -/* Define to 1 if you have the declaration of `ADDR_NO_RANDOMIZE', and to 0 if - you don't. */ -#undef HAVE_DECL_ADDR_NO_RANDOMIZE - /* Define to 1 if you have the declaration of `asprintf', and to 0 if you don't. */ #undef HAVE_DECL_ASPRINTF @@ -182,9 +178,6 @@ /* Define to 1 if you have the <netinet/tcp.h> header file. */ #undef HAVE_NETINET_TCP_H -/* Define if you support the personality syscall. */ -#undef HAVE_PERSONALITY - /* Define to 1 if you have the `pipe' function. */ #undef HAVE_PIPE diff --git a/gdbserver/configure b/gdbserver/configure index 032b4ae..aab72c0 100755 --- a/gdbserver/configure +++ b/gdbserver/configure @@ -7130,80 +7130,6 @@ fi done - ac_fn_c_check_decl "$LINENO" "ADDR_NO_RANDOMIZE" "ac_cv_have_decl_ADDR_NO_RANDOMIZE" "#include <sys/personality.h> -" -if test "x$ac_cv_have_decl_ADDR_NO_RANDOMIZE" = xyes; then : - ac_have_decl=1 -else - ac_have_decl=0 -fi - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_ADDR_NO_RANDOMIZE $ac_have_decl -_ACEOF - - - if test "$cross_compiling" = yes; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/personality.h> -int -main () -{ - - # if !HAVE_DECL_ADDR_NO_RANDOMIZE - # define ADDR_NO_RANDOMIZE 0x0040000 - # endif - /* Test the flag could be set and stays set. */ - personality (personality (0xffffffff) | ADDR_NO_RANDOMIZE); - if (!(personality (personality (0xffffffff)) & ADDR_NO_RANDOMIZE)) - return 1 - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - have_personality=true -else - have_personality=false -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <sys/personality.h> -int -main () -{ - - # if !HAVE_DECL_ADDR_NO_RANDOMIZE - # define ADDR_NO_RANDOMIZE 0x0040000 - # endif - /* Test the flag could be set and stays set. */ - personality (personality (0xffffffff) | ADDR_NO_RANDOMIZE); - if (!(personality (personality (0xffffffff)) & ADDR_NO_RANDOMIZE)) - return 1 - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - have_personality=true -else - have_personality=false -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - if $have_personality - then - -$as_echo "#define HAVE_PERSONALITY 1" >>confdefs.h - - fi - ac_fn_c_check_decl "$LINENO" "strstr" "ac_cv_have_decl_strstr" "$ac_includes_default" if test "x$ac_cv_have_decl_strstr" = xyes; then : ac_have_decl=1 diff --git a/gdbserver/linux-low.cc b/gdbserver/linux-low.cc index ca3d259..9debe89 100644 --- a/gdbserver/linux-low.cc +++ b/gdbserver/linux-low.cc @@ -6224,11 +6224,7 @@ linux_process_target::core_of_thread (ptid_t ptid) bool linux_process_target::supports_disable_randomization () { -#ifdef HAVE_PERSONALITY return true; -#else - return false; -#endif } bool diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index 72802c6..8b9077c 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,3 +1,7 @@ +2021-05-08 Pedro Alves <pedro@palves.net> + + * common.m4 (personality test): Remove. + 2021-04-30 Tom Tromey <tromey@adacore.com> * thread-pool.cc (thread_pool::post_task): Update. diff --git a/gdbsupport/common.m4 b/gdbsupport/common.m4 index 3ed95da..2e709db 100644 --- a/gdbsupport/common.m4 +++ b/gdbsupport/common.m4 @@ -55,29 +55,6 @@ AC_DEFUN([GDB_AC_COMMON], [ ptrace64 sbrk setns sigaltstack sigprocmask \ setpgid setpgrp getrusage getauxval]) - dnl Check if we can disable the virtual address space randomization. - dnl The functionality of setarch -R. - AC_CHECK_DECLS([ADDR_NO_RANDOMIZE],,, [#include <sys/personality.h>]) - define([PERSONALITY_TEST], [AC_LANG_PROGRAM([#include <sys/personality.h>], [ - # if !HAVE_DECL_ADDR_NO_RANDOMIZE - # define ADDR_NO_RANDOMIZE 0x0040000 - # endif - /* Test the flag could be set and stays set. */ - personality (personality (0xffffffff) | ADDR_NO_RANDOMIZE); - if (!(personality (personality (0xffffffff)) & ADDR_NO_RANDOMIZE)) - return 1])]) - AC_RUN_IFELSE([PERSONALITY_TEST], - [have_personality=true], - [have_personality=false], - [AC_LINK_IFELSE([PERSONALITY_TEST], - [have_personality=true], - [have_personality=false])]) - if $have_personality - then - AC_DEFINE([HAVE_PERSONALITY], 1, - [Define if you support the personality syscall.]) - fi - AC_CHECK_DECLS([strstr]) # ----------------------- # |