lib_Support

===================================================================

Gbp-Pq: Topic kfreebsd
Gbp-Pq: Name lib_Support.diff

diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp
index bcf7c52a3e5b2ec95283b9a85cfeb5dd9c411864..9eeaddc78e33d629a865e81c728f9db9f08f9680 100644 (file)
--- a/lib/Support/Triple.cpp
+++ b/lib/Support/Triple.cpp
@@ -185,7 +185,7 @@ StringRef Triple::getOSTypeName(OSType Kind) {
   case FreeBSD: return "freebsd";
   case Fuchsia: return "fuchsia";
   case IOS: return "ios";
-  case KFreeBSD: return "kfreebsd";
+  case kFreeBSD: return "kfreebsd";
   case Linux: return "linux";
   case Lv2: return "lv2";
   case MacOSX: return "macosx";
@@ -478,7 +478,7 @@ static Triple::OSType parseOS(StringRef OSName) {
     .StartsWith("freebsd", Triple::FreeBSD)
     .StartsWith("fuchsia", Triple::Fuchsia)
     .StartsWith("ios", Triple::IOS)
-    .StartsWith("kfreebsd", Triple::KFreeBSD)
+    .StartsWith("kfreebsd", Triple::kFreeBSD)
     .StartsWith("linux", Triple::Linux)
     .StartsWith("lv2", Triple::Lv2)
     .StartsWith("macos", Triple::MacOSX)

diff --git a/lib/Support/Unix/Path.inc b/lib/Support/Unix/Path.inc
index 5d7179e29de9d2e4b78a99e936664508be432c92..98169b1d8c9ada00fc94e93b37163ed2fdfadd3a 100644 (file)
--- a/lib/Support/Unix/Path.inc
+++ b/lib/Support/Unix/Path.inc
@@ -54,13 +54,13 @@
 
 #include <sys/types.h>
 #if !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) &&   \
-    !defined(__linux__)
+  !defined(__linux__) && !defined(__FreeBSD_kernel__)
 #include <sys/statvfs.h>
 #define STATVFS statvfs
 #define FSTATVFS fstatvfs
 #define STATVFS_F_FRSIZE(vfs) vfs.f_frsize
 #else
-#if defined(__OpenBSD__) || defined(__FreeBSD__)
+#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
 #include <sys/mount.h>
 #include <sys/param.h>
 #elif defined(__linux__)