libcxx: update to 5.0.1.

This commit is contained in:
Leah Neukirchen 2017-09-09 22:53:26 +02:00 committed by Leаh Neukirchen
parent 297334c4f3
commit 75c0871dcd
3 changed files with 3 additions and 59 deletions

View file

@ -26,36 +26,3 @@
typename remove_reference<decltype(errno)>::type __current_errno = errno;
if (__current_errno == 0)
errno = __save_errno;
--- libcxx-4.0.0.src/src/locale.cpp.orig
+++ libcxx-4.0.0.src/src/locale.cpp
@@ -1012,7 +1012,7 @@
return low;
}
-#if defined(__EMSCRIPTEN__)
+#if defined(__linux__)
extern "C" const unsigned short ** __ctype_b_loc();
extern "C" const int ** __ctype_tolower_loc();
extern "C" const int ** __ctype_toupper_loc();
@@ -1118,20 +1118,8 @@
#else
return __pctype_func();
#endif
-#elif defined(__EMSCRIPTEN__)
- return *__ctype_b_loc();
-#elif defined(_NEWLIB_VERSION)
- // Newlib has a 257-entry table in ctype_.c, where (char)0 starts at [1].
- return _ctype_ + 1;
-#elif defined(_AIX)
- return (const unsigned int *)__lc_ctype_ptr->obj->mask;
#else
- // Platform not supported: abort so the person doing the port knows what to
- // fix
-# warning ctype<char>::classic_table() is not implemented
- printf("ctype<char>::classic_table() is not implemented\n");
- abort();
- return NULL;
+ return (const unsigned long *)*__ctype_b_loc();
#endif
}
#endif

View file

@ -1,23 +0,0 @@
From 6e02e89f65ca1ca1d6ce30fbc557563164dd327e Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Thu, 3 Aug 2017 04:28:10 +0000
Subject: [PATCH] Fix libcxx build with glibc 2.26+ by removing xlocale.h
include.
Patch by Khem Raj. Reviewed as D35697. Also see PR33729.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@309920 91177308-0d34-0410-b5e6-96231b3b80d8
---
--- include/__locale
+++ include/__locale
@@ -34,7 +34,7 @@
# include <support/solaris/xlocale.h>
#elif defined(_NEWLIB_VERSION)
# include <support/newlib/xlocale.h>
-#elif (defined(__GLIBC__) || defined(__APPLE__) || defined(__FreeBSD__) \
+#elif (defined(__APPLE__) || defined(__FreeBSD__) \
|| defined(__EMSCRIPTEN__) || defined(__IBMCPP__))
# include <xlocale.h>
#elif defined(__Fuchsia__)

View file

@ -1,7 +1,7 @@
# Template file for 'libcxx'
pkgname=libcxx
version=4.0.1
revision=2
version=5.0.1
revision=1
build_style=cmake
hostmakedepends="clang llvm python"
makedepends="libcxxabi-devel llvm llvm-libunwind-devel"
@ -27,7 +27,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
homepage="http://libcxx.llvm.org"
license="BSD"
distfiles="http://www.llvm.org/releases/${version}/${pkgname}-${version}.src.tar.xz"
checksum=520a1171f272c9ff82f324d5d89accadcec9bc9f3c78de11f5575cdb99accc4c
checksum=fa8f99dd2bde109daa3276d529851a3bce5718d46ce1c5d0806f46caa3e57c00
wrksrc=${pkgname}-${version}.src
post_extract() {