Merge branch 'main' into additional-rr-types

NLnetLabs · Jan 21, 2025 · b913eda · b913eda
2 parents 92b6a47 + 3becf25
commit b913eda
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -19,7 +19,7 @@ jobs:
             build_tool_options: -j 4
             analyzer: off
             sanitizer: address,undefined
-          - os: macos-12
+          - os: macos-14
             packages: automake
             build_type: Debug
             build_tool_options: -j 4

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,18 +5,25 @@ All notable changes to simdzone will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.2.1] - 2025-??-??
+## [0.2.2] - 2025-??-??
 
 ### Added
 
 - Add support for EID, NIMLOC, SINK, TALINK, DSYNC and DOA RR types.
 
 ### Fixed
 
-- Cleanup westmere and haswell object files (#24) Thanks @fobser
 - Empty base16 and base64 in CDS and CDNSKEY can be represented with a '0'.
   As specified in Section 4 of RFC 8078.
 
+## [0.2.1] - 2025-01-17
+
+### Fixed
+
+- Cleanup westmere and haswell object files (#244) Thanks @fobser
+- Out of tree builds (NLnetLabs/nsd#415)
+- Fix function declarations for fallback detection routine in isadetection.h.
+
 ## [0.2.0] - 2024-12-12
 
 ### Added

diff --git a/Makefile.in b/Makefile.in
@@ -9,7 +9,7 @@ WESTMERE = @HAVE_WESTMERE@
 HASWELL = @HAVE_HASWELL@
 
 CC = @CC@
-CPPFLAGS = @CPPFLAGS@ -I$(SOURCE)/include -I$(SOURCE)/src -I.
+CPPFLAGS = @CPPFLAGS@ -Iinclude -I$(SOURCE)/include -I$(SOURCE)/src -I.
 CFLAGS = @CFLAGS@
 DEPFLAGS = @DEPFLAGS@
 VPATH = @srcdir@

diff --git a/configure.ac b/configure.ac
@@ -10,7 +10,7 @@
 # platform not supported by NSD here is undesirable. Builds for standalone use
 # or development/testing are required to use CMake.
 
-AC_INIT([simdzone],[0.2.0],[https://github.com/NLnetLabs/simdzone/issues])
+AC_INIT([simdzone],[0.2.2],[https://github.com/NLnetLabs/simdzone/issues])
 
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile])

diff --git a/src/isadetection.h b/src/isadetection.h
@@ -87,21 +87,21 @@ enum instruction_set {
 
 #if defined(__PPC64__)
 
-static inline uint32_t detect_supported_architectures() {
+static inline uint32_t detect_supported_architectures(void) {
   return ALTIVEC;
 }
 
 #elif defined(__arm__) || defined(__aarch64__) // incl. armel, armhf, arm64
 
 #if defined(__ARM_NEON)
 
-static inline uint32_t detect_supported_architectures() {
+static inline uint32_t detect_supported_architectures(void) {
   return NEON;
 }
 
 #else // ARM without NEON
 
-static inline uint32_t detect_supported_architectures() {
+static inline uint32_t detect_supported_architectures(void) {
   return DEFAULT;
 }
 
@@ -260,7 +260,7 @@ static inline uint32_t detect_supported_architectures(void)
 }
 #else // fallback
 
-static inline uint32_t detect_supported_architectures() {
+static inline uint32_t detect_supported_architectures(void) {
   return DEFAULT;
 }