diff options
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc6-aux/Makefile.version | 2 | ||||
| -rw-r--r-- | lang/gcc6-aux/distinfo | 4 | ||||
| -rw-r--r-- | lang/gcc6-aux/files/diff-cxx | 51 |
3 files changed, 54 insertions, 3 deletions
diff --git a/lang/gcc6-aux/Makefile.version b/lang/gcc6-aux/Makefile.version index d8891e94efa..b7e616d2e6a 100644 --- a/lang/gcc6-aux/Makefile.version +++ b/lang/gcc6-aux/Makefile.version @@ -3,7 +3,7 @@ GCC_BRANCH= 6 GCC_POINT= 0.0 GCC_VERSION= ${GCC_BRANCH}.${GCC_POINT} -SNAPSHOT= 20160306 +SNAPSHOT= 20160313 BUILD_RELEASE= no MAIN_PR= 0 UTIL_PR= 0 diff --git a/lang/gcc6-aux/distinfo b/lang/gcc6-aux/distinfo index 9c7a9fd1518..3d942d93758 100644 --- a/lang/gcc6-aux/distinfo +++ b/lang/gcc6-aux/distinfo @@ -1,5 +1,5 @@ -SHA256 (gcc-6-20160306.tar.bz2) = fec1c83edcaa3e51a92b76af8e1f91b683304172a9abd7b08379f1213cc58b6a -SIZE (gcc-6-20160306.tar.bz2) = 95156434 +SHA256 (gcc-6-20160313.tar.bz2) = 7c65d90063b6cce4aaceca85d9cd132ba12a78093d83384ed0b6c3af41e5abf8 +SIZE (gcc-6-20160313.tar.bz2) = 95177302 SHA256 (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 7231209f2600275f554f788ad1d036cf633c4339ebd25bd479a5bb1ddcddedf3 SIZE (ada-bootstrap.i386.freebsd.100B.tar.bz2) = 41229192 SHA256 (ada-bootstrap.x86_64.dragonfly.41.tar.bz2) = eb7785d8b842aee2bb04b43adfb1346b178ee4e83d8775b4e6705fd23f1586f0 diff --git a/lang/gcc6-aux/files/diff-cxx b/lang/gcc6-aux/files/diff-cxx index 672c9ca9965..dff22624fd6 100644 --- a/lang/gcc6-aux/files/diff-cxx +++ b/lang/gcc6-aux/files/diff-cxx @@ -10,3 +10,54 @@ linux-musl*) os_include_dir="os/generic" ;; +--- libstdc++-v3/config/os/bionic/ctype_base.h.orig ++++ libstdc++-v3/config/os/bionic/ctype_base.h +@@ -38,6 +38,18 @@ + // Non-standard typedefs. + typedef const int* __to_type; + ++#ifdef _CTYPE_U ++#define _U _CTYPE_U ++#define _L _CTYPE_L ++#define _D _CTYPE_D ++#define _S _CTYPE_S ++#define _P _CTYPE_P ++#define _C _CTYPE_C ++#define _X _CTYPE_X ++#define _B _CTYPE_B ++#define _N _CTYPE_D ++#endif ++ + // NB: Offsets into ctype<char>::_M_table force a particular size + // on the mask type. Because of this, we don't use an enum. + typedef char mask; +--- libstdc++-v3/src/c++11/futex.cc.orig ++++ libstdc++-v3/src/c++11/futex.cc +@@ -27,7 +27,11 @@ + #if defined(_GLIBCXX_HAVE_LINUX_FUTEX) && ATOMIC_INT_LOCK_FREE > 1 + #include <chrono> + #include <climits> ++#ifdef __ANDROID__ ++#include <sys/syscall.h> ++#else + #include <syscall.h> ++#endif + #include <unistd.h> + #include <sys/time.h> + #include <errno.h> +--- libstdc++-v3/src/filesystem/dir.cc.orig ++++ libstdc++-v3/src/filesystem/dir.cc +@@ -147,7 +147,13 @@ + + int err = std::exchange(errno, 0); + const auto entp = readdir(dirp); ++#ifdef __ANDROID__ ++ int tmperr = errno; ++ errno = err; ++ err = tmperr; ++#else + std::swap(errno, err); ++#endif + + if (entp) + { |