diff options
Diffstat (limited to 'gdb/gdbserver')
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 7 | ||||
| -rw-r--r-- | gdb/gdbserver/Makefile.in | 4 | ||||
| -rw-r--r-- | gdb/gdbserver/config.in | 3 | ||||
| -rwxr-xr-x | gdb/gdbserver/configure | 56 |
4 files changed, 70 insertions, 0 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 0ce30b7..e269b97 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2015-07-15 Jan Kratochvil <jan.kratochvil@redhat.com> + + * Makefile.in (OBS): Add gdb_regex.o. + (gdb_regex.o): New. + * config.in: Rebuilt. + * configure: Rebuilt. + 2015-07-15 Aleksandar Ristovski <aristovski@qnx.com Jan Kratochvil <jan.kratochvil@redhat.com> diff --git a/gdb/gdbserver/Makefile.in b/gdb/gdbserver/Makefile.in index 908061a..fea8e1b 100644 --- a/gdb/gdbserver/Makefile.in +++ b/gdb/gdbserver/Makefile.in @@ -195,6 +195,7 @@ OBS = agent.o ax.o inferiors.o regcache.o remote-utils.o server.o signals.o \ common-utils.o ptid.o buffer.o format.o filestuff.o dll.o notif.o \ tdesc.o print-utils.o rsp-low.o errors.o common-debug.o cleanups.o \ common-exceptions.o symbol.o btrace-common.o fileio.o target-utils.o \ + gdb_regex.o \ $(XML_BUILTIN) $(DEPFILES) $(LIBOBJS) GDBREPLAY_OBS = gdbreplay.o version.o GDBSERVER_LIBS = @GDBSERVER_LIBS@ @@ -582,6 +583,9 @@ waitstatus.o: ../target/waitstatus.c fileio.o: ../common/fileio.c $(COMPILE) $< $(POSTCOMPILE) +gdb_regex.o: ../common/gdb_regex.c + $(COMPILE) $< + $(POSTCOMPILE) # Native object files rules from ../nat diff --git a/gdb/gdbserver/config.in b/gdb/gdbserver/config.in index f24e6bb..90ea95d 100644 --- a/gdb/gdbserver/config.in +++ b/gdb/gdbserver/config.in @@ -317,6 +317,9 @@ /* Define to 1 if you have the ANSI C header files. */ #undef STDC_HEADERS +/* Define to 1 if the regex included in libiberty should be used. */ +#undef USE_INCLUDED_REGEX + /* Define if we should use libthread_db directly. */ #undef USE_LIBTHREAD_DB_DIRECTLY diff --git a/gdb/gdbserver/configure b/gdb/gdbserver/configure index e8cf136..c7ae6be 100755 --- a/gdb/gdbserver/configure +++ b/gdb/gdbserver/configure @@ -694,6 +694,7 @@ enable_maintainer_mode enable_largefile enable_build_with_cxx enable_libmcheck +with_included_regex with_ust with_ust_include with_ust_lib @@ -1345,6 +1346,10 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --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-ust=PATH Specify prefix directory for the installed UST package Equivalent to --with-ust-include=PATH/include plus --with-ust-lib=PATH/lib @@ -5747,6 +5752,57 @@ $as_echo "#define HAVE_SIGSETJMP 1" >>confdefs.h 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 test "${gdb_cv_have_gnu_regex+set}" = set; 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 for UST ustlibs="" |