Skip to content

Commit d39cb45

Browse files
authored
Merge pull request #2332 from mazunki/bump-llvm20
bump to llvm20
2 parents ba45aef + fdcde67 commit d39cb45

5 files changed

Lines changed: 11 additions & 6 deletions

File tree

api/fs/common.hpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,6 @@ namespace fs {
205205
{
206206
error_t error;
207207
Dirvec_ptr entries;
208-
auto begin() { return entries->begin(); }
209-
auto end() { return entries->end(); }
210-
auto cbegin() const { return entries->cbegin(); }
211-
auto cend() const { return entries->cend(); }
212208
};
213209

214210
} //< fs

api/fs/dirent.hpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -194,5 +194,11 @@ namespace fs {
194194

195195
} //< namespace fs
196196

197+
namespace fs {
198+
inline auto begin(List& l) { return l.entries->begin(); }
199+
inline auto end(List& l) { return l.entries->end(); }
200+
inline auto cbegin(const List& l) { return l.entries->cbegin(); }
201+
inline auto cend(const List& l) { return l.entries->cend(); }
202+
} //< namespace fs
197203

198204
#endif //< FS_DIRENT_HPP

api/mem/alloc/buddy.hpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
#include <stdlib.h>
2626
#include <math.h>
2727
#include <expects>
28+
#ifdef INCLUDEOS_SMP_ENABLE
29+
#include <mutex>
30+
#endif
2831

2932
#include <util/bitops.hpp>
3033
#include <util/units.hpp>

overlay.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
final: prev: {
77

88
stdenvIncludeOS = prev.pkgsStatic.lib.makeScope prev.pkgsStatic.newScope (self: {
9-
llvmPkgs = prev.pkgsStatic.llvmPackages_19;
9+
llvmPkgs = prev.pkgsStatic.llvmPackages_20;
1010
stdenv = self.llvmPkgs.libcxxStdenv; # Use this as base stdenv
1111

1212
# Import unpatched musl for building libcxx. Libcxx needs some linux headers to be passed through.

unittests.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{ nixpkgs ? ./pinned.nix,
22
pkgs ? import nixpkgs { config = { }; overlays = [ ]; },
3-
stdenv ? pkgs.llvmPackages_19.libcxxStdenv,
3+
stdenv ? pkgs.llvmPackages_20.libcxxStdenv,
44
withCcache ? false,
55
}:
66
stdenv.mkDerivation rec {

0 commit comments

Comments
 (0)