From b2a54b74aec6fdab9ae50c8a4d33fa103d7c5d3a Mon Sep 17 00:00:00 2001 From: Ray Donnelly Date: Sat, 27 Feb 2016 19:07:05 +0000 Subject: [PATCH] gdb-git: Remove unused patches --- ...002-MinGW-w64-Fix-libiberty-makefile.patch | 57 ------ ...003-MinGW-w64-Fix-libibery-configure.patch | 99 ----------- .../0004-MinGW-w64-Use-gnu-printf.patch | 164 ------------------ mingw-w64-gdb-git/0005-GDB-performance.patch | 26 --- 4 files changed, 346 deletions(-) delete mode 100644 mingw-w64-gdb-git/0002-MinGW-w64-Fix-libiberty-makefile.patch delete mode 100644 mingw-w64-gdb-git/0003-MinGW-w64-Fix-libibery-configure.patch delete mode 100644 mingw-w64-gdb-git/0004-MinGW-w64-Use-gnu-printf.patch delete mode 100644 mingw-w64-gdb-git/0005-GDB-performance.patch diff --git a/mingw-w64-gdb-git/0002-MinGW-w64-Fix-libiberty-makefile.patch b/mingw-w64-gdb-git/0002-MinGW-w64-Fix-libiberty-makefile.patch deleted file mode 100644 index 1f62ae1139..0000000000 --- a/mingw-w64-gdb-git/0002-MinGW-w64-Fix-libiberty-makefile.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ed9ad8527fb28ca26279bcf77f5d78cb25e5eb05 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Sat, 31 Oct 2015 21:39:48 +0000 -Subject: [PATCH 2/4] MinGW-w64: Fix libiberty makefile - ---- - libiberty/Makefile.in | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index 9b87720..eddde49 100644 ---- a/libiberty/Makefile.in -+++ b/libiberty/Makefile.in -@@ -130,7 +130,7 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \ - d-demangle.c dwarfnames.c dyn-string.c \ - fdmatch.c ffs.c fibheap.c filename_cmp.c floatformat.c \ - fnmatch.c fopen_unlocked.c \ -- getcwd.c getopt.c getopt1.c getpagesize.c getpwd.c getruntime.c \ -+ getcwd.c getpagesize.c getpwd.c getruntime.c \ - gettimeofday.c \ - hashtab.c hex.c \ - index.c insque.c \ -@@ -155,8 +155,8 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \ - strtoul.c strndup.c strnlen.c strverscmp.c \ - timeval-utils.c tmpnam.c \ - unlink-if-ordinary.c \ -- vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c \ -- waitpid.c \ -+ vasprintf.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c \ -+ msdos.c \ - xatexit.c xexit.c xmalloc.c xmemdup.c xstrdup.c xstrerror.c \ - xstrndup.c - -@@ -172,7 +172,7 @@ REQUIRED_OFILES = \ - ./fdmatch.$(objext) ./fibheap.$(objext) \ - ./filename_cmp.$(objext) ./floatformat.$(objext) \ - ./fnmatch.$(objext) ./fopen_unlocked.$(objext) \ -- ./getopt.$(objext) ./getopt1.$(objext) ./getpwd.$(objext) \ -+ ./getpwd.$(objext) \ - ./getruntime.$(objext) ./hashtab.$(objext) ./hex.$(objext) \ - ./lbasename.$(objext) ./lrealpath.$(objext) \ - ./make-relative-prefix.$(objext) ./make-temp-file.$(objext) \ -@@ -221,9 +221,9 @@ CONFIGURED_OFILES = ./asprintf.$(objext) ./atexit.$(objext) \ - ./strrchr.$(objext) ./strstr.$(objext) ./strtod.$(objext) \ - ./strtol.$(objext) ./strtoul.$(objext) ./strverscmp.$(objext) \ - ./tmpnam.$(objext) \ -- ./vasprintf.$(objext) ./vfork.$(objext) ./vfprintf.$(objext) \ -+ ./vasprintf.$(objext) ./vfprintf.$(objext) \ - ./vprintf.$(objext) ./vsnprintf.$(objext) ./vsprintf.$(objext) \ -- ./waitpid.$(objext) -+ ./msdos.$(objext) - - # These files are installed if the library has been configured to do so. - INSTALLED_HEADERS = \ --- -2.6.2 - diff --git a/mingw-w64-gdb-git/0003-MinGW-w64-Fix-libibery-configure.patch b/mingw-w64-gdb-git/0003-MinGW-w64-Fix-libibery-configure.patch deleted file mode 100644 index 0bd5e19ca9..0000000000 --- a/mingw-w64-gdb-git/0003-MinGW-w64-Fix-libibery-configure.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 36e94c3ebc68f839a97f71a13e8b917ec0351cb8 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Sat, 31 Oct 2015 21:40:03 +0000 -Subject: [PATCH 2/4] MinGW-w64: Fix libibery configure - ---- - libiberty/configure | 16 +--------------- - libiberty/configure.ac | 6 +----- - 2 files changed, 2 insertions(+), 20 deletions(-) - -diff --git a/libiberty/configure b/libiberty/configure -index d8890a1..efb376c 100755 ---- a/libiberty/configure -+++ b/libiberty/configure -@@ -5684,7 +5684,6 @@ funcs="$funcs vfprintf" - funcs="$funcs vprintf" - funcs="$funcs vsnprintf" - funcs="$funcs vsprintf" --funcs="$funcs waitpid" - funcs="$funcs setproctitle" - - # Also in the old function.def file: alloca, vfork, getopt. -@@ -6051,13 +6050,6 @@ esac - ;; - esac - -- case " $LIBOBJS " in -- *" waitpid.$ac_objext "* ) ;; -- *) LIBOBJS="$LIBOBJS waitpid.$ac_objext" -- ;; --esac -- -- - for f in $funcs; do - case "$f" in - asprintf | basename | bcmp | bcopy | bzero | clock | ffs | getpagesize | index | insque | mempcpy | mkstemps | random | rindex | sigsetmask | stpcpy | stpncpy | strdup | strndup | strnlen | strverscmp | vasprintf | waitpid) -@@ -6198,12 +6190,6 @@ esac - esac - - case " $LIBOBJS " in -- *" vfork.$ac_objext "* ) ;; -- *) LIBOBJS="$LIBOBJS vfork.$ac_objext" -- ;; --esac -- -- case " $LIBOBJS " in - *" waitpid.$ac_objext "* ) ;; - *) LIBOBJS="$LIBOBJS waitpid.$ac_objext" - ;; -@@ -6665,7 +6651,7 @@ fi - if test $ac_cv_func_vfork_works = no; then - case " $LIBOBJS " in - *" vfork.$ac_objext "* ) ;; -- *) LIBOBJS="$LIBOBJS vfork.$ac_objext" -+ *) - ;; - esac - -diff --git a/libiberty/configure.ac b/libiberty/configure.ac -index 868be8e..05f9401 100644 ---- a/libiberty/configure.ac -+++ b/libiberty/configure.ac -@@ -381,7 +381,6 @@ funcs="$funcs vfprintf" - funcs="$funcs vprintf" - funcs="$funcs vsnprintf" - funcs="$funcs vsprintf" --funcs="$funcs waitpid" - funcs="$funcs setproctitle" - - # Also in the old function.def file: alloca, vfork, getopt. -@@ -482,6 +481,7 @@ if test -n "${with_target_subdir}"; then - AC_LIBOBJ([insque]) - AC_LIBOBJ([mempcpy]) - AC_LIBOBJ([mkstemps]) -+ AC_LIBOBJ([msdos]) - AC_LIBOBJ([random]) - AC_LIBOBJ([rindex]) - AC_LIBOBJ([sigsetmask]) -@@ -491,7 +491,6 @@ if test -n "${with_target_subdir}"; then - AC_LIBOBJ([strnlen]) - AC_LIBOBJ([strverscmp]) - AC_LIBOBJ([vasprintf]) -- AC_LIBOBJ([waitpid]) - - for f in $funcs; do - case "$f" in -@@ -639,9 +638,6 @@ if test -z "${setobjs}"; then - AC_REPLACE_FUNCS($funcs) - libiberty_AC_FUNC_C_ALLOCA - AC_FUNC_FORK -- if test $ac_cv_func_vfork_works = no; then -- AC_LIBOBJ([vfork]) -- fi - # We only need _doprnt if we might use it to implement v*printf. - if test $ac_cv_func_vprintf != yes \ - || test $ac_cv_func_vfprintf != yes \ --- -2.6.2 - diff --git a/mingw-w64-gdb-git/0004-MinGW-w64-Use-gnu-printf.patch b/mingw-w64-gdb-git/0004-MinGW-w64-Use-gnu-printf.patch deleted file mode 100644 index 5a3a2e7d94..0000000000 --- a/mingw-w64-gdb-git/0004-MinGW-w64-Use-gnu-printf.patch +++ /dev/null @@ -1,164 +0,0 @@ -From c0039428f01b62658bedd82ef7cdd0f9c3d5ee86 Mon Sep 17 00:00:00 2001 -From: Ray Donnelly -Date: Sat, 31 Oct 2015 21:40:15 +0000 -Subject: [PATCH] MinGW-w64: Use gnu-printf - ---- - bfd/bfd-in.h | 2 +- - bfd/bfd-in2.h | 2 +- - binutils/nm.c | 4 ++-- - binutils/prdbg.c | 2 +- - binutils/readelf.c | 4 ++-- - gas/read.c | 2 +- - gold/configure | 2 +- - gold/configure.ac | 2 +- - include/ansidecl.h | 4 ++-- - 9 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h -index 5df2bab..76f5a9c 100644 ---- a/bfd/bfd-in.h -+++ b/bfd/bfd-in.h -@@ -137,7 +137,7 @@ typedef BFD_HOST_U_64_BIT symvalue; - - #if BFD_HOST_64BIT_LONG - #define BFD_VMA_FMT "l" --#elif defined (__MSVCRT__) -+#elif defined(__MSVCRT__) && !defined( __USE_MINGW_ANSI_STDIO) - #define BFD_VMA_FMT "I64" - #else - #define BFD_VMA_FMT "ll" -diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h -index 612ab4b..4b20eaa 100644 ---- a/bfd/bfd-in2.h -+++ b/bfd/bfd-in2.h -@@ -144,7 +144,7 @@ typedef BFD_HOST_U_64_BIT symvalue; - - #if BFD_HOST_64BIT_LONG - #define BFD_VMA_FMT "l" --#elif defined (__MSVCRT__) -+#elif defined (__MSVCRT__) && !defined(__USE_MINGW_ANSI_STDIO) - #define BFD_VMA_FMT "I64" - #else - #define BFD_VMA_FMT "ll" -diff --git a/binutils/nm.c b/binutils/nm.c -index 5ca4d34..9fc55f9 100644 ---- a/binutils/nm.c -+++ b/binutils/nm.c -@@ -170,7 +170,7 @@ static char value_format_32bit[] = "%08lx"; - #if BFD_HOST_64BIT_LONG - static char value_format_64bit[] = "%016lx"; - #elif BFD_HOST_64BIT_LONG_LONG --#ifndef __MSVCRT__ -+#if !defined(__MSVCRT__) || defined(__USE_MINGW_ANSI_STDIO) - static char value_format_64bit[] = "%016llx"; - #else - static char value_format_64bit[] = "%016I64x"; -@@ -300,7 +300,7 @@ set_print_radix (char *radix) - #if BFD_HOST_64BIT_LONG - value_format_64bit[5] = *radix; - #elif BFD_HOST_64BIT_LONG_LONG --#ifndef __MSVCRT__ -+#if !defined(__MSVCRT__) || defined(__USE_MINGW_ANSI_STDIO) - value_format_64bit[6] = *radix; - #else - value_format_64bit[7] = *radix; -diff --git a/binutils/prdbg.c b/binutils/prdbg.c -index 7f3dcce..9233ecc 100644 ---- a/binutils/prdbg.c -+++ b/binutils/prdbg.c -@@ -502,7 +502,7 @@ print_vma (bfd_vma vma, char *buf, bfd_boolean unsignedp, bfd_boolean hexp) - #if BFD_HOST_64BIT_LONG_LONG - else if (sizeof (vma) <= sizeof (unsigned long long)) - { --#ifndef __MSVCRT__ -+#if !defined(__MSVCRT__) || defined(__USE_MINGW_ANSI_STDIO) - if (hexp) - sprintf (buf, "0x%llx", (unsigned long long) vma); - else if (unsignedp) -diff --git a/binutils/readelf.c b/binutils/readelf.c -index e23fe17..2cf64c7 100644 ---- a/binutils/readelf.c -+++ b/binutils/readelf.c -@@ -1150,7 +1150,7 @@ dump_relocations (FILE * file, - : "%12.12lx %12.12lx ", - offset, inf); - #elif BFD_HOST_64BIT_LONG_LONG --#ifndef __MSVCRT__ -+#if !defined(__MSVCRT__) || defined(__USE_MINGW_ANSI_STDIO) - printf (do_wide - ? "%16.16llx %16.16llx " - : "%12.12llx %12.12llx ", -@@ -12224,7 +12224,7 @@ dump_section_as_strings (Elf_Internal_Shdr * section, FILE * file) - { - size_t maxlen = end - data; - --#ifndef __MSVCRT__ -+#if !defined(__MSVCRT__) || defined(__USE_MINGW_ANSI_STDIO) - /* PR 11128: Use two separate invocations in order to work - around bugs in the Solaris 8 implementation of printf. */ - printf (" [%6tx] ", data - start); -diff --git a/gas/read.c b/gas/read.c -index e992534..a163914 100644 ---- a/gas/read.c -+++ b/gas/read.c -@@ -4413,7 +4413,7 @@ emit_expr_with_reloc (expressionS *exp, - || (get & hibit) == 0)) - { /* Leading bits contain both 0s & 1s. */ - #if defined (BFD64) && BFD_HOST_64BIT_LONG_LONG --#ifndef __MSVCRT__ -+#if !defined(__MSVCRT__) || defined(__USE_MINGW_ANSI_STDIO) - as_warn (_("value 0x%llx truncated to 0x%llx"), - (unsigned long long) get, (unsigned long long) use); - #else -diff --git a/gold/configure b/gold/configure -index 987a846..0e15f73 100755 ---- a/gold/configure -+++ b/gold/configure -@@ -7489,7 +7489,7 @@ else - /* end confdefs.h. */ - - template extern void foo(const char*, ...) -- __attribute__ ((__format__ (__printf__, 1, 2))); -+ __attribute__ ((__format__ (gnu_printf, 1, 2))); - template void foo(const char* format, ...) {} - void bar() { foo("%s\n", "foo"); } - -diff --git a/gold/configure.ac b/gold/configure.ac -index 695a2fd..f4814be 100644 ---- a/gold/configure.ac -+++ b/gold/configure.ac -@@ -616,7 +616,7 @@ AC_CACHE_CHECK([whether we can use attributes with template functions], - [gold_cv_template_attribute], - [AC_COMPILE_IFELSE([ - template extern void foo(const char*, ...) -- __attribute__ ((__format__ (__printf__, 1, 2))); -+ __attribute__ ((__format__ (gnu_printf, 1, 2))); - template void foo(const char* format, ...) {} - void bar() { foo("%s\n", "foo"); } - ], [gold_cv_template_attribute=yes], [gold_cv_template_attribute=no])]) -diff --git a/include/ansidecl.h b/include/ansidecl.h -index 18b7821..012ece9 100644 ---- a/include/ansidecl.h -+++ b/include/ansidecl.h -@@ -195,7 +195,7 @@ So instead we use the macro below and test it against specific values. */ - before GCC 3.3, but as of 3.3 we need to add the `nonnull' - attribute to retain this behavior. */ - #ifndef ATTRIBUTE_PRINTF --#define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n))) ATTRIBUTE_NONNULL(m) -+#define ATTRIBUTE_PRINTF(m, n) __attribute__ ((__format__ (gnu_printf, m, n))) ATTRIBUTE_NONNULL(m) - #define ATTRIBUTE_PRINTF_1 ATTRIBUTE_PRINTF(1, 2) - #define ATTRIBUTE_PRINTF_2 ATTRIBUTE_PRINTF(2, 3) - #define ATTRIBUTE_PRINTF_3 ATTRIBUTE_PRINTF(3, 4) -@@ -223,7 +223,7 @@ So instead we use the macro below and test it against specific values. */ - NULL format specifier was allowed as of gcc 3.3. */ - #ifndef ATTRIBUTE_NULL_PRINTF - # if (GCC_VERSION >= 3003) --# define ATTRIBUTE_NULL_PRINTF(m, n) __attribute__ ((__format__ (__printf__, m, n))) -+# define ATTRIBUTE_NULL_PRINTF(m, n) __attribute__ ((__format__ (gnu_printf, m, n))) - # else - # define ATTRIBUTE_NULL_PRINTF(m, n) - # endif /* GNUC >= 3.3 */ --- -2.7.1 - diff --git a/mingw-w64-gdb-git/0005-GDB-performance.patch b/mingw-w64-gdb-git/0005-GDB-performance.patch deleted file mode 100644 index 5521218fff..0000000000 --- a/mingw-w64-gdb-git/0005-GDB-performance.patch +++ /dev/null @@ -1,26 +0,0 @@ -From fb7c98b413fd7020413bd0b280fa05e7bf5ae3a9 Mon Sep 17 00:00:00 2001 -From: dje/asmwarrior -Date: Mon, 2 Nov 2015 22:25:33 +0000 -Subject: [PATCH] GDB performance - -http://sourceware.org/bugzilla/show_bug.cgi?id=15412 ---- - gdb/typeprint.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gdb/typeprint.c b/gdb/typeprint.c -index 377223a..e919112 100644 ---- a/gdb/typeprint.c -+++ b/gdb/typeprint.c -@@ -59,7 +59,7 @@ const struct type_print_options type_print_raw_options = - - static struct type_print_options default_ptype_flags = - { -- 0, /* raw */ -+ 1, /* raw */ - 1, /* print_methods */ - 1, /* print_typedefs */ - NULL, /* local_typedefs */ --- -2.6.2 -