Merge pull request #50 from Andy-Python-Programmer/rust-nightly

Bump host-rust, rustlibc, host-cargo, llvm ports

Author: Andy-Python-Programmer

aero.py

@@ -49,6 +49,8 @@
 BUILD_DIR = 'build'
 BUNDLED_DIR = 'bundled'
 SYSROOT_DIR = 'sysroot'
+EXTRA_FILES = 'extra-files'
+SYSROOT_CARGO_HOME = os.path.join(SYSROOT_DIR, 'cargo-home')
 BASE_FILES_DIR = 'base-files'
 OVMF_FILES = ['OVMF-pure-efi.fd']
 
@@ -240,6 +242,26 @@ def build_userland_sysroot(args):
     if not os.path.exists(SYSROOT_DIR):
         os.mkdir(SYSROOT_DIR)
 
+    # FIXME(xbstrap): xbstrap does not copy over the extra-files/rust/config.toml
+    # file into the cargo home directory.
+    if not os.path.exists(SYSROOT_CARGO_HOME):
+        os.mkdir(SYSROOT_CARGO_HOME)
+
+    cargo_sys_cfg = os.path.join(SYSROOT_CARGO_HOME, 'config.toml')
+    if not os.path.exists(cargo_sys_cfg):
+        cargo_cfg_fd = open(os.path.join(
+            EXTRA_FILES, 'rust', 'config.toml'), 'r')
+        cargo_cfg = cargo_cfg_fd.read()
+        cargo_cfg_fd.close()
+
+        cargo_cfg = cargo_cfg.replace("@SOURCE_ROOT@", os.getcwd())
+        cargo_cfg = cargo_cfg.replace(
+            "@BUILD_ROOT@", os.path.join(os.getcwd(), SYSROOT_DIR))
+
+        cargo_cfg_fd = open(cargo_sys_cfg, "w+")
+        cargo_cfg_fd.write(cargo_cfg)
+        cargo_cfg_fd.close()
+
     blink = os.path.join(SYSROOT_DIR, 'bootstrap.link')
 
     if not os.path.islink(blink):
@@ -479,7 +501,7 @@ def get_sysctl(name: str) -> str:
     if status != 0:
         print("`sysctl` failed: ", end="")
         print(stderr.decode())
-    
+
     return stdout.strip().decode()
 
 
@@ -493,11 +515,11 @@ def is_kvm_supported() -> bool:
     if platform == "darwin":
         # Check for VMX support
         cpu_features = get_sysctl("machdep.cpu.features")
-        vmx_support  = "VMX" in cpu_features.split(' ')
+        vmx_support = "VMX" in cpu_features.split(' ')
 
         # Check for HVF support
         hv_support = get_sysctl("kern.hv_support") == "1"
-        
+
         return hv_support and vmx_support
 
     if platform == "linux":

bootstrap.yml

@@ -54,20 +54,20 @@ sources:
   - name: rust
     subdir: 'bundled'
     git: 'https://github.com/rust-lang/rust.git'
-    tag: '1.51.0'
-    version: '1.51.0'
+    branch: 'master'
+    commit: '22e491ac7ed454d34669151a8b6464cb643c9b41'
 
   - name: rust-libc
     subdir: 'bundled'
-    git: 'https://github.com/rust-lang/libc.git'
-    tag: '0.2.93'
-    version: '0.2.93'
+    git: 'https://github.com/Andy-Python-Programmer/libc.git'
+    branch: 'master'
+    commit: '9d6a6ee0c3973be6ea9ff48dac1e8fe3b177cf45'
 
   - name: llvm
     subdir: 'bundled'
-    git: 'https://github.com/llvm/llvm-project'
-    tag: 'llvmorg-10.0.0'
-    version: '10.0.0'
+    git: 'https://github.com/llvm/llvm-project.git'
+    tag: 'llvmorg-13.0.0'
+    version: '13.0.0'
 
   # ---------------------------------------------------------------------------
   # Rust patched crates start
@@ -186,8 +186,8 @@ tools:
     source:
       subdir: 'bundled'
       git: 'https://github.com/rust-lang/cargo.git'
-      tag: '0.53.0'
-      version: '0.53.0'
+      branch: 'master'
+      commit: '25fcb135d02ea897ce894b67ae021f48107d522b'
     tools_required:
       - tool: host-rust
         recursive: true

extra-files/rust/config.toml

@@ -4,6 +4,7 @@ patch-in-config = true
 [build]
 rustc = "@BUILD_ROOT@/tools/host-rust/bin/rustc"
 target = "x86_64-unknown-aero-system"
+rustflags = ["-C", "link-args=-no-pie"]
 
 [target.x86_64-unknown-aero-system]
 linker = "@BUILD_ROOT@/tools/host-gcc/bin/x86_64-aero-gcc"

patches/llvm/llvm.patch

@@ -62,7 +62,7 @@ index 70fac030b..93fc21c3d 100644
 @@ -342,6 +342,34 @@ public:
        : OSTargetInfo<Target>(Triple, Opts) {}
  };
- 
+
 +// Aero Target
 +template <typename Target>
 +class LLVM_LIBRARY_VISIBILITY AeroTargetInfo : public OSTargetInfo<Target> {
@@ -628,10 +628,10 @@ index 000000000..e9016f4a8
 +
 +#endif // LLVM_CLANG_LIB_DRIVER_TOOLCHAINS_MANAGARM_H
 diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
-index da197e476..7ea2887b7 100644
+index da39f29e4..b6f6bb439 100644
 --- a/clang/lib/Driver/ToolChains/Gnu.cpp
 +++ b/clang/lib/Driver/ToolChains/Gnu.cpp
-@@ -261,6 +261,8 @@ static const char *getLDMOption(const llvm::Triple &T, const ArgList &Args) {
+@@ -246,6 +246,8 @@ static const char *getLDMOption(const llvm::Triple &T, const ArgList &Args) {
        return "elf_iamcu";
      return "elf_i386";
    case llvm::Triple::aarch64:
@@ -640,7 +640,7 @@ index da197e476..7ea2887b7 100644
      return "aarch64linux";
    case llvm::Triple::aarch64_be:
      return "aarch64linuxb";
-@@ -1997,7 +1999,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+@@ -2077,7 +2079,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
    static const char *const AArch64LibDirs[] = {"/lib64", "/lib"};
    static const char *const AArch64Triples[] = {
        "aarch64-none-linux-gnu", "aarch64-linux-gnu", "aarch64-redhat-linux",
@@ -650,26 +650,26 @@ index da197e476..7ea2887b7 100644
    static const char *const AArch64beLibDirs[] = {"/lib"};
    static const char *const AArch64beTriples[] = {"aarch64_be-none-linux-gnu",
                                                   "aarch64_be-linux-gnu"};
-@@ -2025,7 +2028,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+@@ -2105,7 +2108,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
        "x86_64-redhat-linux",    "x86_64-suse-linux",
        "x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
        "x86_64-slackware-linux", "x86_64-unknown-linux",
 -      "x86_64-amazon-linux",    "x86_64-linux-android"};
 +      "x86_64-amazon-linux",    "x86_64-linux-android",
 +      "x86_64-aero", "x86_64-aero-system", "x86_64-aero-kernel"};
-   static const char *const X32LibDirs[] = {"/libx32"};
-   static const char *const X86LibDirs[] = {"/lib32", "/lib"};
-   static const char *const X86Triples[] = {
-@@ -2090,7 +2094,10 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
-   static const char *const RISCV64Triples[] = {"riscv64-unknown-linux-gnu",
+   static const char *const X32Triples[] = {"x86_64-linux-gnux32",
+                                            "x86_64-pc-linux-gnux32"};
+   static const char *const X32LibDirs[] = {"/libx32", "/lib"};
+@@ -2183,7 +2187,10 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
                                                 "riscv64-linux-gnu",
                                                 "riscv64-unknown-elf",
+                                                "riscv64-redhat-linux",
 -                                               "riscv64-suse-linux"};
 +                                               "riscv64-suse-linux",
 +                                               "riscv64-aero",
 +                                               "riscv64-aero-kernel",
 +                                               "riscv64-aero-system"};
- 
+
    static const char *const SPARCv8LibDirs[] = {"/lib32", "/lib"};
    static const char *const SPARCv8Triples[] = {"sparc-linux-gnu",
 diff --git a/llvm/cmake/modules/CrossCompile.cmake b/llvm/cmake/modules/CrossCompile.cmake
@@ -711,68 +711,72 @@ index 76a754d67..5899b5449 100644
    enum ObjectFormatType {
      UnknownObjectFormat,
 diff --git a/llvm/include/llvm/Support/SwapByteOrder.h b/llvm/include/llvm/Support/SwapByteOrder.h
-index 6cec87006..ceefb0673 100644
+index e8612ba66..7c4e941bd 100644
 --- a/llvm/include/llvm/Support/SwapByteOrder.h
 +++ b/llvm/include/llvm/Support/SwapByteOrder.h
 @@ -22,7 +22,7 @@
- #include <stdlib.h>
  #endif
- 
--#if defined(__linux__) || defined(__GNU__) || defined(__HAIKU__)
-+#if defined(__linux__) || defined(__GNU__) || defined(__HAIKU__) || defined(__aero__)
+
+ #if defined(__linux__) || defined(__GNU__) || defined(__HAIKU__) ||            \
+-    defined(__Fuchsia__) || defined(__EMSCRIPTEN__)
++    defined(__Fuchsia__) || defined(__EMSCRIPTEN__) || defined(__aero__)
  #include <endian.h>
  #elif defined(_AIX)
  #include <sys/machine.h>
 diff --git a/llvm/lib/Support/Triple.cpp b/llvm/lib/Support/Triple.cpp
-index 2c480c109..872511977 100644
+index 883115463..e27e27ecc 100644
 --- a/llvm/lib/Support/Triple.cpp
 +++ b/llvm/lib/Support/Triple.cpp
-@@ -201,6 +201,7 @@ StringRef Triple::getOSTypeName(OSType Kind) {
-   case Linux: return "linux";
-   case Lv2: return "lv2";
-   case MacOSX: return "macosx";
+@@ -189,6 +189,7 @@ StringRef Triple::getOSTypeName(OSType Kind) {
+   case UnknownOS: return "unknown";
+
+   case AIX: return "aix";
 +  case Aero: return "aero";
-   case Mesa3D: return "mesa3d";
-   case Minix: return "minix";
-   case NVCL: return "nvcl";
-@@ -235,12 +236,14 @@ StringRef Triple::getEnvironmentTypeName(EnvironmentType Kind) {
-   case GNUEABIHF: return "gnueabihf";
+   case AMDHSA: return "amdhsa";
+   case AMDPAL: return "amdpal";
+   case Ananas: return "ananas";
+@@ -245,6 +246,7 @@ StringRef Triple::getEnvironmentTypeName(EnvironmentType Kind) {
    case GNUX32: return "gnux32";
+   case GNUILP32: return "gnu_ilp32";
    case Itanium: return "itanium";
 +  case Kernel: return "kernel";
    case MSVC: return "msvc";
    case MacABI: return "macabi";
    case Musl: return "musl";
-   case MuslEABI: return "musleabi";
+@@ -252,6 +254,7 @@ StringRef Triple::getEnvironmentTypeName(EnvironmentType Kind) {
    case MuslEABIHF: return "musleabihf";
+   case MuslX32: return "muslx32";
    case Simulator: return "simulator";
 +  case System: return "system";
    }
- 
+
    llvm_unreachable("Invalid EnvironmentType!");
-@@ -495,6 +498,7 @@ static Triple::OSType parseOS(StringRef OSName) {
-     .StartsWith("linux", Triple::Linux)
-     .StartsWith("lv2", Triple::Lv2)
-     .StartsWith("macos", Triple::MacOSX)
+@@ -502,6 +505,7 @@ static Triple::VendorType parseVendor(StringRef VendorName) {
+
+ static Triple::OSType parseOS(StringRef OSName) {
+   return StringSwitch<Triple::OSType>(OSName)
 +    .StartsWith("aero", Triple::Aero)
-     .StartsWith("netbsd", Triple::NetBSD)
-     .StartsWith("openbsd", Triple::OpenBSD)
-     .StartsWith("solaris", Triple::Solaris)
-@@ -544,6 +548,8 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) {
-     .StartsWith("coreclr", Triple::CoreCLR)
-     .StartsWith("simulator", Triple::Simulator)
-     .StartsWith("macabi", Triple::MacABI)
-+    .StartsWith("kernel", Triple::Kernel)
-+    .StartsWith("system", Triple::System)
-     .Default(Triple::UnknownEnvironment);
+     .StartsWith("ananas", Triple::Ananas)
+     .StartsWith("cloudabi", Triple::CloudABI)
+     .StartsWith("darwin", Triple::Darwin)
+@@ -560,9 +564,11 @@ static Triple::EnvironmentType parseEnvironment(StringRef EnvironmentName) {
+       .StartsWith("musl", Triple::Musl)
+       .StartsWith("msvc", Triple::MSVC)
+       .StartsWith("itanium", Triple::Itanium)
++      .StartsWith("kernel", Triple::Kernel)
+       .StartsWith("cygnus", Triple::Cygnus)
+       .StartsWith("coreclr", Triple::CoreCLR)
+       .StartsWith("simulator", Triple::Simulator)
++      .StartsWith("system", Triple::System)
+       .StartsWith("macabi", Triple::MacABI)
+       .Default(Triple::UnknownEnvironment);
  }
- 
 diff --git a/llvm/lib/Support/Unix/Path.inc b/llvm/lib/Support/Unix/Path.inc
 index 2a03dc682..e75ff461d 100644
 --- a/llvm/lib/Support/Unix/Path.inc
 +++ b/llvm/lib/Support/Unix/Path.inc
 @@ -64,7 +64,7 @@ extern char **environ;
- 
+
  #include <sys/types.h>
  #if !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) &&   \
 -    !defined(__linux__) && !defined(__FreeBSD_kernel__) && !defined(_AIX)
@@ -791,7 +795,7 @@ index 2a03dc682..e75ff461d 100644
  #else
 @@ -431,7 +431,7 @@ std::error_code remove(const Twine &path, bool IgnoreNonExisting) {
  }
- 
+
  static bool is_local_impl(struct STATVFS &Vfs) {
 -#if defined(__linux__) || defined(__GNU__)
 +#if defined(__linux__) || defined(__GNU__) || defined(__aero__)
@@ -809,15 +813,19 @@ index 520685a0e..e6c2ddf20 100644
 +#undef HAVE_POSIX_SPAWN
  #ifdef HAVE_POSIX_SPAWN
  #include <spawn.h>
- 
+
 diff --git a/llvm/tools/llvm-dwarfdump/Statistics.cpp b/llvm/tools/llvm-dwarfdump/Statistics.cpp
-index 5bef4d514..2a237ef59 100644
+index 19a971afa..929184bfc 100644
 --- a/llvm/tools/llvm-dwarfdump/Statistics.cpp
 +++ b/llvm/tools/llvm-dwarfdump/Statistics.cpp
-@@ -1,3 +1,4 @@
+@@ -6,6 +6,8 @@
+ //
+ //===----------------------------------------------------------------------===//
+
 +#include <cmath>
++
+ #include "llvm-dwarfdump.h"
  #include "llvm/ADT/DenseMap.h"
- #include "llvm/ADT/StringExtras.h"
  #include "llvm/ADT/StringSet.h"
 diff --git a/llvm/tools/llvm-shlib/CMakeLists.txt b/llvm/tools/llvm-shlib/CMakeLists.txt
 index 3eb6db33a..554264a07 100644
@@ -831,18 +839,5 @@ index 3eb6db33a..554264a07 100644
       OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "OpenBSD")
       OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuchsia")
       OR ("${CMAKE_SYSTEM_NAME}" STREQUAL "DragonFly")
-diff --git a/llvm/utils/benchmark/src/benchmark_register.h b/llvm/utils/benchmark/src/benchmark_register.h
-index 0705e219f..6001fb8e0 100644
---- a/llvm/utils/benchmark/src/benchmark_register.h
-+++ b/llvm/utils/benchmark/src/benchmark_register.h
-@@ -2,6 +2,7 @@
- #define BENCHMARK_REGISTER_H
- 
- #include <vector>
-+#include <limits>
- 
- #include "check.h"
- 
--- 
+--
 2.34.1
-