Revert "Sync readline/ to version 7.0 alpha"

This reverts commit b558ff0. This reverts commit 4a11f20. The initial import commit failed to retain local changes made to readline's configure.in (and the commit message erroneously stated that there were no local changes that needed to be reapplied). Also the import caused a couple of build errors and a scattering of testsuite regressions throughout many arches. It's probably better to start over with this import, hopefully more carefully next time.
weizhoublue · Jul 25, 2015 · 5836a81 · 5836a81
1 parent b8cc7b2
commit 5836a81
Show file tree

Hide file tree

Showing 98 changed files with 4,534 additions and 10,081 deletions.
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
@@ -1,8 +1,3 @@
-2015-07-25  Patrick Palka  <[email protected]>
-
-	* completer.c (gdb_printable_part): Sync with readline function
-	it is based off of.
-
 2015-07-24  Pedro Alves  <[email protected]>
 
 	* s390-linux-nat.c (fetch_regs, store_regs, fetch_fpregs)

diff --git a/gdb/completer.c b/gdb/completer.c
@@ -1318,7 +1318,7 @@ gdb_printable_part (char *pathname)
     return (pathname);
 
   temp = strrchr (pathname, '/');
-#if defined (__MSDOS__) || defined (_WIN32)
+#if defined (__MSDOS__)
   if (temp == 0 && ISALPHA ((unsigned char)pathname[0]) && pathname[1] == ':')
     temp = pathname + 1;
 #endif

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
@@ -14,12 +14,6 @@
 	(GDB_PARALLEL handling): Make outputs,temp,cache directories as subdirs
 	of $GDB_PARALLEL.
 
-2015-07-25  Patrick Palka  <[email protected]>
-
-	* gdb.gdb/selftest.exp (test_with_self): Update test to now
-	expect the GDB inferior to no longer immediately stop after
-	being resumed with "signal SIGINT".
-
 2015-07-24  Doug Evans  <[email protected]>
 
 	* gdb.perf/README: New file.

diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -444,26 +444,9 @@ proc test_with_self { executable } {
     }
 
     set description "send SIGINT signal to child process"
-    gdb_test_multiple "signal SIGINT" "$description" {
-	-re "^signal SIGINT\r\nContinuing with signal SIGINT.\r\nQuit\r\n.* $" {
-	    pass "$description"
-	}
-    }
-
-    set description "send ^C to child process again"
-    send_gdb "\003"
-    gdb_expect {
-	-re "Program received signal SIGINT.*$gdb_prompt $" {
-	    pass "$description"
-	}
-	-re ".*$gdb_prompt $" {
-	    fail "$description"
-	}
-	timeout {
-	    fail "$description (timeout)"
-	}
-    }
-
+    gdb_test "signal SIGINT" \
+	"Continuing with signal SIGINT.*" \
+	"$description"
 
     # get a stack trace
     #

diff --git a/readline/CHANGELOG b/readline/CHANGELOG
@@ -1093,209 +1093,3 @@ xfree.c
 				   -----
 {examples,shlib}/Makefile.in
 	- Cygwin-based changes from Eric Blake <[email protected]>
-
-				 3/26/2011
-				 ---------
-Makefile.in
-	- don't ignore failures when building, installing, or cleaning in
-	  the shlib subdirectory.  Sample patch from Mike Frysinger
-	  <[email protected]>
-
-shlib/Makefile.in
-	- split the install and uninstall targets into install-supported and
-	  install-unsupported targets that depend on the value of
-	  SHLIB_STATUS
-
-				    4/2
-				    ---
-{,shlib}/Makefile.in
-	- add dependency for callback.o/callback.so on xmalloc.h.  From
-	  Jan Kratochvil  <[email protected]>
-
-{,doc,examples,shlib}/Makefile.in
-	- fix typo: htm target should be html.  From Jan Kratochvil
-	  <[email protected]>
-	- remove `.' from VPATH.  From Jan Kratochvil
-	   <[email protected]>
-
-examples/rlfe/configure.in
-	- quote AC_PROGRAM_SOURCE.  From Jan Kratochvil
-	   <[email protected]>
-
-				   5/17
-				   ----
-config.h.in
-	- WCWIDTH_BROKEN: new define, picked up from bash, defined on systems
-	  where wcwidth returns 1 for Unicode combining characters
-
-				   11/28
-				   -----
-support/shlib-install
-	- make sure solaris2 systems make the installed shared library
-	  executable.  ldd warns about it otherwise.  Bug and fix from
-	  Tim Mooney <[email protected]>
-
-examples/hist_erasedups.c
-	- new example program, shows how to erase duplicates from the history
-	  list
-
-examples/hist_purgecmd.c
-	- new example program, shows how to remove all entries matching a
-	  string or pattern from the history list
-
-				 1/12/2012
-				 ---------
-colors.[ch],parse-colors.[ch]}
-	- new files, part of color infrastructure support
-
-Makefile.in,shlib/Makefile.in
-	- arrange to have colors.o and parse-colors.o added to library
-	  (static and shared versions)
-
-{configure,config.h}.in
-	- check for stdbool.h, define HAVE_STDBOOL_H if found
-
-rldefs.h
-	- COLOR_SUPPORT: if defined, compile in colors.c and parse-colors.c
-	  for color support
-
-				   1/18
-				   ----
-
-{configure,config.h}.in
-        - new check: check for AUDIT_USER_TTY defined in <linux/audit.h>,
-          define HAVE_DECL_AUDIT_USER_TTY if both are found
-
-				    8/7
-				    ---
-configure.in
-	- AC_CANONICAL_BUILD: call to set the build_xxx variables
-	- use $build_os instead of $host_os to decide when DJGPP should run
-	  `pwd.exe' to figure out the build directory.  Report and fix from
-	  Yao Qi <[email protected]>
-
-				   8/29
-				   ----
-configure.ac
-	- new name for configure.in
-
-MANIFEST,Makefile.in
-	- configure.in -> configure.ac
-
-				 1/5/2013
-				 --------
-configure.ac
-	- move version number up to 6.3
-
-				   1/31
-				   ----
-configure.ac
-	- use AC_CHECK_TOOL instead of AC_CHECK_PROG to check for ar, since it
-	  will find $host-prefixed versions of utilities.  Report and fix from
-	  Mike Frysinger <[email protected]>
-
-				    3/4
-				    ---
-Makefile.in
-        - PACKAGE_TARNAME, docdir: new variables substituted by autoconf
-        - OTHER_DOCS,OTHER_INSTALLED_DOCS: new variables with auxiliary
-	  documentation files to be installed into $(docdir)
-        - install: add new rule to install $(OTHER_DOCS)
-        - uninstall: add new rule to uninstall $(docdir)/$(OTHER_INSTALLED_DOCS)
-
-				   4/29
-				   ----
-Makefile.in
-	- installdirs: make sure to create $(DESTDIR)$(docdir).  Report from
-	  <[email protected]>
-
-				 1/27/2014
-				 ---------
-Makefile.in
-	- install-examples: should not depend on `shared', since the examples
-	  themselves are not built using shared libraries.  Report from
-	  <[email protected]>
-
-support/shobj-conf
-	- [from bash] darwin: changed the install_name embedded into the
-	  shared library to contain only the major version number, not the
-	  minor one. The idea is that the minor versions should all be API/ABI
-	  compatible, and it is better to link automatically with the latest
-	  one.  Idea from Max Horn <[email protected]>
-
-				 2/26/2014
-				 ---------
-[readline-6.3 released]
-
-				   3/14
-				   ----
-shlib/Makefile.in
-	- fix typo in dependency list for vi_mode.so: it should not depend on
-	  just $(topdir). Report and fix from Natanael Copa
-	  <[email protected]>
-
-				   4/15
-				   ----
-{.,shlib,examples}/Makefile.in
-	- make sure $(INCLUDES) appears before $(CPPFLAGS) in the various
-	  CFLAGS assignments so readline looks in its own source and build
-	  directories (INCLUDES) before some directories specified by the
-	  user or builder (CPPFLAGS).  Report and fix from Max Horn
-	  <[email protected]>
-
-				    6/2
-				    ---
-config.h.in
-	- use correct symbols: HAVE_STRUCT_DIRENT_D_INO, HAVE_STRUCT_DIRENT_D_FILENO
-	  HAVE_STRUCT_DIRENT_D_NAMLEN.  They don't really matter, but they are
-	  what posixdir.h looks for.  Report from Ross Burton <[email protected]>
-
-				   6/11
-				   ----
-readline.pc.in
-	- new file, config file for pkgconfig. Patch to add from Jirka Klimes
-	  <[email protected]>
-
-{MANIFEST,configure.ac,Makefile.in}
-	- readline.pc: changes to create file for pkgconfig
-
-				   10/13
-				   -----
-doc/Makefile.in
-	- readline.pdf, history.pdf, rluserman.pdf: use texi2dvi --pdf to generate
-	  these.  Suggestion from Siep Kroonenberg <[email protected]>
-
-				   11/29
-				   -----
-config.h.in
-        - HAVE_PSELECT: define if pselect(2) available
-
-configure.ac
-        - check for pselect(2), define HAVE_PSELECT if found
-
-				   12/29
-				   -----
-configure.ac
-	- bump version number up to 6.4
-
-				 1/6/2015
-				 --------
-configure.ac,config.h.in
-	- look for ncurses/termcap.h, define HAVE_NCURSES_TERMCAP_H
-
-				   4/20
-				   ----
-configure.ac
-	- add template definitions set by AC_USE_SYSTEM_EXTENSIONS from a report
-	  from Andreas Schwab <[email protected]>
-
-				   4/24
-				   ----
-configure.ac,config.h.in
-	- add check for sys/ioctl.h to AC_CHECK_HEADERS, define HAVE_SYS_IOCTL_H
-	  if found
-
-				   5/29
-				   ----
-configure.ac
-	- bump library version to 7.0 because of addition of rl_callback_sigcleanup