From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 127654 invoked by alias); 23 Oct 2019 21:40:22 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 127516 invoked by uid 89); 23 Oct 2019 21:40:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-6.9 required=5.0 tests=BAYES_00,GIT_PATCH_2 autolearn=ham version=3.3.1 spammy=rl.c, USAGE, manifest X-HELO: mx1.osci.io Received: from polly.osci.io (HELO mx1.osci.io) (8.43.85.229) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 23 Oct 2019 21:40:15 +0000 Received: by mx1.osci.io (Postfix, from userid 994) id 9B757202DF; Wed, 23 Oct 2019 17:40:13 -0400 (EDT) Received: from gnutoolchain-gerrit.osci.io (gnutoolchain-gerrit.osci.io [IPv6:2620:52:3:1:5054:ff:fe06:16ca]) by mx1.osci.io (Postfix) with ESMTP id B4CE820A2E; Wed, 23 Oct 2019 17:40:05 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by gnutoolchain-gerrit.osci.io (Postfix) with ESMTP id 92FC8238BA; Wed, 23 Oct 2019 17:40:05 -0400 (EDT) X-Gerrit-PatchSet: 3 Date: Wed, 23 Oct 2019 21:40:00 -0000 From: "Sourceware to Gerrit sync (Code Review)" To: Tom Tromey , gdb-patches@sourceware.org Cc: Simon Marchi Auto-Submitted: auto-generated X-Gerrit-MessageType: merged Subject: [pushed] Move readline to the readline/readline subdirectory X-Gerrit-Change-Id: Ice156a2ee09ea68722b48f64d97146d7428ea9e4 X-Gerrit-Change-Number: 180 X-Gerrit-ChangeURL: X-Gerrit-Commit: 6999161a2a3b3cbd918570e094199184331d4f81 In-Reply-To: References: Reply-To: noreply@gnutoolchain-gerrit.osci.io, simon.marchi@polymtl.ca, tromey@sourceware.org, gdb-patches@sourceware.org MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Disposition: inline User-Agent: Gerrit/3.0.3 Content-Type: text/plain; charset=UTF-8 Message-Id: <20191023214005.92FC8238BA@gnutoolchain-gerrit.osci.io> X-SW-Source: 2019-10/txt/msg00863.txt.bz2 Sourceware to Gerrit sync has submitted this change. Change URL: https://gnutoolchain-gerrit.osci.io/r/c/binutils-gdb/+/180 ...................................................................... Move readline to the readline/readline subdirectory readline turns out to be a bit of a stumbling block for the project to move gdbsupport (and then gdbserver) to the top-level. The issue is that readline headers are intended to be included with names like "readline/readline.h". To support this, gdb effectively adds a -I option pointing to the top-level source directory -- but, importantly, this option is not used when the system readline is used. For gdbsupport, a -I option like this would always be needed, but that in turn would break the system readline case. This was PR build/17077, fixed in commit a8a5dbcab8df0b3a9e04745d4fe8d64740acb323. Previously, we had discussed this on the gdb-patches list in terms of removing readline from the tree https://sourceware.org/ml/gdb-patches/2019-09/msg00317.html However, Eli expressed some concerns, and Joel did as well (off-list). Given those concerns, and the fact that a patch-free local readline is relatively new in gdb (it was locally patched for years), I changed my mind and decided to handle this situation by moving the readline sources down a level. That is, upstream readline is now in readline/readline, and the top-level readline directory just contains the minimal configury needed to build that. This fixes the problem because, when gdb unconditionally adds a -I$(top_srcdir), this will not find readline headers. A separate -I will be needed instead, which is exactly what's needed for --with-system-readline. gdb/ChangeLog 2019-10-23 Tom Tromey * Makefile.in (READLINE_DIR): Update. gdb/doc/ChangeLog 2019-10-23 Tom Tromey * Makefile.in (READLINE_DIR): Update. readline/ChangeLog 2019-10-23 Tom Tromey Move old contents to readline/ subdirectory. * aclocal.m4, configure, configure.ac, .gitignore, Makefile.am, Makefile.in, README: New files. Change-Id: Ice156a2ee09ea68722b48f64d97146d7428ea9e4 --- M gdb/ChangeLog M gdb/Makefile.in M gdb/doc/ChangeLog M gdb/doc/Makefile.in M readline/.gitignore A readline/ChangeLog A readline/Makefile.am M readline/Makefile.in M readline/README M readline/aclocal.m4 M readline/configure M readline/configure.ac A readline/readline/.gitignore R readline/readline/CHANGELOG R readline/readline/CHANGES R readline/readline/COPYING R readline/readline/ChangeLog.gdb R readline/readline/INSTALL R readline/readline/MANIFEST A readline/readline/Makefile.in R readline/readline/NEWS A readline/readline/README R readline/readline/USAGE A readline/readline/aclocal.m4 R readline/readline/ansi_stdlib.h R readline/readline/bind.c R readline/readline/callback.c R readline/readline/chardefs.h R readline/readline/colors.c R readline/readline/colors.h R readline/readline/compat.c R readline/readline/complete.c R readline/readline/config.h.in A readline/readline/configure A readline/readline/configure.ac R readline/readline/cross-build/cygwin.cache R readline/readline/display.c R readline/readline/doc/ChangeLog.gdb R readline/readline/doc/Makefile.in R readline/readline/doc/fdl.texi R readline/readline/doc/history.3 R readline/readline/doc/history.texi R readline/readline/doc/hstech.texi R readline/readline/doc/hsuser.texi R readline/readline/doc/readline.3 R readline/readline/doc/rlman.texi R readline/readline/doc/rltech.texi R readline/readline/doc/rluser.texi R readline/readline/doc/rluserman.texi R readline/readline/doc/texi2dvi R readline/readline/doc/texi2html R readline/readline/doc/version.texi R readline/readline/emacs_keymap.c R readline/readline/examples/ChangeLog.gdb R readline/readline/examples/Inputrc R readline/readline/examples/Makefile.in R readline/readline/examples/autoconf/BASH_CHECK_LIB_TERMCAP R readline/readline/examples/autoconf/RL_LIB_READLINE_VERSION R readline/readline/examples/autoconf/wi_LIB_READLINE R readline/readline/examples/excallback.c R readline/readline/examples/fileman.c R readline/readline/examples/hist_erasedups.c R readline/readline/examples/hist_purgecmd.c R readline/readline/examples/histexamp.c R readline/readline/examples/manexamp.c R readline/readline/examples/readlinebuf.h R readline/readline/examples/rl-callbacktest.c R readline/readline/examples/rl-fgets.c R readline/readline/examples/rl.c R readline/readline/examples/rlbasic.c R readline/readline/examples/rlcat.c R readline/readline/examples/rlevent.c R readline/readline/examples/rlfe/ChangeLog R readline/readline/examples/rlfe/ChangeLog.gdb R readline/readline/examples/rlfe/Makefile.in R readline/readline/examples/rlfe/README R readline/readline/examples/rlfe/config.h.in R readline/readline/examples/rlfe/configure R readline/readline/examples/rlfe/configure.in R readline/readline/examples/rlfe/extern.h R readline/readline/examples/rlfe/os.h R readline/readline/examples/rlfe/pty.c R readline/readline/examples/rlfe/rlfe.c R readline/readline/examples/rlfe/screen.h R readline/readline/examples/rlkeymaps.c R readline/readline/examples/rlptytest.c R readline/readline/examples/rltest.c R readline/readline/examples/rlversion.c R readline/readline/funmap.c R readline/readline/histexpand.c R readline/readline/histfile.c R readline/readline/histlib.h R readline/readline/history.c R readline/readline/history.h R readline/readline/histsearch.c R readline/readline/input.c R readline/readline/isearch.c R readline/readline/keymaps.c R readline/readline/keymaps.h R readline/readline/kill.c R readline/readline/macro.c R readline/readline/mbutil.c R readline/readline/misc.c R readline/readline/nls.c R readline/readline/parens.c R readline/readline/parse-colors.c R readline/readline/parse-colors.h R readline/readline/patchlevel R readline/readline/posixdir.h R readline/readline/posixjmp.h R readline/readline/posixselect.h R readline/readline/posixstat.h R readline/readline/readline.c R readline/readline/readline.h R readline/readline/readline.pc.in R readline/readline/rlconf.h R readline/readline/rldefs.h R readline/readline/rlmbutil.h R readline/readline/rlprivate.h R readline/readline/rlshell.h R readline/readline/rlstdc.h R readline/readline/rltty.c R readline/readline/rltty.h R readline/readline/rltypedefs.h R readline/readline/rlwinsize.h R readline/readline/savestring.c R readline/readline/search.c R readline/readline/shell.c R readline/readline/shlib/Makefile.in R readline/readline/signals.c R readline/readline/support/config.guess R readline/readline/support/config.rpath R readline/readline/support/config.sub R readline/readline/support/install.sh R readline/readline/support/mkdirs R readline/readline/support/mkdist R readline/readline/support/mkinstalldirs R readline/readline/support/shlib-install R readline/readline/support/shobj-conf R readline/readline/support/wcwidth.c R readline/readline/tcap.h R readline/readline/terminal.c R readline/readline/text.c R readline/readline/tilde.c R readline/readline/tilde.h R readline/readline/undo.c R readline/readline/util.c R readline/readline/vi_keymap.c R readline/readline/vi_mode.c R readline/readline/xfree.c R readline/readline/xmalloc.c R readline/readline/xmalloc.h 152 files changed, 15,591 insertions(+), 10,519 deletions(-)