bc869246e9
- Move changes that have been adopted upstream after 7.9 into extra patches named after the commit to GDB's master branch. This includes previous patches such as the signal trampoline detection fixes and XSAVE support as well as well as new fixes such as fixing 'gcore' to not require procfs. - The tui-io.c patch previously needed with new readline has been accepted upstream. - The remaining patches have been updated to apply cleanly. - The threads target has been fixed to actually pass register requests for LWP-backed threads down to the ptrace backends without detouring via libthread_db which actually fixes AVX with threads. PR: 199451 Differential Revision: https://reviews.freebsd.org/D2293 Approved by: bapt, luca.pizzamiglio@gmail.com (maintainer)
22 lines
894 B
C
22 lines
894 B
C
diff --git gdb/gdb_wchar.h gdb/gdb_wchar.h
|
|
index 868fe04..1311080 100644
|
|
--- gdb/gdb_wchar.h
|
|
+++ gdb/gdb_wchar.h
|
|
@@ -59,7 +59,7 @@
|
|
iconvlist. */
|
|
#if defined (HAVE_ICONV) && defined (HAVE_BTOWC) \
|
|
&& (defined (__STDC_ISO_10646__) \
|
|
- || (defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108))
|
|
+ || (!defined (LIBICONV_PLUG) && defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108))
|
|
|
|
typedef wchar_t gdb_wchar_t;
|
|
typedef wint_t gdb_wint_t;
|
|
@@ -82,7 +82,7 @@ typedef wint_t gdb_wint_t;
|
|
#define INTERMEDIATE_ENCODING intermediate_encoding ()
|
|
const char *intermediate_encoding (void);
|
|
|
|
-#elif defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108
|
|
+#elif !defined (LIBICONV_PLUG) && defined (_LIBICONV_VERSION) && _LIBICONV_VERSION >= 0x108
|
|
#define INTERMEDIATE_ENCODING "wchar_t"
|
|
#else
|
|
/* This shouldn't happen, because the earlier #if should have filtered
|