mika/Atmosphere-libs
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere-libs.git synced 2025-06-20 18:42:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

ams: basic support for compiling with gcc 15

Browse Source
This commit is contained in:
Michael Scire 2025-04-26 14:53:08 -07:00
parent 20ae7f3037
commit 2f9b9d5e7f
7 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libstratosphere/include/stratosphere/ncm/ncm_content_meta_extended_data.hpp
View File

@ -282,7 +282,7 @@ namespace ams::ncm {
}
const FragmentSet *GetFragmentSet(s32 delta_index, s32 fragment_set_index) const {
return reinterpret_cast<const FragmentSet *>(this->GetFragmentSetIndex(delta_index, fragment_set_index));
return reinterpret_cast<const FragmentSet *>(this->GetFragmentSetAddress(delta_index, fragment_set_index));
}
const FragmentIndicator *GetFragmentIndicator(s32 delta_index, s32 fragment_set_index, s32 index) const {

8
libstratosphere/source/fs/fs_scoped_setter.hpp
View File

@ -33,14 +33,14 @@ namespace ams::fs {
}
ALWAYS_INLINE ScopedSetter(ScopedSetter &&rhs) {
m_ptr = rhs.ptr;
m_value = rhs.value;
m_ptr = rhs.m_ptr;
m_value = rhs.m_value;
rhs.Reset();
}
ALWAYS_INLINE ScopedSetter &operator=(ScopedSetter &&rhs) {
m_ptr = rhs.ptr;
m_value = rhs.value;
m_ptr = rhs.m_ptr;
m_value = rhs.m_value;
rhs.Reset();
return *this;
}

2
libstratosphere/source/sf/hipc/sf_hipc_server_manager.cpp
View File

@ -21,7 +21,7 @@ namespace ams::sf::hipc {
#if AMS_SF_MITM_SUPPORTED
Result ServerManagerBase::InstallMitmServerImpl(os::NativeHandle *out_port_handle, sm::ServiceName service_name, ServerManagerBase::MitmQueryFunction query_func) {
/* Install the Mitm. */
os::NativeHandle query_handle;
os::NativeHandle query_handle = os::InvalidNativeHandle;
R_TRY(sm::mitm::InstallMitm(out_port_handle, std::addressof(query_handle), service_name));
/* Register the query handle. */

1
libvapours/include/vapours/types.hpp
View File

@ -16,7 +16,6 @@
#pragma once
#include <cstdint>
#include <cstddef>
#include <cstdbool>
/* NOTE: This file serves as a substitute for libnx <switch/types.h>. */

2
libvapours/source/crypto/crypto_memory_compare.arch.arm.cpp
View File

@ -48,7 +48,7 @@ namespace ams::crypto {
" moveq %[result], #1\n"
" movne %[result], #0\n"
: [result]"=r"(result), [lhs]"+r"(lhs), [rhs]"+r"(rhs), [xor_acc]"=&r"(xor_acc), [index]"=&r"(index), [ltmp]"=&r"(ltmp), [rtmp]"=&r"(rtmp)
: [size]"r"(size)
: "m"(*(const u8 (*)[size])lhs), "m"(*(const u8 (*)[size])rhs), [size]"r"(size)
: "cc"
);

2
libvapours/source/crypto/crypto_memory_compare.arch.arm64.cpp
View File

@ -47,7 +47,7 @@ namespace ams::crypto {
" cmp %w[xor_acc], #0\n"
" cset %w[result], eq\n"
: [result]"=r"(result), [lhs]"+r"(lhs), [rhs]"+r"(rhs), [xor_acc]"=&r"(xor_acc), [index]"=&r"(index), [ltmp]"=&r"(ltmp), [rtmp]"=&r"(rtmp)
: "m"(*(const u8 (*)[size])lhs), "m"(*(const u8 (*)[size])lhs), [size]"r"(size)
: "m"(*(const u8 (*)[size])lhs), "m"(*(const u8 (*)[size])rhs), [size]"r"(size)
: "cc"
);

2
libvapours/source/crypto/impl/crypto_sha256_impl.arch.arm64.cpp
View File

@ -281,7 +281,7 @@ namespace ams::crypto::impl {
[cur_hash0]"+w"(cur_hash0), [cur_hash1]"+w"(cur_hash1),
[prev_hash0]"+w"(prev_hash0), [prev_hash1]"+w"(prev_hash1),
[tmp_hash]"=w"(tmp_hash), [data]"+r"(data)
: [round_constants]"r"(RoundConstants)
: "m"(*(const u8 (*)[block_count*BlockSize])data), [round_constants]"r"(RoundConstants)
:
);
} while (--block_count != 0);