diff options
Diffstat (limited to 'gdb')
-rw-r--r-- | gdb/ChangeLog | 8 | ||||
-rw-r--r-- | gdb/config.in | 3 | ||||
-rwxr-xr-x | gdb/configure | 59 | ||||
-rw-r--r-- | gdb/configure.ac | 33 | ||||
-rw-r--r-- | gdb/gdb_regex.h | 6 |
5 files changed, 8 insertions, 101 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 981fcb5..5e79712 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2021-04-21 Tom de Vries <tdevries@suse.de> + + PR build/27681 + * configure.ac: Remove --without-included-regex/--with-included-regex. + * config.in: Regenerate. + * configure: Regenerate. + * gdb_regex.h: Assume USE_INCLUDED_REGEX is defined. + 2021-04-21 Tankut Baris Aktemur <tankut.baris.aktemur@intel.com> * breakpoint.h (create_breakpoint): Add a new parameter, diff --git a/gdb/config.in b/gdb/config.in index db860c7..5d10377 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -725,9 +725,6 @@ /* Define if <thread_db.h> has the TD_VERSION error code. */ #undef THREAD_DB_HAS_TD_VERSION -/* Define to 1 if the regex included in libiberty should be used. */ -#undef USE_INCLUDED_REGEX - /* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE diff --git a/gdb/configure b/gdb/configure index 95fd6b0..b47de77 100755 --- a/gdb/configure +++ b/gdb/configure @@ -911,7 +911,6 @@ enable_source_highlight with_intel_pt with_libipt_prefix with_libipt_type -with_included_regex with_sysroot with_system_gdbinit with_system_gdbinit_dir @@ -1661,10 +1660,6 @@ Optional Packages: --with-libipt-prefix[=DIR] search for libipt in DIR/include and DIR/lib --without-libipt-prefix don't search for libipt in includedir and libdir --with-libipt-type=TYPE type of library to search for (auto/static/shared) - --without-included-regex - don't use included regex; this is the default on - systems with version 2 of the GNU C library (use - with caution on other system) --with-sysroot[=DIR] search for usr/lib et al within DIR --with-system-gdbinit=PATH automatically load a system-wide gdbinit file @@ -15891,60 +15886,6 @@ if test "$ac_cv_func_setpgrp_void" = yes; then fi fi -# Assume we'll default to using the included libiberty regex. -gdb_use_included_regex=yes - -# However, if the system regex is GNU regex, then default to *not* -# using the included regex. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU regex" >&5 -$as_echo_n "checking for GNU regex... " >&6; } -if ${gdb_cv_have_gnu_regex+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <gnu-versions.h> -int -main () -{ -#define REGEX_INTERFACE_VERSION 1 - #if _GNU_REGEX_INTERFACE_VERSION != REGEX_INTERFACE_VERSION - # error "Version mismatch" - #endif - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - gdb_cv_have_gnu_regex=yes -else - gdb_cv_have_gnu_regex=no - -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gdb_cv_have_gnu_regex" >&5 -$as_echo "$gdb_cv_have_gnu_regex" >&6; } -if test "$gdb_cv_have_gnu_regex" = yes; then - gdb_use_included_regex=no -fi - - -# Check whether --with-included-regex was given. -if test "${with_included_regex+set}" = set; then : - withval=$with_included_regex; gdb_with_regex=$withval -else - gdb_with_regex=$gdb_use_included_regex -fi - -if test "$gdb_with_regex" = yes; then - -$as_echo "#define USE_INCLUDED_REGEX 1" >>confdefs.h - -fi - # Check if <sys/proc.h> defines `struct thread' with a td_pcb member. ac_fn_c_check_member "$LINENO" "struct thread" "td_pcb" "ac_cv_member_struct_thread_td_pcb" "#include <sys/param.h> #include <sys/proc.h> diff --git a/gdb/configure.ac b/gdb/configure.ac index 12a59ee..acfbe4a 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1363,39 +1363,6 @@ if test "$ac_cv_func_setpgrp_void" = yes; then fi fi -# Assume we'll default to using the included libiberty regex. -gdb_use_included_regex=yes - -# However, if the system regex is GNU regex, then default to *not* -# using the included regex. -AC_CACHE_CHECK( - [for GNU regex], - [gdb_cv_have_gnu_regex], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM( - [#include <gnu-versions.h>], - [#define REGEX_INTERFACE_VERSION 1 - #if _GNU_REGEX_INTERFACE_VERSION != REGEX_INTERFACE_VERSION - # error "Version mismatch" - #endif] - )], - [gdb_cv_have_gnu_regex=yes], - [gdb_cv_have_gnu_regex=no] - )] -) -if test "$gdb_cv_have_gnu_regex" = yes; then - gdb_use_included_regex=no -fi - -AC_ARG_WITH(included-regex, - AS_HELP_STRING([--without-included-regex], [don't use included regex; this is the default on systems with version 2 of the GNU C library (use with caution on other system)]), - gdb_with_regex=$withval, - gdb_with_regex=$gdb_use_included_regex) -if test "$gdb_with_regex" = yes; then - AC_DEFINE(USE_INCLUDED_REGEX, 1, - [Define to 1 if the regex included in libiberty should be used.]) -fi - # Check if <sys/proc.h> defines `struct thread' with a td_pcb member. AC_CHECK_MEMBERS([struct thread.td_pcb], [], [], [#include <sys/param.h> diff --git a/gdb/gdb_regex.h b/gdb/gdb_regex.h index afe9909..0cac96e 100644 --- a/gdb/gdb_regex.h +++ b/gdb/gdb_regex.h @@ -19,13 +19,7 @@ #ifndef GDB_REGEX_H #define GDB_REGEX_H 1 -#ifdef USE_INCLUDED_REGEX # include "xregex.h" -#else -/* Request 4.2 BSD regex functions. */ -# define _REGEX_RE_COMP -# include <regex.h> -#endif /* A compiled regex. This is mainly a wrapper around regex_t. The the constructor throws on regcomp error and the destructor is |