pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

rust195: No need to duplicate patch (sorry, fat fingers...)



Module Name:	pkgsrc-wip
Committed By:	Havard Eidnes <he%NetBSD.org@localhost>
Pushed By:	he
Date:		Wed May 27 14:38:25 2026 +0000
Changeset:	1c0165ac1c13edc4de56caaf579d81dbb5f1916b

Modified Files:
	rust195/patches/patch-src_llvm-project_llvm_lib_TargetParser_TargetDataLayout.cpp

Log Message:
rust195: No need to duplicate patch (sorry, fat fingers...)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1c0165ac1c13edc4de56caaf579d81dbb5f1916b

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ...ject_llvm_lib_TargetParser_TargetDataLayout.cpp | 38 ----------------------
 1 file changed, 38 deletions(-)

diffs:
diff --git a/rust195/patches/patch-src_llvm-project_llvm_lib_TargetParser_TargetDataLayout.cpp b/rust195/patches/patch-src_llvm-project_llvm_lib_TargetParser_TargetDataLayout.cpp
index 2d7834b49d..bbab4d57f5 100644
--- a/rust195/patches/patch-src_llvm-project_llvm_lib_TargetParser_TargetDataLayout.cpp
+++ b/rust195/patches/patch-src_llvm-project_llvm_lib_TargetParser_TargetDataLayout.cpp
@@ -3,44 +3,6 @@ $NetBSD$
 Tweak the data layout for NetBSD/m68k, as per
 https://github.com/llvm/llvm-project/issues/199826
 
---- src/llvm-project/llvm/lib/TargetParser/TargetDataLayout.cpp.orig	2026-05-27 13:35:30.929852884 +0000
-+++ src/llvm-project/llvm/lib/TargetParser/TargetDataLayout.cpp
-@@ -130,15 +130,24 @@ static std::string computeM68kDataLayout
-   // FIXME how to wire it with the used object format?
-   Ret += "-m:e";
- 
--  // M68k pointers are always 32 bit wide even for 16-bit CPUs.
--  // The ABI only specifies 16-bit alignment.
--  // On at least the 68020+ with a 32-bit bus, there is a performance benefit
--  // to having 32-bit alignment.
--  Ret += "-p:32:16:32";
--
--  // Bytes do not require special alignment, words are word aligned and
--  // long words are word aligned at minimum.
--  Ret += "-i8:8:8-i16:16:16-i32:16:32";
-+  // Ref. https://github.com/llvm/llvm-project/issues/199826,
-+  // the 16-bit alignment of pointer and i32 is perhaps a linuxism...
-+  // For now treat NetBSD specially.
-+
-+  if (! TT.IsOSNetBSD()) {
-+    // M68k pointers are always 32 bit wide even for 16-bit CPUs.
-+    // The ABI only specifies 16-bit alignment.
-+    // On at least the 68020+ with a 32-bit bus, there is a performance benefit
-+    // to having 32-bit alignment.
-+    Ret += "-p:32:16:32";
-+
-+    // Bytes do not require special alignment, words are word aligned and
-+    // long words are word aligned at minimum.
-+    Ret += "-i8:8:8-i16:16:16-i32:16:32";
-+  } else { // NetBSD has 32-bit aligned i32 and pointers:
-+    Ret += "-p:32:32:32";
-+    Ret += "-i8:8:8-i16:16:16-i32:32:32";
-+  }
- 
-   // FIXME no floats at the moment
- 
-$NetBSD$
-
 --- src/llvm-project/llvm/lib/TargetParser/TargetDataLayout.cpp.orig	2026-05-27 13:35:30.929852884 +0000
 +++ src/llvm-project/llvm/lib/TargetParser/TargetDataLayout.cpp
 @@ -130,22 +130,35 @@ static std::string computeM68kDataLayout


Home | Main Index | Thread Index | Old Index