diff options
| -rw-r--r-- | gdb/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/common/common-defs.h | 9 | ||||
| -rw-r--r-- | gdb/main.c | 2 | ||||
| -rw-r--r-- | gdb/maint.c | 4 | ||||
| -rw-r--r-- | gdb/top.c | 2 |
5 files changed, 20 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cc09755..d2319c0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2018-07-04 Simon Marchi <simon.marchi@polymtl.ca> + + * common/common-defs.h (HAVE_USEFUL_SBRK): Define. + * main.c: Use HAVE_USEFUL_SBRK instead of HAVE_SBRK. + * maint.c: Likewise. + * top.c: Likewise. + 2018-07-04 Joel Brobecker <brobecker@adacore.com> * NEWS: Create a new section for the next release branch. diff --git a/gdb/common/common-defs.h b/gdb/common/common-defs.h index eb0ec21..80f1ff4 100644 --- a/gdb/common/common-defs.h +++ b/gdb/common/common-defs.h @@ -105,4 +105,13 @@ /* String containing the current directory (what getwd would return). */ extern char *current_directory; +/* sbrk on macOS is not useful for our purposes, since sbrk(0) always + returns the same value. brk/sbrk on macOS is just an emulation + that always returns a pointer to a 4MB section reserved for + that. */ + +#if defined (HAVE_SBRK) && !__APPLE__ +#define HAVE_USEFUL_SBRK 1 +#endif + #endif /* COMMON_DEFS_H */ @@ -487,7 +487,7 @@ captured_main_1 (struct captured_main_args *context) int save_auto_load; struct objfile *objfile; -#ifdef HAVE_SBRK +#ifdef HAVE_USEFUL_SBRK /* Set this before constructing scoped_command_stats. */ lim_at_start = (char *) sbrk (0); #endif diff --git a/gdb/maint.c b/gdb/maint.c index a8a1fcb..5d4701c 100644 --- a/gdb/maint.c +++ b/gdb/maint.c @@ -828,7 +828,7 @@ scoped_command_stats::~scoped_command_stats () if (m_space_enabled && per_command_space) { -#ifdef HAVE_SBRK +#ifdef HAVE_USEFUL_SBRK char *lim = (char *) sbrk (0); long space_now = lim - lim_at_start; @@ -866,7 +866,7 @@ scoped_command_stats::scoped_command_stats (bool msg_type) { if (!m_msg_type || per_command_space) { -#ifdef HAVE_SBRK +#ifdef HAVE_USEFUL_SBRK char *lim = (char *) sbrk (0); m_start_space = lim - lim_at_start; m_space_enabled = 1; @@ -171,7 +171,7 @@ int remote_timeout = 2; int remote_debug = 0; /* Sbrk location on entry to main. Used for statistics only. */ -#ifdef HAVE_SBRK +#ifdef HAVE_USEFUL_SBRK char *lim_at_start; #endif |