diff --git a/debian/patches/D54079-hurd-openmp.diff b/debian/patches/D54079-hurd-openmp.diff deleted file mode 100644 index aa1a16df..00000000 --- a/debian/patches/D54079-hurd-openmp.diff +++ /dev/null @@ -1,150 +0,0 @@ -r346310 | achurbanov | 2018-11-07 13:27:38 +0100 (Wed, 07 Nov 2018) | 6 lines - -Add Hurd support. - -Patch by samuel.thibault@ens-lyon.org - -Differential Revision: https://reviews.llvm.org/D54079 - -Index: llvm/openmp/runtime/src/kmp.h -=================================================================== ---- llvm/openmp/runtime/src/kmp.h.orig -+++ llvm/openmp/runtime/src/kmp.h -@@ -1048,6 +1048,10 @@ extern kmp_uint64 __kmp_now_nsec(); - /* TODO: tune for KMP_OS_NETBSD */ - #define KMP_INIT_WAIT 1024U /* initial number of spin-tests */ - #define KMP_NEXT_WAIT 512U /* susequent number of spin-tests */ -+#elif KMP_OS_HURD -+/* TODO: tune for KMP_OS_HURD */ -+#define KMP_INIT_WAIT 1024U /* initial number of spin-tests */ -+#define KMP_NEXT_WAIT 512U /* susequent number of spin-tests */ - #endif - - #if KMP_ARCH_X86 || KMP_ARCH_X86_64 -Index: llvm/openmp/runtime/src/kmp_ftn_entry.h -=================================================================== ---- llvm/openmp/runtime/src/kmp_ftn_entry.h.orig -+++ llvm/openmp/runtime/src/kmp_ftn_entry.h -@@ -369,7 +369,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_ - #else - int gtid; - --#if KMP_OS_DARWIN || KMP_OS_FREEBSD || KMP_OS_NETBSD -+#if KMP_OS_DARWIN || KMP_OS_FREEBSD || KMP_OS_NETBSD || KMP_OS_HURD - gtid = __kmp_entry_gtid(); - #elif KMP_OS_WINDOWS - if (!__kmp_init_parallel || -Index: llvm/openmp/runtime/src/kmp_platform.h -=================================================================== ---- llvm/openmp/runtime/src/kmp_platform.h.orig -+++ llvm/openmp/runtime/src/kmp_platform.h -@@ -22,6 +22,7 @@ - #define KMP_OS_DARWIN 0 - #define KMP_OS_WINDOWS 0 - #define KMP_OS_CNK 0 -+#define KMP_OS_HURD 0 - #define KMP_OS_UNIX 0 /* disjunction of KMP_OS_LINUX, KMP_OS_DARWIN etc. */ - - #ifdef _WIN32 -@@ -59,13 +60,18 @@ - #define KMP_OS_CNK 1 - #endif - -+#if (defined __GNU__) -+#undef KMP_OS_HURD -+#define KMP_OS_HURD 1 -+#endif -+ - #if (1 != \ - KMP_OS_LINUX + KMP_OS_FREEBSD + KMP_OS_NETBSD + KMP_OS_DARWIN + \ -- KMP_OS_WINDOWS) -+ KMP_OS_WINDOWS + KMP_OS_HURD) - #error Unknown OS - #endif - --#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_NETBSD || KMP_OS_DARWIN -+#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_NETBSD || KMP_OS_DARWIN || KMP_OS_HURD - #undef KMP_OS_UNIX - #define KMP_OS_UNIX 1 - #endif -Index: llvm/openmp/runtime/src/kmp_runtime.cpp -=================================================================== ---- llvm/openmp/runtime/src/kmp_runtime.cpp.orig -+++ llvm/openmp/runtime/src/kmp_runtime.cpp -@@ -7643,7 +7643,7 @@ __kmp_determine_reduction_method( - #if KMP_ARCH_X86_64 || KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 || KMP_ARCH_MIPS64 - - #if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_NETBSD || KMP_OS_WINDOWS || \ -- KMP_OS_DARWIN -+ KMP_OS_DARWIN || KMP_OS_HURD - - int teamsize_cutoff = 4; - -@@ -7670,7 +7670,7 @@ __kmp_determine_reduction_method( - - #elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH || KMP_ARCH_MIPS - --#if KMP_OS_LINUX || KMP_OS_WINDOWS -+#if KMP_OS_LINUX || KMP_OS_WINDOWS || KMP_OS_HURD - - // basic tuning - -Index: llvm/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.c -=================================================================== ---- llvm/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.c.orig -+++ llvm/openmp/runtime/src/thirdparty/ittnotify/ittnotify_static.c -@@ -70,6 +70,10 @@ static const char* ittnotify_lib_name = - #define ANDROID_ITTNOTIFY_DEFAULT_PATH "/data/data/com.intel.vtune/intel/libittnotify.so" - #endif - -+#ifndef PATH_MAX -+#define PATH_MAX 4096 -+#endif -+ - - #ifndef LIB_VAR_NAME - #if ITT_ARCH==ITT_ARCH_IA32 || ITT_ARCH==ITT_ARCH_ARM || ITT_ARCH==ITT_ARCH_MIPS -Index: llvm/openmp/runtime/src/z_Linux_util.cpp -=================================================================== ---- llvm/openmp/runtime/src/z_Linux_util.cpp.orig -+++ llvm/openmp/runtime/src/z_Linux_util.cpp -@@ -444,8 +444,7 @@ void __kmp_terminate_thread(int gtid) { - determined exactly, FALSE if incremental refinement is necessary. */ - static kmp_int32 __kmp_set_stack_info(int gtid, kmp_info_t *th) { - int stack_data; --#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_NETBSD -- /* Linux* OS only -- no pthread_getattr_np support on OS X* */ -+#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_NETBSD || KMP_OS_HURD - pthread_attr_t attr; - int status; - size_t size = 0; -@@ -497,7 +496,7 @@ static void *__kmp_launch_worker(void *t - sigset_t new_set, old_set; - #endif /* KMP_BLOCK_SIGNALS */ - void *exit_val; --#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_NETBSD -+#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_NETBSD || KMP_OS_HURD - void *volatile padding = 0; - #endif - int gtid; -@@ -1765,7 +1764,7 @@ static int __kmp_get_xproc(void) { - - int r = 0; - --#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_NETBSD -+#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_NETBSD || KMP_OS_HURD - - r = sysconf(_SC_NPROCESSORS_ONLN); - -@@ -1953,9 +1952,9 @@ int __kmp_is_address_mapped(void *addr) - int found = 0; - int rc; - --#if KMP_OS_LINUX || KMP_OS_FREEBSD -+#if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_HURD - -- /* On Linux* OS, read the /proc//maps pseudo-file to get all the address -+ /* On GNUish OSes, read the /proc//maps pseudo-file to get all the address - ranges mapped into the address space. */ - - char *name = __kmp_str_format("/proc/%d/maps", getpid()); diff --git a/debian/patches/D54338-hurd-libcxx-threads-build.diff b/debian/patches/D54338-hurd-libcxx-threads-build.diff deleted file mode 100644 index 55e5472e..00000000 --- a/debian/patches/D54338-hurd-libcxx-threads-build.diff +++ /dev/null @@ -1,24 +0,0 @@ -r346763 | ldionne | 2018-11-13 18:00:04 +0100 (Tue, 13 Nov 2018) | 5 lines - -[libcxx] GNU/Hurd uses BSD-based interfaces, but does not (and won't) provide - -Reviewed as https://reviews.llvm.org/D54338. - -Thanks to sthibaul for the patch. - -Index: llvm-toolchain-7-7/libcxx/src/thread.cpp -=================================================================== ---- llvm-toolchain-7-7.orig/libcxx/src/thread.cpp -+++ llvm-toolchain-7-7/libcxx/src/thread.cpp -@@ -19,9 +19,9 @@ - - #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) - # include --# if defined(BSD) -+# if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__) || defined(__APPLE__) - # include --# endif // defined(BSD) -+# endif - #endif // defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) - - #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) || defined(__CloudABI__) || defined(__Fuchsia__) diff --git a/debian/patches/D54339-hurd-libcxx-threads-detection.diff b/debian/patches/D54339-hurd-libcxx-threads-detection.diff deleted file mode 100644 index dac013bd..00000000 --- a/debian/patches/D54339-hurd-libcxx-threads-detection.diff +++ /dev/null @@ -1,18 +0,0 @@ -Fix threads detection on GNU/Hurd - -GNU/Hurd provides standard Posix threads - -https://reviews.llvm.org/D54339 - -Index: llvm-toolchain-7-7/libcxx/include/__config -=================================================================== ---- llvm-toolchain-7-7.orig/libcxx/include/__config -+++ llvm-toolchain-7-7/libcxx/include/__config -@@ -1110,6 +1110,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanit - defined(__Fuchsia__) || \ - defined(__NetBSD__) || \ - defined(__linux__) || \ -+ defined(__GNU__) || \ - defined(__APPLE__) || \ - defined(__CloudABI__) || \ - defined(__sun__) || \ diff --git a/debian/patches/D54378-hurd-triple.diff b/debian/patches/D54378-hurd-triple.diff deleted file mode 100644 index 2f57a2a1..00000000 --- a/debian/patches/D54378-hurd-triple.diff +++ /dev/null @@ -1,74 +0,0 @@ -Add Hurd triplet to LLVMSupport - -This introduces GNU Hurd as a new target OS. - -https://reviews.llvm.org/D54378 - -Index: llvm-toolchain-7-7.0.1~+rc2/include/llvm/ADT/Triple.h -=================================================================== ---- llvm-toolchain-7-7.0.1~+rc2.orig/include/llvm/ADT/Triple.h -+++ llvm-toolchain-7-7.0.1~+rc2/include/llvm/ADT/Triple.h -@@ -182,7 +182,8 @@ public: - Mesa3D, - Contiki, - AMDPAL, // AMD PAL Runtime -- LastOSType = AMDPAL -+ Hurd, // GNU/Hurd -+ LastOSType = Hurd - }; - enum EnvironmentType { - UnknownEnvironment, -@@ -578,9 +579,15 @@ public: - return getOS() == Triple::KFreeBSD; - } - -+ /// Tests whether the OS is Hurd. -+ bool isOSHurd() const { -+ return getOS() == Triple::Hurd; -+ } -+ - /// Tests whether the OS uses glibc. - bool isOSGlibc() const { -- return (getOS() == Triple::Linux || getOS() == Triple::KFreeBSD) && -+ return (getOS() == Triple::Linux || getOS() == Triple::KFreeBSD || -+ getOS() == Triple::Hurd) && - !isAndroid(); - } - -Index: llvm-toolchain-7-7.0.1~+rc2/lib/Support/Triple.cpp -=================================================================== ---- llvm-toolchain-7-7.0.1~+rc2.orig/lib/Support/Triple.cpp -+++ llvm-toolchain-7-7.0.1~+rc2/lib/Support/Triple.cpp -@@ -209,6 +209,7 @@ StringRef Triple::getOSTypeName(OSType K - case Mesa3D: return "mesa3d"; - case Contiki: return "contiki"; - case AMDPAL: return "amdpal"; -+ case Hurd: return "hurd"; - } - - llvm_unreachable("Invalid OSType"); -@@ -502,6 +503,7 @@ static Triple::OSType parseOS(StringRef - .StartsWith("mesa3d", Triple::Mesa3D) - .StartsWith("contiki", Triple::Contiki) - .StartsWith("amdpal", Triple::AMDPAL) -+ .StartsWith("hurd", Triple::Hurd) - .Default(Triple::UnknownOS); - } - -Index: llvm/unittests/ADT/TripleTest.cpp -=================================================================== ---- llvm/unittests/ADT/TripleTest.cpp (révision 346226) -+++ llvm/unittests/ADT/TripleTest.cpp (copie de travail) -@@ -93,6 +93,12 @@ - EXPECT_EQ(Triple::Contiki, T.getOS()); - EXPECT_EQ(Triple::UnknownEnvironment, T.getEnvironment()); - -+ T = Triple("i386-pc-hurd-gnu"); -+ EXPECT_EQ(Triple::x86, T.getArch()); -+ EXPECT_EQ(Triple::PC, T.getVendor()); -+ EXPECT_EQ(Triple::Hurd, T.getOS()); -+ EXPECT_EQ(Triple::GNU, T.getEnvironment()); -+ - T = Triple("x86_64-pc-linux-gnu"); - EXPECT_EQ(Triple::x86_64, T.getArch()); - EXPECT_EQ(Triple::PC, T.getVendor()); diff --git a/debian/patches/D54379-hurd-triple-clang.diff b/debian/patches/D54379-hurd-triple-clang.diff index c55fc548..4d82c509 100644 --- a/debian/patches/D54379-hurd-triple-clang.diff +++ b/debian/patches/D54379-hurd-triple-clang.diff @@ -2,10 +2,10 @@ Add Hurd toolchain support to Clang https://reviews.llvm.org/D54379 -Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Basic/Targets/OSTargets.h +Index: llvm-toolchain-snapshot_8~svn347511/clang/lib/Basic/Targets/OSTargets.h =================================================================== ---- llvm-toolchain-7-7.0.1~+rc2.orig/clang/lib/Basic/Targets/OSTargets.h -+++ llvm-toolchain-7-7.0.1~+rc2/clang/lib/Basic/Targets/OSTargets.h +--- llvm-toolchain-snapshot_8~svn347511.orig/clang/lib/Basic/Targets/OSTargets.h ++++ llvm-toolchain-snapshot_8~svn347511/clang/lib/Basic/Targets/OSTargets.h @@ -270,6 +270,29 @@ public: } }; @@ -36,10 +36,10 @@ Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Basic/Targets/OSTargets.h // Minix Target template class LLVM_LIBRARY_VISIBILITY MinixTargetInfo : public OSTargetInfo { -Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Basic/Targets.cpp +Index: llvm-toolchain-snapshot_8~svn347511/clang/lib/Basic/Targets.cpp =================================================================== ---- llvm-toolchain-7-7.0.1~+rc2.orig/clang/lib/Basic/Targets.cpp -+++ llvm-toolchain-7-7.0.1~+rc2/clang/lib/Basic/Targets.cpp +--- llvm-toolchain-snapshot_8~svn347511.orig/clang/lib/Basic/Targets.cpp ++++ llvm-toolchain-snapshot_8~svn347511/clang/lib/Basic/Targets.cpp @@ -495,6 +495,8 @@ TargetInfo *AllocateTarget(const llvm::T return new NaClTargetInfo(Triple, Opts); case llvm::Triple::ELFIAMCU: @@ -49,10 +49,10 @@ Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Basic/Targets.cpp default: return new X86_32TargetInfo(Triple, Opts); } -Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/CMakeLists.txt +Index: llvm-toolchain-snapshot_8~svn347511/clang/lib/Driver/CMakeLists.txt =================================================================== ---- llvm-toolchain-7-7.0.1~+rc2.orig/clang/lib/Driver/CMakeLists.txt -+++ llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/CMakeLists.txt +--- llvm-toolchain-snapshot_8~svn347511.orig/clang/lib/Driver/CMakeLists.txt ++++ llvm-toolchain-snapshot_8~svn347511/clang/lib/Driver/CMakeLists.txt @@ -47,6 +47,7 @@ add_clang_library(clangDriver ToolChains/Haiku.cpp ToolChains/HIP.cpp @@ -61,10 +61,10 @@ Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/CMakeLists.txt ToolChains/Linux.cpp ToolChains/MipsLinux.cpp ToolChains/MinGW.cpp -Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/Driver.cpp +Index: llvm-toolchain-snapshot_8~svn347511/clang/lib/Driver/Driver.cpp =================================================================== ---- llvm-toolchain-7-7.0.1~+rc2.orig/clang/lib/Driver/Driver.cpp -+++ llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/Driver.cpp +--- llvm-toolchain-snapshot_8~svn347511.orig/clang/lib/Driver/Driver.cpp ++++ llvm-toolchain-snapshot_8~svn347511/clang/lib/Driver/Driver.cpp @@ -26,6 +26,7 @@ #include "ToolChains/HIP.h" #include "ToolChains/Haiku.h" @@ -73,7 +73,7 @@ Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/Driver.cpp #include "ToolChains/Lanai.h" #include "ToolChains/Linux.h" #include "ToolChains/MSVC.h" -@@ -399,6 +400,13 @@ static llvm::Triple computeTargetTriple( +@@ -402,6 +403,13 @@ static llvm::Triple computeTargetTriple( llvm::Triple Target(llvm::Triple::normalize(TargetTriple)); @@ -87,7 +87,7 @@ Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/Driver.cpp // Handle Apple-specific options available here. if (Target.isOSBinFormatMachO()) { // If an explicit Darwin arch name is given, that trumps all. -@@ -4374,6 +4382,9 @@ const ToolChain &Driver::getToolChain(co +@@ -4574,6 +4582,9 @@ const ToolChain &Driver::getToolChain(co case llvm::Triple::Contiki: TC = llvm::make_unique(*this, Target, Args); break; @@ -97,11 +97,11 @@ Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/Driver.cpp default: // Of these targets, Hexagon is the only one that might have // an OS of Linux, in which case it got handled above already. -Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/ToolChains/Clang.cpp +Index: llvm-toolchain-snapshot_8~svn347511/clang/lib/Driver/ToolChains/Clang.cpp =================================================================== ---- llvm-toolchain-7-7.0.1~+rc2.orig/clang/lib/Driver/ToolChains/Clang.cpp -+++ llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/ToolChains/Clang.cpp -@@ -528,7 +528,7 @@ static bool useFramePointerForTargetByDe +--- llvm-toolchain-snapshot_8~svn347511.orig/clang/lib/Driver/ToolChains/Clang.cpp ++++ llvm-toolchain-snapshot_8~svn347511/clang/lib/Driver/ToolChains/Clang.cpp +@@ -530,7 +530,7 @@ static bool useFramePointerForTargetByDe return !areOptimizationsEnabled(Args); } @@ -110,22 +110,23 @@ Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/ToolChains/Clang.cpp switch (Triple.getArch()) { // Don't use a frame pointer on linux if optimizing for certain targets. case llvm::Triple::mips64: -Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/ToolChains/Gnu.cpp +Index: llvm-toolchain-snapshot_8~svn347511/clang/lib/Driver/ToolChains/Gnu.cpp =================================================================== ---- llvm-toolchain-7-7.0.1~+rc2.orig/clang/lib/Driver/ToolChains/Gnu.cpp -+++ llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/ToolChains/Gnu.cpp -@@ -1846,7 +1846,9 @@ void Generic_GCC::GCCInstallationDetecto - "i686-linux-gnu", "i686-pc-linux-gnu", "i486-linux-gnu", +--- llvm-toolchain-snapshot_8~svn347511.orig/clang/lib/Driver/ToolChains/Gnu.cpp ++++ llvm-toolchain-snapshot_8~svn347511/clang/lib/Driver/ToolChains/Gnu.cpp +@@ -1882,7 +1882,10 @@ void Generic_GCC::GCCInstallationDetecto "i386-linux-gnu", "i386-redhat-linux6E", "i686-redhat-linux", "i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux", -- "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu"}; -+ "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu", + "i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu", +- "i686-linux-android"}; ++ "i686-linux-android", + "i386-gnu", "i486-gnu", "i586-gnu", + "i686-gnu"}; ++ static const char *const MIPSLibDirs[] = {"/lib"}; - static const char *const MIPSTriples[] = {"mips-linux-gnu", "mips-mti-linux", -@@ -2210,6 +2212,9 @@ void Generic_GCC::GCCInstallationDetecto + static const char *const MIPSTriples[] = { +@@ -2262,6 +2265,9 @@ void Generic_GCC::GCCInstallationDetecto // triple. {"i386-linux-gnu/gcc/" + CandidateTriple.str(), "../../..", (TargetArch == llvm::Triple::x86 && @@ -135,10 +136,10 @@ Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/ToolChains/Gnu.cpp TargetTriple.getOS() != llvm::Triple::Solaris)}}; for (auto &Suffix : Suffixes) { -Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/ToolChains/Hurd.cpp +Index: llvm-toolchain-snapshot_8~svn347511/clang/lib/Driver/ToolChains/Hurd.cpp =================================================================== --- /dev/null -+++ llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/ToolChains/Hurd.cpp ++++ llvm-toolchain-snapshot_8~svn347511/clang/lib/Driver/ToolChains/Hurd.cpp @@ -0,0 +1,191 @@ +//===--- Hurd.cpp - Hurd ToolChain Implementations --------*- C++ -*-===// +// @@ -331,10 +332,10 @@ Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/ToolChains/Hurd.cpp + + addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include"); +} -Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/ToolChains/Hurd.h +Index: llvm-toolchain-snapshot_8~svn347511/clang/lib/Driver/ToolChains/Hurd.h =================================================================== --- /dev/null -+++ llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/ToolChains/Hurd.h ++++ llvm-toolchain-snapshot_8~svn347511/clang/lib/Driver/ToolChains/Hurd.h @@ -0,0 +1,46 @@ +//===--- Hurd.h - Hurd ToolChain Implementations ----------*- C++ -*-===// +// @@ -382,10 +383,10 @@ Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Driver/ToolChains/Hurd.h +} // end namespace clang + +#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_Hurd_H -Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Frontend/InitHeaderSearch.cpp +Index: llvm-toolchain-snapshot_8~svn347511/clang/lib/Frontend/InitHeaderSearch.cpp =================================================================== ---- llvm-toolchain-7-7.0.1~+rc2.orig/clang/lib/Frontend/InitHeaderSearch.cpp -+++ llvm-toolchain-7-7.0.1~+rc2/clang/lib/Frontend/InitHeaderSearch.cpp +--- llvm-toolchain-snapshot_8~svn347511.orig/clang/lib/Frontend/InitHeaderSearch.cpp ++++ llvm-toolchain-snapshot_8~svn347511/clang/lib/Frontend/InitHeaderSearch.cpp @@ -260,6 +260,7 @@ void InitHeaderSearch::AddDefaultCInclud switch (os) { @@ -394,20 +395,19 @@ Index: llvm-toolchain-7-7.0.1~+rc2/clang/lib/Frontend/InitHeaderSearch.cpp case llvm::Triple::Solaris: llvm_unreachable("Include management is handled in the driver."); -@@ -412,6 +413,7 @@ - +@@ -412,6 +413,7 @@ void InitHeaderSearch::AddDefaultCPlusPl + switch (os) { case llvm::Triple::Linux: + case llvm::Triple::Hurd: case llvm::Triple::Solaris: llvm_unreachable("Include management is handled in the driver."); break; -@@ -460,6 +462,7 @@ +@@ -460,6 +462,7 @@ void InitHeaderSearch::AddDefaultInclude break; // Everything else continues to use this routine's logic. - + case llvm::Triple::Linux: + case llvm::Triple::Hurd: case llvm::Triple::Solaris: return; - diff --git a/debian/patches/D54677-hurd-path_max.diff b/debian/patches/D54677-hurd-path_max.diff index f0cafd11..59af243a 100644 --- a/debian/patches/D54677-hurd-path_max.diff +++ b/debian/patches/D54677-hurd-path_max.diff @@ -4,11 +4,11 @@ The GNU/Hurd system does not define an arbitrary PATH_MAX limitation, the POSIX https://reviews.llvm.org/D54677 -Index: llvm-toolchain-7_7.0.1~svn347285/libcxx/src/filesystem/operations.cpp +Index: llvm-toolchain-snapshot_8~svn347511/libcxx/src/filesystem/operations.cpp =================================================================== ---- llvm-toolchain-7_7.0.1~svn347285.orig/libcxx/src/filesystem/operations.cpp -+++ llvm-toolchain-7_7.0.1~svn347285/libcxx/src/filesystem/operations.cpp -@@ -531,11 +531,20 @@ path __canonical(path const& orig_p, err +--- llvm-toolchain-snapshot_8~svn347511.orig/libcxx/src/filesystem/operations.cpp ++++ llvm-toolchain-snapshot_8~svn347511/libcxx/src/filesystem/operations.cpp +@@ -530,11 +530,20 @@ path __canonical(path const& orig_p, err ErrorHandler err("canonical", ec, &orig_p, &cwd); path p = __do_absolute(orig_p, &cwd, ec); @@ -29,7 +29,7 @@ Index: llvm-toolchain-7_7.0.1~svn347285/libcxx/src/filesystem/operations.cpp } void __copy(const path& from, const path& to, copy_options options, -@@ -1077,16 +1086,27 @@ void __permissions(const path& p, perms +@@ -1076,16 +1085,27 @@ void __permissions(const path& p, perms path __read_symlink(const path& p, error_code* ec) { ErrorHandler err("read_symlink", ec, &p); diff --git a/debian/patches/reproducible-pch.diff b/debian/patches/reproducible-pch.diff index 2a1be1d6..645b7dff 100644 --- a/debian/patches/reproducible-pch.diff +++ b/debian/patches/reproducible-pch.diff @@ -4,10 +4,10 @@ Author: Rebecca N. Palmer Bug-Debian: https://bugs.debian.org/877359 Forwarded: no -Index: llvm-toolchain-snapshot_8~svn346586/clang/lib/Serialization/ASTWriter.cpp +Index: llvm-toolchain-snapshot_8~svn347511/clang/lib/Serialization/ASTWriter.cpp =================================================================== ---- llvm-toolchain-snapshot_8~svn346586.orig/clang/lib/Serialization/ASTWriter.cpp -+++ llvm-toolchain-snapshot_8~svn346586/clang/lib/Serialization/ASTWriter.cpp +--- llvm-toolchain-snapshot_8~svn347511.orig/clang/lib/Serialization/ASTWriter.cpp ++++ llvm-toolchain-snapshot_8~svn347511/clang/lib/Serialization/ASTWriter.cpp @@ -4280,9 +4280,13 @@ void ASTWriter::WriteOpenCLExtensionType return; diff --git a/debian/patches/series b/debian/patches/series index a086f651..d8d536c3 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -80,10 +80,6 @@ clang-arm-default-vfp3-on-armv7a.patch reproducible-pch.diff # Hurd port -D54079-hurd-openmp.diff -D54338-hurd-libcxx-threads-build.diff -D54339-hurd-libcxx-threads-detection.diff -D54378-hurd-triple.diff D54379-hurd-triple-clang.diff D54677-hurd-path_max.diff hurd-cxx-paths.diff