diff options
Diffstat (limited to 'packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch')
| -rw-r--r-- | packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch | 52 |
1 files changed, 22 insertions, 30 deletions
diff --git a/packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch b/packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch index da92ba3f..7e3e6e65 100644 --- a/packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch +++ b/packages/gcc/10.3.0/0020-libstdcxx-pure-stdio.patch @@ -28,17 +28,15 @@ libstdc++-v3/ChangeLog: * config.h.in: Regenerate. * configure: Regenerate. --- - libstdc++-v3/acinclude.m4 | 20 ++++++---- - libstdc++-v3/config.h.in | 3 ++ - libstdc++-v3/config/io/basic_file_stdio.cc | 46 +++++++++++++++++++--- - libstdc++-v3/configure | 17 +++++--- + libstdc++-v3/acinclude.m4 | 20 ++++++++---- + libstdc++-v3/config.h.in | 3 + + libstdc++-v3/config/io/basic_file_stdio.cc | 46 +++++++++++++++++++++++++---- + libstdc++-v3/configure | 17 +++++++--- 4 files changed, 69 insertions(+), 17 deletions(-) -diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 -index ee5e0336f2c..9604533c306 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 -@@ -2826,24 +2826,30 @@ AC_DEFUN([GLIBCXX_ENABLE_PARALLEL], [ +@@ -2797,24 +2797,30 @@ dnl @@ -76,11 +74,9 @@ index ee5e0336f2c..9604533c306 100644 ;; esac -diff --git a/libstdc++-v3/config.h.in b/libstdc++-v3/config.h.in -index 8940e0c7acd..eabcf18b52b 100644 --- a/libstdc++-v3/config.h.in +++ b/libstdc++-v3/config.h.in -@@ -1031,6 +1031,9 @@ +@@ -974,6 +974,9 @@ /* Define if sendfile is available in <sys/sendfile.h>. */ #undef _GLIBCXX_USE_SENDFILE @@ -90,11 +86,9 @@ index 8940e0c7acd..eabcf18b52b 100644 /* Define if struct stat has timespec members. */ #undef _GLIBCXX_USE_ST_MTIM -diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc -index ba830fb9e97..eedffb017b6 100644 --- a/libstdc++-v3/config/io/basic_file_stdio.cc +++ b/libstdc++-v3/config/io/basic_file_stdio.cc -@@ -111,13 +111,21 @@ namespace +@@ -111,13 +111,21 @@ // Wrapper handling partial write. static std::streamsize @@ -116,7 +110,7 @@ index ba830fb9e97..eedffb017b6 100644 if (__ret == -1L && errno == EINTR) continue; if (__ret == -1L) -@@ -133,7 +141,7 @@ namespace +@@ -133,7 +141,7 @@ return __n - __nleft; } @@ -125,7 +119,7 @@ index ba830fb9e97..eedffb017b6 100644 // Wrapper handling partial writev. static std::streamsize xwritev(int __fd, const char* __s1, std::streamsize __n1, -@@ -286,9 +294,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -286,9 +294,11 @@ __basic_file<char>::is_open() const throw () { return _M_cfile != 0; } @@ -137,7 +131,7 @@ index ba830fb9e97..eedffb017b6 100644 __c_file* __basic_file<char>::file() throw () -@@ -315,28 +325,46 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -315,29 +325,47 @@ { streamsize __ret; do @@ -182,11 +176,12 @@ index ba830fb9e97..eedffb017b6 100644 + __ret += xwrite(this->file(), __s2, __n2); +#else __ret += xwrite(this->fd(), __s2, __n2); -+#endif #endif ++#endif return __ret; } -@@ -350,7 +378,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + +@@ -350,8 +378,12 @@ if (__off > numeric_limits<off_t>::max() || __off < numeric_limits<off_t>::min()) return -1L; @@ -194,11 +189,12 @@ index ba830fb9e97..eedffb017b6 100644 + return fseek(this->file(), __off, __way); +#else return lseek(this->fd(), __off, __way); -+#endif #endif ++#endif } -@@ -361,7 +393,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION + int +@@ -361,7 +393,7 @@ streamsize __basic_file<char>::showmanyc() { @@ -207,7 +203,7 @@ index ba830fb9e97..eedffb017b6 100644 #ifdef FIONREAD // Pipes and sockets. int __num = 0; -@@ -371,7 +403,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -371,7 +403,7 @@ #endif #endif @@ -216,7 +212,7 @@ index ba830fb9e97..eedffb017b6 100644 // Cheap test. struct pollfd __pfd[1]; __pfd[0].fd = this->fd(); -@@ -395,8 +427,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION +@@ -395,9 +427,13 @@ struct stat __buffer; const int __err = fstat(this->fd(), &__buffer); if (!__err && _GLIBCXX_ISREG(__buffer.st_mode)) @@ -225,15 +221,14 @@ index ba830fb9e97..eedffb017b6 100644 +#else return __buffer.st_size - lseek(this->fd(), 0, ios_base::cur); #endif -+#endif #endif ++#endif return 0; } -diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure -index 9f9c5a2419a..50c8f00a41c 100755 + --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure -@@ -16299,7 +16299,7 @@ $as_echo_n "checking for underlying I/O to use... " >&6; } +@@ -16301,7 +16301,7 @@ if test "${enable_cstdio+set}" = set; then : enableval=$enable_cstdio; case "$enableval" in @@ -242,7 +237,7 @@ index 9f9c5a2419a..50c8f00a41c 100755 *) as_fn_error $? "Unknown argument to enable/disable cstdio" "$LINENO" 5 ;; esac -@@ -16309,16 +16309,23 @@ fi +@@ -16311,16 +16311,23 @@ @@ -270,6 +265,3 @@ index 9f9c5a2419a..50c8f00a41c 100755 ;; esac --- -2.29.2 - |