head	1.1;
access;
symbols;
locks; strict;
comment	@ * @;


1.1
date	2026.09.30.20.01.31;	author wiz;	state Exp;
branches;
next	;
commitid	PfeGIL8m1MPGqGXG;


desc
@@


1.1
log
@rust: update to 1.98.1

Prepared in wip/rust198 by he@@, thank you!

1.98.1

Rust 1.98.1 fixes a miscompilation in vtable generation.

1.98.0

Algebraic floating-point methods
Buffered integer formatting
Fix interaction between ManuallyDrop and Box

1.97.1

Rust 1.97.1 fixes a miscompilation in an LLVM optimization.

1.97.0

Symbol mangling v0 enabled by default
Cargo support for denying warnings
Linker output no longer hidden by default
@
text
@$NetBSD: patch-vendor_openssl-src-300.5.4+3.5.4_openssl_crypto_aria_aria.c,v 1.1 2026/04/02 19:06:35 wiz Exp $

Make this build also if bswap32 is already defined, as for NetBSD/i586.

--- vendor/openssl-src-300.6.1+3.6.3/openssl/crypto/aria/aria.c.orig	2025-11-02 17:14:42.569500518 +0000
+++ vendor/openssl-src-300.6.1+3.6.3/openssl/crypto/aria/aria.c
@@@@ -32,8 +32,10 @@@@
 #define rotl32(v, r) (((uint32_t)(v) << (r)) | ((uint32_t)(v) >> (32 - r)))
 #define rotr32(v, r) (((uint32_t)(v) >> (r)) | ((uint32_t)(v) << (32 - r)))
 
+#ifndef bswap32
 #define bswap32(v) \
     (((v) << 24) ^ ((v) >> 24) ^ (((v) & 0x0000ff00) << 8) ^ (((v) & 0x00ff0000) >> 8))
+#endif
 
 #define GET_U8_BE(X, Y) ((uint8_t)((X) >> ((3 - Y) * 8)))
 #define GET_U32_BE(X, Y) ( \
@