From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21615 invoked by alias); 4 Mar 2009 22:34:15 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 21529 invoked by uid 9674); 4 Mar 2009 22:34:14 -0000 Date: Wed, 04 Mar 2009 22:34:00 -0000 Message-ID: <20090304223414.21509.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-jankratochvil-python: Merge commit 'origin/archer-tromey-python' into archer-jankratochvil-python X-Git-Refname: refs/heads/archer-jankratochvil-python X-Git-Reftype: branch X-Git-Oldrev: a6074bdc87ab8bfe8f517b7eccb1698af8dd0622 X-Git-Newrev: e42b07c2ea95c94f7f08f35479758953fa6a7d1c X-SW-Source: 2009-q1/txt/msg00256.txt.bz2 List-Id: The branch, archer-jankratochvil-python has been updated via e42b07c2ea95c94f7f08f35479758953fa6a7d1c (commit) via 84db8f9a3164350cdaa19dcc0c9122d55a5019bd (commit) via 8cd105bd9c53585384cb4249c942bed395ba2b89 (commit) via dea5a03d229ce609df3ab3dd10f762608e8df094 (commit) via 9a0e06375eeafd272d38863feed8c9a8c1408701 (commit) via 7322121d6f77ef446b26f5d048529ae85de30ffd (commit) via e180fc688f2f720ed9431d5712821142db49b46f (commit) via 7d013430def2b170f8e8ab1d24312dfecaccc13d (commit) via 661248db174bd85e6816ab6794483533f95e3097 (commit) via db7ebad5e30d3ba79028421b7aa39779f796769b (commit) from a6074bdc87ab8bfe8f517b7eccb1698af8dd0622 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: gdb/Makefile.in | 26 +++++------- gdb/config.in | 12 ++++- gdb/configure | 96 +++++++++++++++++++++++++++++++++++--------- gdb/configure.ac | 56 +++++++++++++++++++++---- gdb/defs.h | 3 + gdb/doc/gdb.texinfo | 6 +++ gdb/main.c | 37 +++++++++++++++++ gdb/maint.c | 8 ++++ gdb/python/python-membuf.c | 34 +++++++++++---- gdb/python/python.c | 55 ++++++++++++++++++------- 10 files changed, 262 insertions(+), 71 deletions(-) First 500 lines of diff: diff --git a/gdb/Makefile.in b/gdb/Makefile.in index f3d66f5..cb0d2ba 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -172,7 +172,12 @@ LIBICONV = @LIBICONV@ TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@ TARGET_SYSTEM_ROOT_DEFINE = @TARGET_SYSTEM_ROOT_DEFINE@ -GDB_PYTHONDIR_PATH = @GDB_PYTHONDIR_PATH@ +# Did the user give us a --with-gdb-datadir option? +GDB_DATADIR_PATH = @GDB_DATADIR_PATH@ + +# The argument to --with-pythondir. If not given, this is +# GDB_DATADIR_PATH/python. +pythondir = @pythondir@ # Helper code from gnulib. LIBGNU = gnulib/libgnu.a @@ -1942,26 +1947,17 @@ PY_FILES = gdb/FrameIterator.py gdb/command/alias.py \ gdb/__init__.py # Install the Python library. Python library files go under -# $(GDB_PYTHONDIR_PATH)/python. +# $(pythondir). install-python: files='$(PY_FILES)'; for file in $$files; do \ dir=`echo "$$file" | sed 's,/[^/]*$$,,'`; \ - $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(GDB_PYTHONDIR_PATH)/$$dir; \ - $(INSTALL_DATA) $(srcdir)/python/lib/$$file $(DESTDIR)$(GDB_PYTHONDIR_PATH)/$$file; \ + $(SHELL) $(srcdir)/../mkinstalldirs $(DESTDIR)$(pythondir)/$$dir; \ + $(INSTALL_DATA) $(srcdir)/python/lib/$$file $(DESTDIR)$(pythondir)/$$file; \ done -# Other packages may have their files installed in $(GDB_PYTHONDIR_PATH). +# Brute force. uninstall-python: - rm -rf $(DESTDIR)/$(GDB_PYTHONDIR_PATH)/python - files='$(PY_FILES)'; for file in $$files; do \ - dir=`echo "$$file" | sed 's,/[^/]*$$,,'`; \ - rm -f $(DESTDIR)$(GDB_PYTHONDIR_PATH)/$$file; \ - while test "x$$file" != "x$$dir"; do \ - rmdir 2>/dev/null "$(DESTDIR)$(GDB_PYTHONDIR_PATH)/$$dir"; \ - file="$$dir"; \ - dir=`echo "$$file" | sed 's,/[^/]*$$,,'`; \ - done \ - done + rm -rf $(DESTDIR)/$(pythondir) # # Dependency tracking. Most of this is conditional on GNU Make being diff --git a/gdb/config.in b/gdb/config.in index cad7492..eea6037 100644 --- a/gdb/config.in +++ b/gdb/config.in @@ -42,6 +42,12 @@ language is requested. */ #undef ENABLE_NLS +/* Global directory for GDB data files. */ +#undef GDB_DATADIR + +/* Define if GDB datadir should be relocated when GDB is moved. */ +#undef GDB_DATADIR_RELOCATABLE + /* Define to be a string naming the default host character set. */ #undef GDB_DEFAULT_HOST_CHARSET @@ -60,9 +66,6 @@ /* Define to the default OS ABI for this configuration. */ #undef GDB_OSABI_DEFAULT -/* Base directory for GDB Python modules. */ -#undef GDB_PYTHONDIR_PATH - /* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA @@ -621,6 +624,9 @@ 'ptrdiff_t'. */ #undef PTRDIFF_T_SUFFIX +/* Define to install path for Python sources */ +#undef PYTHONDIR + /* Bug reporting address */ #undef REPORT_BUGS_TO diff --git a/gdb/configure b/gdb/configure index fdfe573..9f55a02 100755 --- a/gdb/configure +++ b/gdb/configure @@ -314,7 +314,7 @@ ac_subdirs_all="$ac_subdirs_all doc testsuite" ac_subdirs_all="$ac_subdirs_all gdbtk" ac_subdirs_all="$ac_subdirs_all multi-ice" ac_subdirs_all="$ac_subdirs_all gdbserver" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os am__leading_dot DEPDIR CCDEPMODE MAKE GMAKE_TRUE GMAKE_FALSE SET_MAKE USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE GNULIB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR GNULIB_STPCPY GNULIB_STPNCPY GNULIB_STRCHRNUL GNULIB_STRDUP GNULIB_STRNDUP GNULIB_STRNLEN GNULIB_STRPBRK GNULIB_STRSEP GNULIB_STRSTR GNULIB_STRCASESTR GNULIB_STRTOK_R GNULIB_MBSLEN GNULIB_MBSNLEN GNULIB_MBSCHR GNULIB_MBSRCHR GNULIB_MBSSTR GNULIB_MBSCASECMP GNULIB_MBSNCASECMP GNULIB_MBSPCASECMP GNULIB_MBSCASESTR GNULIB_MBSCSPN GNULIB_MBSPBRK GNULIB_MBSSPN GNULIB_MBSSEP GNULIB_MBSTOK_R GNULIB_STRERROR GNULIB_STRSIGNAL HAVE_DECL_MEMMEM HAVE_MEMPCPY HAVE_DECL_MEMRCHR HAVE_STPCPY HAVE_STPNCPY HAVE_STRCHRNUL HAVE_DECL_STRDUP HAVE_STRNDUP HAVE_DECL_STRNDUP HAVE_DECL_STRNLEN HAVE_STRPBRK HAVE_STRSEP HAVE_STRCASESTR HAVE_DECL_STRTOK_R HAVE_DECL_STRERROR HAVE_DECL_STRSIGNAL REPLACE_STRERROR REPLACE_STRSIGNAL REPLACE_MEMMEM REPLACE_STRCASESTR REPLACE_STRSTR HAVE_LONG_LONG_INT HAVE_UNSIGNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H INCLUDE_NEXT NEXT_STDINT_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T_SUFFIX SIG_ATOMIC_T_SUFFIX SIZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDINT_H NEXT_STRING_H GNULIB_WCWIDTH HAVE_DECL_WCWIDTH REPLACE_WCWIDTH WCHAR_H HAVE_WCHAR_H NEXT_WCHAR_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS GNULIB_STDINT_H PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK AMTAR am__tar am__untar am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH am__fastdepCC_TRUE am__fastdepCC_FALSE subdirs TARGET_OBS PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI LN_S YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT GDB_PYTHONDIR_PATH PYTHON_CFLAGS ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_INCLUDE TCL_LIBRARY TCL_DEPS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_INCLUDE TK_LIBRARY TK_DEPS TK_XINCLUDES X_CFLAGS X_LDFLAGS X_LIBS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags nm_h LIBICONV LIBOBJS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS gltests_LIBOBJS gltests_LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP RANLIB ac_ct_RANLIB build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os am__leading_dot DEPDIR CCDEPMODE MAKE GMAKE_TRUE GMAKE_FALSE SET_MAKE USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT localedir GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE GNULIB_MEMMEM GNULIB_MEMPCPY GNULIB_MEMRCHR GNULIB_STPCPY GNULIB_STPNCPY GNULIB_STRCHRNUL GNULIB_STRDUP GNULIB_STRNDUP GNULIB_STRNLEN GNULIB_STRPBRK GNULIB_STRSEP GNULIB_STRSTR GNULIB_STRCASESTR GNULIB_STRTOK_R GNULIB_MBSLEN GNULIB_MBSNLEN GNULIB_MBSCHR GNULIB_MBSRCHR GNULIB_MBSSTR GNULIB_MBSCASECMP GNULIB_MBSNCASECMP GNULIB_MBSPCASECMP GNULIB_MBSCASESTR GNULIB_MBSCSPN GNULIB_MBSPBRK GNULIB_MBSSPN GNULIB_MBSSEP GNULIB_MBSTOK_R GNULIB_STRERROR GNULIB_STRSIGNAL HAVE_DECL_MEMMEM HAVE_MEMPCPY HAVE_DECL_MEMRCHR HAVE_STPCPY HAVE_STPNCPY HAVE_STRCHRNUL HAVE_DECL_STRDUP HAVE_STRNDUP HAVE_DECL_STRNDUP HAVE_DECL_STRNLEN HAVE_STRPBRK HAVE_STRSEP HAVE_STRCASESTR HAVE_DECL_STRTOK_R HAVE_DECL_STRERROR HAVE_DECL_STRSIGNAL REPLACE_STRERROR REPLACE_STRSIGNAL REPLACE_MEMMEM REPLACE_STRCASESTR REPLACE_STRSTR HAVE_LONG_LONG_INT HAVE_UNSIGNED_LONG_LONG_INT HAVE_INTTYPES_H HAVE_SYS_TYPES_H INCLUDE_NEXT NEXT_STDINT_H HAVE_STDINT_H HAVE_SYS_INTTYPES_H HAVE_SYS_BITYPES_H BITSIZEOF_PTRDIFF_T BITSIZEOF_SIG_ATOMIC_T BITSIZEOF_SIZE_T BITSIZEOF_WCHAR_T BITSIZEOF_WINT_T HAVE_SIGNED_SIG_ATOMIC_T HAVE_SIGNED_WCHAR_T HAVE_SIGNED_WINT_T PTRDIFF_T_SUFFIX SIG_ATOMIC_T_SUFFIX SIZE_T_SUFFIX WCHAR_T_SUFFIX WINT_T_SUFFIX STDINT_H NEXT_STRING_H GNULIB_WCWIDTH HAVE_DECL_WCWIDTH REPLACE_WCWIDTH WCHAR_H HAVE_WCHAR_H NEXT_WCHAR_H LIBGNU_LIBDEPS LIBGNU_LTLIBDEPS GNULIB_STDINT_H PACKAGE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK AMTAR am__tar am__untar am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH am__fastdepCC_TRUE am__fastdepCC_FALSE GDB_DATADIR_PATH pythondir subdirs TARGET_OBS PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI LN_S YACC AR ac_ct_AR DLLTOOL ac_ct_DLLTOOL WINDRES ac_ct_WINDRES MIG ac_ct_MIG READLINE READLINE_DEPS READLINE_CFLAGS HAVE_LIBEXPAT LIBEXPAT LTLIBEXPAT PYTHON_CFLAGS ALLOCA CONFIG_LDFLAGS TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE WARN_CFLAGS WERROR_CFLAGS SER_HARDWIRE WIN32LIBS LIBGUI GUI_CFLAGS_X WIN32LDAPP TCL_VERSION TCL_PATCH_LEVEL TCL_BIN_DIR TCL_SRC_DIR TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC TCL_INCLUDE TCL_LIBRARY TCL_DEPS TK_VERSION TK_BIN_DIR TK_SRC_DIR TK_LIB_FILE TK_LIB_FLAG TK_LIB_SPEC TK_STUB_LIB_FILE TK_STUB_LIB_FLAG TK_STUB_LIB_SPEC TK_INCLUDE TK_LIBRARY TK_DEPS TK_XINCLUDES X_CFLAGS X_LDFLAGS X_LIBS GDBTKLIBS GDBTK_CFLAGS GDBTK_SRC_DIR SIM SIM_OBS ENABLE_CFLAGS PROFILE_CFLAGS CONFIG_OBS CONFIG_DEPS CONFIG_SRCS CONFIG_ALL CONFIG_CLEAN CONFIG_INSTALL CONFIG_UNINSTALL target_subdir frags nm_h LIBICONV LIBOBJS LTLIBOBJS gl_LIBOBJS gl_LTLIBOBJS gltests_LIBOBJS gltests_LTLIBOBJS' ac_subst_files='host_makefile_frag' ac_pwd=`pwd` @@ -882,6 +882,10 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-separate-debug-dir=path Look for global separate debug info in this path LIBDIR/debug + --with-gdb-datadir look for global separate data files in this path + [DATADIR/gdb] + --with-pythondir install Python data files in this path + [DATADIR/gdb/python] --with-libunwind Use libunwind frame unwinding support --with-pkgversion=PKG Use PKG in the version string in place of "GDB" --with-bugurl=URL Direct users to URL to report a bug @@ -7130,6 +7134,75 @@ _ACEOF ;; esac +# GDB's datadir relocation + +gdbdatadir=${datadir}/gdb + + +# Check whether --with-gdb-datadir or --without-gdb-datadir was given. +if test "${with_gdb_datadir+set}" = set; then + withval="$with_gdb_datadir" + gdbdatadir="${withval}" +fi; + + + test "x$prefix" = xNONE && prefix="$ac_default_prefix" + test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + ac_define_dir=`eval echo $gdbdatadir` + ac_define_dir=`eval echo $ac_define_dir` + +cat >>confdefs.h <<_ACEOF +#define GDB_DATADIR "$ac_define_dir" +_ACEOF + + + +if test "x$exec_prefix" = xNONE || test "x$exec_prefix" = 'x${prefix}'; then + if test "x$prefix" = xNONE; then + test_prefix=/usr/local + else + test_prefix=$prefix + fi +else + test_prefix=$exec_prefix +fi + +case ${gdbdatadir} in + "${test_prefix}"|"${test_prefix}/"*|\ + '${exec_prefix}'|'${exec_prefix}/'*) + +cat >>confdefs.h <<\_ACEOF +#define GDB_DATADIR_RELOCATABLE 1 +_ACEOF + + ;; +esac +GDB_DATADIR_PATH=${gdbdatadir} + + + +# Check whether --with-pythondir or --without-pythondir was given. +if test "${with_pythondir+set}" = set; then + withval="$with_pythondir" + pythondir="${withval}" +else + pythondir=no +fi; + +# If the user passed in a path, define it. Otherwise, compute it at +# runtime based on the possibly-relocatable datadir. +if test "$pythondir" = "no"; then + pythondir='$(GDB_DATADIR_PATH)/python' +else + +cat >>confdefs.h <<_ACEOF +#define PYTHONDIR "$pythondir" +_ACEOF + +fi + + + subdirs="$subdirs doc testsuite" @@ -11156,7 +11229,6 @@ echo $ECHO_N "checking whether to use python... $ECHO_C" >&6 echo "$as_me:$LINENO: result: $with_python" >&5 echo "${ECHO_T}$with_python" >&6 -GDB_PYTHONDIR_PATH= if test "${with_python}" = no; then { echo "$as_me:$LINENO: WARNING: python support disabled; some features may be unavailable." >&5 echo "$as_me: WARNING: python support disabled; some features may be unavailable." >&2;} @@ -11388,20 +11460,7 @@ _ACEOF fi fi - if test ${have_libpython} != no; then - GDB_PYTHONDIR_PATH="`python -c "from distutils.sysconfig import get_python_lib; print get_python_lib();"`" - - test "x$prefix" = xNONE && prefix="$ac_default_prefix" - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - ac_define_dir=`eval echo $GDB_PYTHONDIR_PATH` - ac_define_dir=`eval echo $ac_define_dir` - -cat >>confdefs.h <<_ACEOF -#define GDB_PYTHONDIR_PATH "$ac_define_dir" -_ACEOF - - - else + if test ${have_libpython} = no; then case "${with_python}" in yes) { { echo "$as_me:$LINENO: error: python is missing or unusable" >&5 @@ -11423,8 +11482,6 @@ echo "$as_me: error: no usable python found at ${with_python}" >&2;} fi fi - -PYTHON_CFLAGS= if test "${have_libpython}" = yes; then cat >>confdefs.h <<\_ACEOF @@ -21883,6 +21940,8 @@ s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t +s,@GDB_DATADIR_PATH@,$GDB_DATADIR_PATH,;t t +s,@pythondir@,$pythondir,;t t s,@subdirs@,$subdirs,;t t s,@TARGET_OBS@,$TARGET_OBS,;t t s,@PKGVERSION@,$PKGVERSION,;t t @@ -21904,7 +21963,6 @@ s,@READLINE_CFLAGS@,$READLINE_CFLAGS,;t t s,@HAVE_LIBEXPAT@,$HAVE_LIBEXPAT,;t t s,@LIBEXPAT@,$LIBEXPAT,;t t s,@LTLIBEXPAT@,$LTLIBEXPAT,;t t -s,@GDB_PYTHONDIR_PATH@,$GDB_PYTHONDIR_PATH,;t t s,@PYTHON_CFLAGS@,$PYTHON_CFLAGS,;t t s,@ALLOCA@,$ALLOCA,;t t s,@CONFIG_LDFLAGS@,$CONFIG_LDFLAGS,;t t diff --git a/gdb/configure.ac b/gdb/configure.ac index c197fe8..267fe9f 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1,6 +1,6 @@ dnl Autoconf configure script for GDB, the GNU debugger. dnl Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -dnl 2005, 2006, 2007, 2008 +dnl 2005, 2006, 2007, 2008, 2009 dnl Free Software Foundation, Inc. dnl dnl This file is part of GDB. @@ -118,6 +118,51 @@ case ${debugdir} in ;; esac +# GDB's datadir relocation + +gdbdatadir=${datadir}/gdb + +AC_ARG_WITH([gdb-datadir], + [AS_HELP_STRING([--with-gdb-datadir], + [look for global separate data files in this path [DATADIR/gdb]])], [gdbdatadir="${withval}"]) + +AC_DEFINE_DIR(GDB_DATADIR, gdbdatadir, + [Global directory for GDB data files. ]) + +if test "x$exec_prefix" = xNONE || test "x$exec_prefix" = 'x${prefix}'; then + if test "x$prefix" = xNONE; then + test_prefix=/usr/local + else + test_prefix=$prefix + fi +else + test_prefix=$exec_prefix +fi + +case ${gdbdatadir} in + "${test_prefix}"|"${test_prefix}/"*|\ + '${exec_prefix}'|'${exec_prefix}/'*) + AC_DEFINE(GDB_DATADIR_RELOCATABLE, 1, [Define if GDB datadir should be relocated when GDB is moved.]) + ;; +esac +GDB_DATADIR_PATH=${gdbdatadir} +AC_SUBST(GDB_DATADIR_PATH) + +AC_ARG_WITH([pythondir], + [AS_HELP_STRING([--with-pythondir], + [install Python data files in this path [DATADIR/gdb/python]])], [pythondir="${withval}"], [pythondir=no]) + +# If the user passed in a path, define it. Otherwise, compute it at +# runtime based on the possibly-relocatable datadir. +if test "$pythondir" = "no"; then + pythondir='$(GDB_DATADIR_PATH)/python' +else + AC_DEFINE_UNQUOTED(PYTHONDIR, "$pythondir", + [Define to install path for Python sources]) +fi +AC_SUBST(pythondir) + + AC_CONFIG_SUBDIRS(doc testsuite) # Check whether to support alternative target configurations @@ -585,7 +630,6 @@ AC_ARG_WITH(python, AC_MSG_CHECKING([whether to use python]) AC_MSG_RESULT([$with_python]) -GDB_PYTHONDIR_PATH= if test "${with_python}" = no; then AC_MSG_WARN([python support disabled; some features may be unavailable.]) have_libpython=no @@ -628,11 +672,7 @@ else AC_DEFINE(HAVE_LIBPYTHON2_4, 1, [Define if Python 2.4 is being used.]) fi fi - if test ${have_libpython} != no; then - GDB_PYTHONDIR_PATH="`python -c "from distutils.sysconfig import get_python_lib; print get_python_lib();"`" - AC_DEFINE_DIR(GDB_PYTHONDIR_PATH, GDB_PYTHONDIR_PATH, - [Base directory for GDB Python modules.]) - else + if test ${have_libpython} = no; then case "${with_python}" in yes) AC_MSG_ERROR([python is missing or unusable]) @@ -648,9 +688,7 @@ else LIBS=$save_LIBS fi fi -AC_SUBST(GDB_PYTHONDIR_PATH) -PYTHON_CFLAGS= if test "${have_libpython}" = yes; then AC_DEFINE(HAVE_PYTHON, 1, [Define if Python interpreter is being linked in.]) CONFIG_OBS="$CONFIG_OBS \$(SUBDIR_PYTHON_OBS)" diff --git a/gdb/defs.h b/gdb/defs.h index 845b320..5da17e1 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -151,6 +151,9 @@ extern int dbx_commands; /* System root path, used to find libraries etc. */ extern char *gdb_sysroot; +/* GDB datadir, used to store data files. */ +extern char *gdb_datadir; + /* Search path for separate debug files. */ extern char *debug_file_directory; diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo index dc8d2c1..480b846 100644 --- a/gdb/doc/gdb.texinfo +++ b/gdb/doc/gdb.texinfo @@ -18401,6 +18401,12 @@ If this file does not exist, and if the parameter @code{debug-file-directory} is set, then @value{GDBN} will append the object file's real name to the value of this parameter, and try again. +Finally, if this file does not exist, then @value{GDBN} will look in +subdirectory of @code{gdb_datadir} (whose value is available from +@code{maint show gdb_datadir}). Specifically, @value{GDBN} will take +the value of @code{gdb_datadir}, append @samp{python/auto-load}, and +then append the object file's real name. + Also, if a separate debug file is used, @value{GDBN} will look for the @samp{-gdb.py} file both in the directory associated with the application and the directory associated with the separate debug file. diff --git a/gdb/main.c b/gdb/main.c index 4a5eb23..6f9e61b 100644 --- a/gdb/main.c +++ b/gdb/main.c @@ -64,6 +64,9 @@ int dbx_commands = 0; /* System root path, used to find libraries etc. */ char *gdb_sysroot = 0; +/* GDB datadir, used to store data files. */ +char *gdb_datadir = 0; + struct ui_file *gdb_stdout; struct ui_file *gdb_stderr; struct ui_file *gdb_stdlog; @@ -361,6 +364,40 @@ captured_main (void *data) } } +#ifdef GDB_DATADIR_RELOCATABLE + gdb_datadir = make_relative_prefix (argv[0], BINDIR, GDB_DATADIR); + if (gdb_datadir) + { + struct stat s; + int res = 0; + + if (stat (gdb_datadir, &s) == 0) + if (S_ISDIR (s.st_mode)) + res = 1; + + if (res == 0) + { + xfree (gdb_datadir); + gdb_datadir = xstrdup (GDB_DATADIR); + } + } + else + gdb_datadir = xstrdup (GDB_DATADIR); +#else + gdb_datadir = xstrdup (GDB_DATADIR); +#endif /* GDB_DATADIR_RELOCATABLE */ + + /* Canonicalize the GDB's datadir path. */ + if (*gdb_datadir) + { + char *canon_debug = lrealpath (gdb_datadir); + if (canon_debug) + { + xfree (gdb_datadir); + gdb_datadir = canon_debug; + } + } + get_init_files (&system_gdbinit, &home_gdbinit, &local_gdbinit); /* There will always be an interpreter. Either the one passed into diff --git a/gdb/maint.c b/gdb/maint.c index 56cafe9..1b57ff5 100644 --- a/gdb/maint.c +++ b/gdb/maint.c @@ -906,4 +906,12 @@ When enabled GDB is profiled."), show_maintenance_profile_p, &maintenance_set_cmdlist, &maintenance_show_cmdlist); + add_setshow_filename_cmd ("gdb_datadir", class_maintenance, + &gdb_datadir, _("Set GDB's datadir path."), + _("Show GDB's datadir path."), + _("\ +When set, GDB uses the specified path to search for data files."), + NULL, NULL, + &maintenance_set_cmdlist, + &maintenance_show_cmdlist); } diff --git a/gdb/python/python-membuf.c b/gdb/python/python-membuf.c index 57836f9..a4c7d74 100644 --- a/gdb/python/python-membuf.c +++ b/gdb/python/python-membuf.c @@ -125,12 +125,12 @@ mbpy_str (PyObject *self) { membuf_object *membuf_obj = (membuf_object *) self; - return PyString_FromFormat ("memory buffer for address %p, %u bytes long", - (void *) (uintptr_t) membuf_obj->addr, - (unsigned int) membuf_obj->length); + return PyString_FromFormat ("memory buffer for address %s, %s bytes long", + paddress (membuf_obj->addr), + pulongest (membuf_obj->length)); } -Py_ssize_t +static Py_ssize_t get_read_buffer (PyObject *self, Py_ssize_t segment, void **ptrptr) { membuf_object *membuf_obj = (membuf_object *) self; @@ -147,13 +147,13 @@ get_read_buffer (PyObject *self, Py_ssize_t segment, void **ptrptr) return membuf_obj->length; } -Py_ssize_t +static Py_ssize_t get_write_buffer (PyObject *self, Py_ssize_t segment, void **ptrptr) { return get_read_buffer (self, segment, ptrptr); } -Py_ssize_t +static Py_ssize_t get_seg_count (PyObject *self, Py_ssize_t *lenp) { if (lenp) @@ -162,7 +162,7 @@ get_seg_count (PyObject *self, Py_ssize_t *lenp) return 1; } -Py_ssize_t +static Py_ssize_t get_char_buffer (PyObject *self, Py_ssize_t segment, char **ptrptr) { void *ptr = NULL; @@ -212,13 +212,29 @@ static PyTypeObject membuf_object_type = { 0, /*tp_setattro*/ &buffer_procs, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT, /*tp_flags*/ - "GDB memory buffer object" /*tp_doc*/ + "GDB memory buffer object", /*tp_doc*/ + 0, /* tp_traverse */ + 0, /* tp_clear */ + 0, /* tp_richcompare */ + 0, /* tp_weaklistoffset */ + 0, /* tp_iter */ + 0, /* tp_iternext */ + 0, /* tp_methods */ hooks/post-receive -- Repository for Project Archer.