diff options
Diffstat (limited to 'packages')
4 files changed, 2 insertions, 258 deletions
diff --git a/packages/dev-libs/compiler-rt/compiler-rt-8.0.1-r3.exheres-0 b/packages/dev-libs/compiler-rt/compiler-rt-8.0.1-r3.exheres-0 deleted file mode 100644 index 18c92f945..000000000 --- a/packages/dev-libs/compiler-rt/compiler-rt-8.0.1-r3.exheres-0 +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2015 Niels Ole Salscheider <niels_ole@salscheider-online.de> -# Distributed under the terms of the GNU General Public License v2 - -require compiler-rt - -PLATFORMS="~amd64 ~x86" - -DEFAULT_SRC_PREPARE_PATCHES=( - "${FILES}"/${PNV}-musl-fixes.patch - -p2 "${FILES}"/0001-compiler-rt-Backport-patch-to-fix-build-error-with-g.patch -) - diff --git a/packages/dev-libs/compiler-rt/compiler-rt.exlib b/packages/dev-libs/compiler-rt/compiler-rt.exlib index e8e963cb4..780469d38 100644 --- a/packages/dev-libs/compiler-rt/compiler-rt.exlib +++ b/packages/dev-libs/compiler-rt/compiler-rt.exlib @@ -3,11 +3,7 @@ # Copyright 2012 Elias Pipping <pipping@exherbo.org> # Distributed under the terms of the GNU General Public License v2 -if ever at_least 9.0; then - require llvm-project [ slotted=true rtlib=true stdlib=true ] -else - require llvm-project [ slotted=true stdlib=true ] -fi +require llvm-project [ slotted=true rtlib=true stdlib=true ] export_exlib_phases src_prepare src_configure @@ -34,13 +30,6 @@ DEPENDENCIES=" ) " -if ! ever at_least 9.0; then - DEPENDENCIES+=" - build+run: - sys-libs/libgcc:= - " -fi - CMAKE_SRC_CONFIGURE_PARAMS+=( '-DCOMPILER_RT_BUILD_BUILTINS:BOOL=ON' '-DCOMPILER_RT_BUILD_CRT:BOOL=ON' @@ -82,9 +71,7 @@ compiler-rt_src_configure() { local resource_dir=$(${clang_exe} -print-resource-dir) local args=( -DCOMPILER_RT_INSTALL_PATH=${resource_dir} ) - if ever at_least 9.0; then - option providers:compiler-rt && args+=( -DCOMPILER_RT_USE_BUILTINS_LIBRARY:BOOL=ON ) - fi + option providers:compiler-rt && args+=( -DCOMPILER_RT_USE_BUILTINS_LIBRARY:BOOL=ON ) if option providers:libc++; then args+=( diff --git a/packages/dev-libs/compiler-rt/files/8626a35a71f4398bc9b654b7375a2cdb17bd735d.patch b/packages/dev-libs/compiler-rt/files/8626a35a71f4398bc9b654b7375a2cdb17bd735d.patch deleted file mode 100644 index 2b15b8ac1..000000000 --- a/packages/dev-libs/compiler-rt/files/8626a35a71f4398bc9b654b7375a2cdb17bd735d.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8626a35a71f4398bc9b654b7375a2cdb17bd735d Mon Sep 17 00:00:00 2001 -From: Jian Cai <caij2003@gmail.com> -Date: Mon, 16 Sep 2019 21:47:47 +0000 -Subject: [PATCH] [compiler-rt][crt] make test case nontrivial in - check_cxx_section_exists - -Summary: -.init_array gets optimized away when building with -O2 and as a result, -check_cxx_section_exists failed to pass -DCOMPILER_RT_HAS_INITFINI_ARRAY -when building crtbegin.o and crtend.o, which causes binaries linked with -them encounter segmentation fault. See https://crbug.com/855759 for -details. This change prevents .init_array section to be optimized away -even with -O2 or higher optimization level. - -Subscribers: dberris, mgorny, #sanitizers, llvm-commits - -Tags: #sanitizers, #llvm - -Differential Revision: https://reviews.llvm.org/D67628 - -git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@372038 91177308-0d34-0410-b5e6-96231b3b80d8 ---- - lib/crt/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/crt/CMakeLists.txt b/lib/crt/CMakeLists.txt -index 34c368f7ca..90e94b93db 100644 ---- a/lib/crt/CMakeLists.txt -+++ b/lib/crt/CMakeLists.txt -@@ -70,7 +70,7 @@ function(check_cxx_section_exists section output) - endfunction() - - check_cxx_section_exists(".init_array" COMPILER_RT_HAS_INITFINI_ARRAY -- SOURCE "__attribute__((constructor)) void f() {}\nint main() { return 0; }\n") -+ SOURCE "volatile int x;\n__attribute__((constructor)) void f() {x = 0;}\nint main() { return 0; }\n") - - append_list_if(COMPILER_RT_HAS_STD_C11_FLAG -std=c11 CRT_CFLAGS) - append_list_if(COMPILER_RT_HAS_INITFINI_ARRAY -DCRT_HAS_INITFINI_ARRAY CRT_CFLAGS) diff --git a/packages/dev-libs/compiler-rt/files/compiler-rt-8.0.1-musl-fixes.patch b/packages/dev-libs/compiler-rt/files/compiler-rt-8.0.1-musl-fixes.patch deleted file mode 100644 index a97daedd7..000000000 --- a/packages/dev-libs/compiler-rt/files/compiler-rt-8.0.1-musl-fixes.patch +++ /dev/null @@ -1,193 +0,0 @@ -Source: Ali Polatel <alip@exherbo.org> -Upstream: TODO -Reason: fstab.h is not provided by musl - -diff -urN compiler-rt-8.0.0.src/lib/sanitizer_common/sanitizer_platform_limits_posix.cc compiler-rt-8.0.0.src-musl/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ---- compiler-rt-8.0.0.src/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2019-01-10 19:56:50.000000000 +0000 -+++ compiler-rt-8.0.0.src-musl/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2019-08-04 05:18:20.595703640 +0000 -@@ -54,7 +54,7 @@ - #include <net/route.h> - #endif - --#if !SANITIZER_ANDROID -+#if !SANITIZER_ANDROID && defined(__GLIBC__) - #include <fstab.h> - #include <sys/mount.h> - #include <sys/timeb.h> -@@ -106,7 +106,7 @@ - #include <wordexp.h> - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) - #include <glob.h> - #include <obstack.h> - #include <mqueue.h> -@@ -196,7 +196,7 @@ - unsigned struct_statfs64_sz = sizeof(struct statfs64); - #endif // SANITIZER_MAC && !SANITIZER_IOS - --#if !SANITIZER_ANDROID -+#if !SANITIZER_ANDROID && defined(__GLIBC__) - unsigned struct_fstab_sz = sizeof(struct fstab); - unsigned struct_statfs_sz = sizeof(struct statfs); - unsigned struct_sockaddr_sz = sizeof(struct sockaddr); -@@ -221,7 +221,7 @@ - unsigned struct_itimerspec_sz = sizeof(struct itimerspec); - #endif // SANITIZER_LINUX - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) - // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which - // has been removed from glibc 2.28. - #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ -@@ -239,7 +239,7 @@ - unsigned struct_statvfs64_sz = sizeof(struct statvfs64); - #endif // SANITIZER_LINUX && !SANITIZER_ANDROID - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) - unsigned struct_timex_sz = sizeof(struct timex); - unsigned struct_msqid_ds_sz = sizeof(struct msqid_ds); - unsigned struct_mq_attr_sz = sizeof(struct mq_attr); -@@ -256,7 +256,7 @@ - #endif - - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) - unsigned struct_shminfo_sz = sizeof(struct shminfo); - unsigned struct_shm_info_sz = sizeof(struct shm_info); - int shmctl_ipc_stat = (int)IPC_STAT; -@@ -268,7 +268,7 @@ - #if !SANITIZER_MAC && !SANITIZER_FREEBSD - unsigned struct_utmp_sz = sizeof(struct utmp); - #endif --#if !SANITIZER_ANDROID -+#if !SANITIZER_ANDROID && defined(__GLIBC__) - unsigned struct_utmpx_sz = sizeof(struct utmpx); - #endif - -@@ -292,12 +292,12 @@ - unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) - int glob_nomatch = GLOB_NOMATCH; - int glob_altdirfunc = GLOB_ALTDIRFUNC; - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID && \ -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) && \ - (defined(__i386) || defined(__x86_64) || defined(__mips64) || \ - defined(__powerpc64__) || defined(__aarch64__) || defined(__arm__) || \ - defined(__s390__)) -@@ -436,7 +436,7 @@ - unsigned struct_vt_mode_sz = sizeof(struct vt_mode); - #endif // SANITIZER_LINUX - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) - unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); - unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); - #if EV_VERSION > (0x010000) -@@ -461,7 +461,7 @@ - unsigned struct_unimapinit_sz = sizeof(struct unimapinit); - #endif // SANITIZER_LINUX && !SANITIZER_ANDROID - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) - unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info); - unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats); - #endif // (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID -@@ -519,7 +519,7 @@ - unsigned IOCTL_TIOCSPGRP = TIOCSPGRP; - unsigned IOCTL_TIOCSTI = TIOCSTI; - unsigned IOCTL_TIOCSWINSZ = TIOCSWINSZ; --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) - unsigned IOCTL_SIOCGETSGCNT = SIOCGETSGCNT; - unsigned IOCTL_SIOCGETVIFCNT = SIOCGETVIFCNT; - #endif -@@ -803,7 +803,7 @@ - unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; - #endif // SANITIZER_LINUX - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) - unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; - unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; - unsigned IOCTL_CYGETMON = CYGETMON; -@@ -894,7 +894,7 @@ - unsigned IOCTL_TIOCSSERIAL = TIOCSSERIAL; - #endif // SANITIZER_LINUX && !SANITIZER_ANDROID - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) - unsigned IOCTL_GIO_SCRNMAP = GIO_SCRNMAP; - unsigned IOCTL_KDDISABIO = KDDISABIO; - unsigned IOCTL_KDENABIO = KDENABIO; -@@ -958,7 +958,7 @@ - CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - --#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID -+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && defined(__GLIBC__) - CHECK_TYPE_SIZE(glob_t); - CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); - CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); -@@ -1010,7 +1010,7 @@ - #define __GLIBC_PREREQ(x, y) 0 - #endif - --#if SANITIZER_LINUX && (__ANDROID_API__ >= 21 || __GLIBC_PREREQ (2, 14)) -+#if SANITIZER_LINUX && defined(__GLIBC__) && (__ANDROID_API__ >= 21 || __GLIBC_PREREQ (2, 14)) - CHECK_TYPE_SIZE(mmsghdr); - CHECK_SIZE_AND_OFFSET(mmsghdr, msg_hdr); - CHECK_SIZE_AND_OFFSET(mmsghdr, msg_len); -@@ -1027,7 +1027,7 @@ - #endif - CHECK_SIZE_AND_OFFSET(dirent, d_reclen); - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) - COMPILER_CHECK(sizeof(__sanitizer_dirent64) <= sizeof(dirent64)); - CHECK_SIZE_AND_OFFSET(dirent64, d_ino); - CHECK_SIZE_AND_OFFSET(dirent64, d_off); -@@ -1056,7 +1056,7 @@ - // didn't exist. - CHECK_STRUCT_SIZE_AND_OFFSET(sigaction, sa_flags); - #endif --#if SANITIZER_LINUX && (!SANITIZER_ANDROID || !SANITIZER_MIPS32) -+#if SANITIZER_LINUX && defined(__GLIBC__) && (!SANITIZER_ANDROID || !SANITIZER_MIPS32) - CHECK_STRUCT_SIZE_AND_OFFSET(sigaction, sa_restorer); - #endif - -@@ -1114,7 +1114,7 @@ - - CHECK_TYPE_SIZE(ether_addr); - --#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID -+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && defined(__GLIBC__) - CHECK_TYPE_SIZE(ipc_perm); - # if SANITIZER_FREEBSD - CHECK_SIZE_AND_OFFSET(ipc_perm, key); -@@ -1225,7 +1225,7 @@ - COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) - COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); - CHECK_SIZE_AND_OFFSET(FILE, _flags); - CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); -@@ -1244,7 +1244,7 @@ - CHECK_SIZE_AND_OFFSET(FILE, _fileno); - #endif - --#if SANITIZER_LINUX && !SANITIZER_ANDROID -+#if SANITIZER_LINUX && !SANITIZER_ANDROID && defined(__GLIBC__) - COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); - CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); - CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); |