diff options
author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2015-07-15 20:27:32 +0200 |
---|---|---|
committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2015-07-15 20:27:32 +0200 |
commit | db1ff28b60f8886b8d7c634f1db2f939ba47a13c (patch) | |
tree | ce5564ef7211bb69bef2fbc645608b1490dafc34 /gdb/common | |
parent | 0a94970d663a053c523f23ac0d71deb25a77f709 (diff) | |
download | gdb-db1ff28b60f8886b8d7c634f1db2f939ba47a13c.zip gdb-db1ff28b60f8886b8d7c634f1db2f939ba47a13c.tar.gz gdb-db1ff28b60f8886b8d7c634f1db2f939ba47a13c.tar.bz2 |
Revert the previous 7 commits of: Validate binary before use
ddc98fbf2fd9e244a215a4d09e559180dc573a14 Create empty nat/linux-maps.[ch] and common/target-utils.[ch]
6e5b4429db0d66e2d0b27e1bcfe4709f3dae73ed Move gdb_regex* to common/
f7af1fcd759fa126612018a5916cf808df7bb8bc Prepare linux_find_memory_regions_full & co. for move
9904185cfde13d6c6849f1f042c8e3b74974cf08 Move linux_find_memory_regions_full & co.
700ca40f6fc1addd7238f4ab57f76c095ad3c99f gdbserver build-id attribute generator
ca5268b6be265580b91ef75c1a1a9815f581ae42 Validate symbol file using build-id
0a94970d663a053c523f23ac0d71deb25a77f709 Tests for validate symbol file using build-id
gdb/ChangeLog
2015-07-15 Jan Kratochvil <jan.kratochvil@redhat.com>
Revert the previous 6 commits:
Create empty nat/linux-maps.[ch] and common/target-utils.[ch].
Move gdb_regex* to common/
Prepare linux_find_memory_regions_full & co. for move
Move linux_find_memory_regions_full & co.
gdbserver build-id attribute generator
Validate symbol file using build-id
gdb/gdbserver/ChangeLog
2015-07-15 Jan Kratochvil <jan.kratochvil@redhat.com>
Revert the previous 3 commits:
Move gdb_regex* to common/
Move linux_find_memory_regions_full & co.
gdbserver build-id attribute generator
gdb/doc/ChangeLog
2015-07-15 Jan Kratochvil <jan.kratochvil@redhat.com>
Revert the previous 2 commits:
gdbserver build-id attribute generator
Validate symbol file using build-id
gdb/testsuite/ChangeLog
2015-07-15 Jan Kratochvil <jan.kratochvil@redhat.com>
Revert the previous commit:
Tests for validate symbol file using build-id.
Diffstat (limited to 'gdb/common')
-rw-r--r-- | gdb/common/common.m4 | 29 | ||||
-rw-r--r-- | gdb/common/gdb_regex.c | 73 | ||||
-rw-r--r-- | gdb/common/gdb_regex.h | 35 |
3 files changed, 0 insertions, 137 deletions
diff --git a/gdb/common/common.m4 b/gdb/common/common.m4 index e48dd5a..a87579a 100644 --- a/gdb/common/common.m4 +++ b/gdb/common/common.m4 @@ -44,33 +44,4 @@ gdb_cv_func_sigsetjmp=yes, gdb_cv_func_sigsetjmp=no)]) if test $gdb_cv_func_sigsetjmp = yes; then AC_DEFINE(HAVE_SIGSETJMP, 1, [Define if sigsetjmp is available. ]) 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_TRY_COMPILE( - [#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 ]) diff --git a/gdb/common/gdb_regex.c b/gdb/common/gdb_regex.c deleted file mode 100644 index 73f30a7..0000000 --- a/gdb/common/gdb_regex.c +++ /dev/null @@ -1,73 +0,0 @@ -/* Shared utility routines for GDB to interact with agent. - - Copyright (C) 2009-2015 Free Software Foundation, Inc. - - This file is part of GDB. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -#include "common-defs.h" -#include "gdb_regex.h" - -/* A cleanup function that calls regfree. */ - -static void -do_regfree_cleanup (void *r) -{ - regfree (r); -} - -/* Create a new cleanup that frees the compiled regular expression R. */ - -struct cleanup * -make_regfree_cleanup (regex_t *r) -{ - return make_cleanup (do_regfree_cleanup, r); -} - -/* Return an xmalloc'd error message resulting from a regular - expression compilation failure. */ - -char * -get_regcomp_error (int code, regex_t *rx) -{ - size_t length = regerror (code, rx, NULL, 0); - char *result = xmalloc (length); - - regerror (code, rx, result, length); - return result; -} - -/* Compile a regexp and throw an exception on error. This returns a - cleanup to free the resulting pattern on success. RX must not be - NULL. */ - -struct cleanup * -compile_rx_or_error (regex_t *pattern, const char *rx, const char *message) -{ - int code; - - gdb_assert (rx != NULL); - - code = regcomp (pattern, rx, REG_NOSUB); - if (code != 0) - { - char *err = get_regcomp_error (code, pattern); - - make_cleanup (xfree, err); - error (("%s: %s"), message, err); - } - - return make_regfree_cleanup (pattern); -} diff --git a/gdb/common/gdb_regex.h b/gdb/common/gdb_regex.h deleted file mode 100644 index c6eb67b..0000000 --- a/gdb/common/gdb_regex.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Portable <regex.h>. - Copyright (C) 2000-2015 Free Software Foundation, Inc. - - This file is part of GDB. - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. */ - -#ifndef COMMON_GDB_REGEX_H -#define COMMON_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 - -struct cleanup *make_regfree_cleanup (regex_t *); -char *get_regcomp_error (int, regex_t *); -struct cleanup *compile_rx_or_error (regex_t *pattern, const char *rx, - const char *message); - -#endif /* not COMMON_GDB_REGEX_H */ |