diff options
| author | Efraim Flashner <[email protected]> | 2023-01-30 11:33:18 +0200 |
|---|---|---|
| committer | Efraim Flashner <[email protected]> | 2023-01-30 12:39:40 +0200 |
| commit | 4cf1acc7f3033b50b0bf19e02c9f522d522d338c (patch) | |
| tree | 9fd64956ee60304c15387eb394cd649e49f01467 /gnu/packages/patches/mrustc-riscv64-support.patch | |
| parent | edb8c09addd186d9538d43b12af74d6c7aeea082 (diff) | |
| parent | 595b53b74e3ef57a1c0c96108ba86d38a170a241 (diff) | |
Merge remote-tracking branch 'origin/master' into core-updates
Conflicts:
doc/guix.texi
gnu/local.mk
gnu/packages/admin.scm
gnu/packages/base.scm
gnu/packages/chromium.scm
gnu/packages/compression.scm
gnu/packages/databases.scm
gnu/packages/diffoscope.scm
gnu/packages/freedesktop.scm
gnu/packages/gnome.scm
gnu/packages/gnupg.scm
gnu/packages/guile.scm
gnu/packages/inkscape.scm
gnu/packages/llvm.scm
gnu/packages/openldap.scm
gnu/packages/pciutils.scm
gnu/packages/ruby.scm
gnu/packages/samba.scm
gnu/packages/sqlite.scm
gnu/packages/statistics.scm
gnu/packages/syndication.scm
gnu/packages/tex.scm
gnu/packages/tls.scm
gnu/packages/version-control.scm
gnu/packages/xml.scm
guix/build-system/copy.scm
guix/scripts/home.scm
Diffstat (limited to 'gnu/packages/patches/mrustc-riscv64-support.patch')
| -rw-r--r-- | gnu/packages/patches/mrustc-riscv64-support.patch | 48 |
1 files changed, 0 insertions, 48 deletions
diff --git a/gnu/packages/patches/mrustc-riscv64-support.patch b/gnu/packages/patches/mrustc-riscv64-support.patch deleted file mode 100644 index 6312116585..0000000000 --- a/gnu/packages/patches/mrustc-riscv64-support.patch +++ /dev/null @@ -1,48 +0,0 @@ -Patch sent upstream for review: -https://github.com/thepowersgang/mrustc/pull/276 - -diff --git a/src/trans/target.cpp b/src/trans/target.cpp -index 420a2870..4d5eefb3 100644 ---- a/src/trans/target.cpp -+++ b/src/trans/target.cpp -@@ -65,6 +65,13 @@ const TargetArch ARCH_POWERPC64LE = { - { /*atomic(u8)=*/true, true, true, true, true }, - TargetArch::Alignments(2, 4, 8, 16, 4, 8, 8) - }; -+// This is a guess -+const TargetArch ARCH_RISCV64 = { -+ "riscv64", -+ 64, false, -+ { /*atomic(u8)=*/true, true, true, true, true }, -+ TargetArch::Alignments(2, 4, 8, 16, 4, 8, 8) -+}; - TargetSpec g_target; - - -@@ -455,6 +462,13 @@ namespace - ARCH_POWERPC64LE - }; - } -+ else if(target_name == "riscv64-unknown-linux-gnu") -+ { -+ return TargetSpec { -+ "unix", "linux", "gnu", {CodegenMode::Gnu11, false, "riscv64-unknown-linux-gnu", BACKEND_C_OPTS_GNU}, -+ ARCH_RISCV64 -+ }; -+ } - else if(target_name == "i586-pc-windows-gnu") - { - return TargetSpec { -diff --git a/tools/common/target_detect.h b/tools/common/target_detect.h -index a052da6b..42fea91a 100644 ---- a/tools/common/target_detect.h -+++ b/tools/common/target_detect.h -@@ -34,6 +34,8 @@ - # define DEFAULT_TARGET_NAME "powerpc64-unknown-linux-gnu" - # elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__) - # define DEFAULT_TARGET_NAME "powerpc64le-unknown-linux-gnu" -+# elif defined(__riscv) && __riscv_xlen == 64 -+# define DEFAULT_TARGET_NAME "riscv64-unknown-linux-gnu" - # else - # warning "Unable to detect a suitable default target (linux-gnu)" - # endif |