From 1087da12fc815a84592454980cdcd5d34b07285b Mon Sep 17 00:00:00 2001 From: Theo Buehler Date: Fri, 11 Apr 2025 18:31:04 +0200 Subject: Sync opensslconf.h, add crypto_arch.h for mips This was easy enough to make compile. As long as it doesn't get in the way, I think we can keep this. Fixes #1110 --- crypto/CMakeLists.txt | 2 +- crypto/Makefile.am | 3 ++- crypto/arch/mips/crypto_arch.h | 21 +++++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 crypto/arch/mips/crypto_arch.h (limited to 'crypto') diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index a714059..64bccd8 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -781,7 +781,7 @@ elseif(HOST_MIPS64) target_include_directories(crypto_obj PRIVATE arch/mips64) target_include_directories(crypto_obj PRIVATE bn/arch/mips64) elseif(HOST_MIPS) - # XXX - can this go away? the directory doesn't exist... + target_include_directories(crypto_obj PRIVATE arch/mips) target_include_directories(crypto_obj PRIVATE bn/arch/mips) elseif(HOST_POWERPC) target_include_directories(crypto_obj PRIVATE arch/powerpc) diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 0952494..d1c5b76 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -403,10 +403,11 @@ endif noinst_HEADERS += arch/loongarch64/crypto_arch.h noinst_HEADERS += bn/arch/loongarch64/bn_arch.h -# XXX - do we still need this? if HOST_MIPS +libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/arch/mips/ libcrypto_la_CPPFLAGS += -I$(top_srcdir)/crypto/bn/arch/mips/ endif +noinst_HEADERS += arch/mips/crypto_arch.h noinst_HEADERS += bn/arch/mips/bn_arch.h if HOST_MIPS64 diff --git a/crypto/arch/mips/crypto_arch.h b/crypto/arch/mips/crypto_arch.h new file mode 100644 index 0000000..274879c --- /dev/null +++ b/crypto/arch/mips/crypto_arch.h @@ -0,0 +1,21 @@ +/* $OpenBSD$ */ +/* + * Copyright (c) 2024 Joel Sing + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef HEADER_CRYPTO_ARCH_H +#define HEADER_CRYPTO_ARCH_H + +#endif -- cgit v1.2.3-55-g6feb