nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-11-10 07:06:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

buildsystem: fix building

Browse source
This commit is contained in:
Michael Scire 2020-04-06 17:44:14 -07:00
parent d98490d339
commit eb48e7cc59
3 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/libmesosphere/Makefile
View file

@ -6,7 +6,8 @@ include $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/../config/common.mk
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# options for code generation # options for code generation
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
PRECOMPILED_HEADERS := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/include/mesosphere.hpp #PRECOMPILED_HEADERS := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/include/mesosphere.hpp
PRECOMPILED_HEADERS :=
DEFINES := $(ATMOSPHERE_DEFINES) -DATMOSPHERE_IS_MESOSPHERE DEFINES := $(ATMOSPHERE_DEFINES) -DATMOSPHERE_IS_MESOSPHERE
SETTINGS := $(ATMOSPHERE_SETTINGS) -O2 -mgeneral-regs-only -ffixed-x18 -Werror -fno-non-call-exceptions SETTINGS := $(ATMOSPHERE_SETTINGS) -O2 -mgeneral-regs-only -ffixed-x18 -Werror -fno-non-call-exceptions

13
libraries/libvapours/source/crypto/impl/crypto_ctr_mode_impl.arch.arm64.cpp
View file

@ -14,12 +14,12 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <vapours.hpp> #include <vapours.hpp>
#ifdef ATMOSPHERE_IS_STRATOSPHERE
#include <arm_neon.h> #include <arm_neon.h>
namespace ams::crypto::impl { namespace ams::crypto::impl {
#ifdef ATMOSPHERE_IS_STRATOSPHERE
/* Variable management macros. */ /* Variable management macros. */
#define DECLARE_ROUND_KEY_VAR(n) \ #define DECLARE_ROUND_KEY_VAR(n) \
const uint8x16_t round_key_##n = vld1q_u8(keys + (BlockSize * n)) const uint8x16_t round_key_##n = vld1q_u8(keys + (BlockSize * n))
@ -579,10 +579,13 @@ namespace ams::crypto::impl {
vst1q_u8(this->counter, ctr0); vst1q_u8(this->counter, ctr0);
} }
}
#else #else
/* TODO: Non-EL0 implementation. */ /* TODO: Non-EL0 implementation. */
namespace ams::crypto::impl {
#endif
} }
#endif

13
libraries/libvapours/source/crypto/impl/crypto_xts_mode_impl.arch.arm64.cpp
View file

@ -14,12 +14,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <vapours.hpp> #include <vapours.hpp>
#include <arm_neon.h>
#include "crypto_update_impl.hpp" #include "crypto_update_impl.hpp"
#ifdef ATMOSPHERE_IS_STRATOSPHERE
#include <arm_neon.h>
namespace ams::crypto::impl { namespace ams::crypto::impl {
#ifdef ATMOSPHERE_IS_STRATOSPHERE
/* Variable management macros. */ /* Variable management macros. */
#define DECLARE_ROUND_KEY_VAR(n) \ #define DECLARE_ROUND_KEY_VAR(n) \
@ -1178,10 +1179,14 @@ namespace ams::crypto::impl {
return processed; return processed;
} }
}
#else #else
/* TODO: Non-EL0 implementation. */ /* TODO: Non-EL0 implementation. */
namespace ams::crypto::impl {
}
#endif #endif
}