diff --git a/make/autoconf/flags-cflags.m4 b/make/autoconf/flags-cflags.m4
index 73786587735..374ee1851a5 100644
--- a/make/autoconf/flags-cflags.m4
+++ b/make/autoconf/flags-cflags.m4
@@ -924,8 +924,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP],
   # Check whether the compiler supports the Arm C Language Extensions (ACLE)
   # for SVE. Set SVE_CFLAGS to -march=armv8-a+sve if it does.
   # ACLE and this flag are required to build the aarch64 SVE related functions in
-  # libvectormath.
-  if test "x$OPENJDK_TARGET_CPU" = "xaarch64"; then
+  # libvectormath. Apple Silicon does not support SVE; use macOS as a proxy for
+  # that check.
+  if test "x$OPENJDK_TARGET_CPU" = "xaarch64" && test "x$OPENJDK_TARGET_CPU" = "xlinux"; then
     if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
       AC_LANG_PUSH(C)
       OLD_CFLAGS="$CFLAGS"
diff --git a/make/modules/jdk.incubator.vector/Lib.gmk b/make/modules/jdk.incubator.vector/Lib.gmk
index 5c979ae8191..e6a05019f5f 100644
--- a/make/modules/jdk.incubator.vector/Lib.gmk
+++ b/make/modules/jdk.incubator.vector/Lib.gmk
@@ -27,51 +27,46 @@
 
 include LibCommon.gmk
 
-################################################################################
-## Build libjsvml
-################################################################################
+ifeq ($(INCLUDE_COMPILER2), true)
 
-ifeq ($(call isTargetOs, linux windows)+$(call isTargetCpu, x86_64)+$(INCLUDE_COMPILER2), true+true+true)
-  $(eval $(call SetupJdkLibrary, BUILD_LIBJSVML, \
-      NAME := jsvml, \
-      LDFLAGS_windows := -defaultlib:msvcrt, \
-  ))
+  ##############################################################################
+  ## Build libjsvml
+  ##############################################################################
+
+  ifeq ($(call isTargetOs, linux windows)+$(call isTargetCpu, x86_64), true+true)
+    $(eval $(call SetupJdkLibrary, BUILD_LIBJSVML, \
+        NAME := jsvml, \
+        LDFLAGS_windows := -defaultlib:msvcrt, \
+    ))
+
+    TARGETS += $(BUILD_LIBJSVML)
+  endif
+
+  ##############################################################################
+  ## Build libsleef
+  ##############################################################################
+
+  ifeq ($(call isTargetOs, linux macosx)+$(call isTargetCpu, aarch64 riscv64), true+true)
+    ifeq ($(call isTargetCpu, riscv64), true)
+      LIBSLEEF_CFLAGS := -march=rv64gcv
+    endif
+
+    $(eval $(call SetupJdkLibrary, BUILD_LIBSLEEF, \
+        NAME := sleef, \
+        OPTIMIZATION := HIGH, \
+        SRC := libsleef/lib, \
+        EXTRA_SRC := libsleef/generated, \
+        DISABLED_WARNINGS_gcc := unused-function sign-compare \
+            tautological-compare ignored-qualifiers, \
+        DISABLED_WARNINGS_clang := unused-function sign-compare \
+            tautological-compare ignored-qualifiers, \
+        CFLAGS := $(LIBSLEEF_CFLAGS), \
+        vector_math_sve.c_CFLAGS := $(SVE_CFLAGS), \
+    ))
+
+    TARGETS += $(BUILD_LIBSLEEF)
+  endif
 
-  TARGETS += $(BUILD_LIBJSVML)
-endif
-
-################################################################################
-## Build libsleef
-################################################################################
-
-ifeq ($(call isTargetOs, linux)+$(call isTargetCpu, riscv64)+$(INCLUDE_COMPILER2), true+true+true)
-  $(eval $(call SetupJdkLibrary, BUILD_LIBSLEEF, \
-      NAME := sleef, \
-      OPTIMIZATION := HIGH, \
-      SRC := libsleef/lib, \
-      EXTRA_SRC := libsleef/generated, \
-      DISABLED_WARNINGS_gcc := unused-function sign-compare tautological-compare ignored-qualifiers, \
-      DISABLED_WARNINGS_clang := unused-function sign-compare tautological-compare ignored-qualifiers, \
-      CFLAGS := -march=rv64gcv, \
-      CFLAGS_FILTER_OUT := -ftrivial-auto-var-init=pattern, \
-  ))
-
-  TARGETS += $(BUILD_LIBSLEEF)
-endif
-
-ifeq ($(call isTargetOs, linux)+$(call isTargetCpu, aarch64)+$(INCLUDE_COMPILER2), true+true+true)
-  $(eval $(call SetupJdkLibrary, BUILD_LIBSLEEF, \
-      NAME := sleef, \
-      OPTIMIZATION := HIGH, \
-      SRC := libsleef/lib, \
-      EXTRA_SRC := libsleef/generated, \
-      DISABLED_WARNINGS_gcc := unused-function sign-compare tautological-compare ignored-qualifiers, \
-      DISABLED_WARNINGS_clang := unused-function sign-compare tautological-compare ignored-qualifiers, \
-      vector_math_sve.c_CFLAGS := $(SVE_CFLAGS), \
-      CFLAGS_FILTER_OUT := -ftrivial-auto-var-init=pattern, \
-  ))
-
-  TARGETS += $(BUILD_LIBSLEEF)
 endif
 
 ################################################################################
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/README.md b/src/jdk.incubator.vector/unix/native/libsleef/README.md
similarity index 89%
rename from src/jdk.incubator.vector/linux/native/libsleef/README.md
rename to src/jdk.incubator.vector/unix/native/libsleef/README.md
index 1f20f3dda10..ef838c2949b 100644
--- a/src/jdk.incubator.vector/linux/native/libsleef/README.md
+++ b/src/jdk.incubator.vector/unix/native/libsleef/README.md
@@ -10,7 +10,7 @@ git tag `3.6.1` and git commit hash `6ee14bcae5fe92c2ff8b000d5a01102dab08d774`.
 # About the libsleef integration in the JDK
 
 The upstream original source code is available in
-`src/jdk.incubator.vector/linux/native/libsleef/upstream`. However, this code is
+`src/jdk.incubator.vector/unix/native/libsleef/upstream`. However, this code is
 not directly usable in the JDK build system, but is instead used as the base for
 the generation of additional souce code files. This generation is done by
 the libsleef CMake files. If this should have been done at build time, it would
@@ -19,14 +19,14 @@ have meant adding CMake as a required dependency to build the JDK.
 Instead, we create these generated files only once, when we import a new
 version of the libsleef source code, and check in the generated files into
 the JDK source tree. The generated files reside in
-`src/jdk.incubator.vector/linux/native/libsleef/generated`.
+`src/jdk.incubator.vector/unix/native/libsleef/generated`.
 
 # Import instructions
 
 To update the version of libsleef that is used in the JDK, clone
 `https://github.com/shibatch/sleef.git`, and copy all files, except the `docs`,
 `.github` and `.git` directories, into
-`src/jdk.incubator.vector/linux/native/libsleef/upstream`.
+`src/jdk.incubator.vector/unix/native/libsleef/upstream`.
 
 The libsleef source code does not follow the JDK whitespace rules as enforced by
 jcheck. You will need to remove trailing whitespace, and expand tabs to 8
@@ -51,4 +51,4 @@ then generate the updated libsleef source code by
 `make update-sleef-source CONF=riscv64`.
 
 Finally, verify with git that the local changes made to the files in
-`src/jdk.incubator.vector/linux/native/libsleef/generated` look okay.
+`src/jdk.incubator.vector/unix/native/libsleef/generated` look okay.
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/generated/misc.h b/src/jdk.incubator.vector/unix/native/libsleef/generated/misc.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/generated/misc.h
rename to src/jdk.incubator.vector/unix/native/libsleef/generated/misc.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/generated/sleefinline_advsimd.h b/src/jdk.incubator.vector/unix/native/libsleef/generated/sleefinline_advsimd.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/generated/sleefinline_advsimd.h
rename to src/jdk.incubator.vector/unix/native/libsleef/generated/sleefinline_advsimd.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/generated/sleefinline_rvvm1.h b/src/jdk.incubator.vector/unix/native/libsleef/generated/sleefinline_rvvm1.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/generated/sleefinline_rvvm1.h
rename to src/jdk.incubator.vector/unix/native/libsleef/generated/sleefinline_rvvm1.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/generated/sleefinline_sve.h b/src/jdk.incubator.vector/unix/native/libsleef/generated/sleefinline_sve.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/generated/sleefinline_sve.h
rename to src/jdk.incubator.vector/unix/native/libsleef/generated/sleefinline_sve.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_neon.c b/src/jdk.incubator.vector/unix/native/libsleef/lib/vector_math_neon.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_neon.c
rename to src/jdk.incubator.vector/unix/native/libsleef/lib/vector_math_neon.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_rvv.c b/src/jdk.incubator.vector/unix/native/libsleef/lib/vector_math_rvv.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_rvv.c
rename to src/jdk.incubator.vector/unix/native/libsleef/lib/vector_math_rvv.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_sve.c b/src/jdk.incubator.vector/unix/native/libsleef/lib/vector_math_sve.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/lib/vector_math_sve.c
rename to src/jdk.incubator.vector/unix/native/libsleef/lib/vector_math_sve.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/CHANGELOG.md b/src/jdk.incubator.vector/unix/native/libsleef/upstream/CHANGELOG.md
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/CHANGELOG.md
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/CHANGELOG.md
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/CMakeLists.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/CMakeLists.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/CMakeLists.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/CMakeLists.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/CONTRIBUTORS.md b/src/jdk.incubator.vector/unix/native/libsleef/upstream/CONTRIBUTORS.md
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/CONTRIBUTORS.md
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/CONTRIBUTORS.md
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/Configure.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/Configure.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/Configure.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/Configure.cmake
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/LICENSE.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/LICENSE.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/LICENSE.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/LICENSE.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/README.md b/src/jdk.incubator.vector/unix/native/libsleef/upstream/README.md
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/README.md
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/README.md
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/include/sleefdft.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/include/sleefdft.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/include/sleefdft.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/include/sleefdft.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/sleef-config.h.in b/src/jdk.incubator.vector/unix/native/libsleef/upstream/sleef-config.h.in
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/sleef-config.h.in
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/sleef-config.h.in
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/sleefConfig.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/sleefConfig.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/sleefConfig.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/sleefConfig.cmake
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/CMakeLists.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/CMakeLists.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/CMakeLists.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/CMakeLists.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperadvsimd.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperadvsimd.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperadvsimd.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperadvsimd.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperavx.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperavx.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperavx.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperavx.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperavx2.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperavx2.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperavx2.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperavx2.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperavx2_128.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperavx2_128.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperavx2_128.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperavx2_128.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperavx512f.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperavx512f.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperavx512f.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperavx512f.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperneon32.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperneon32.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperneon32.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperneon32.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperpower_128.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperpower_128.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperpower_128.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperpower_128.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperpurec.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperpurec.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperpurec.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperpurec.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperpurec_scalar.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperpurec_scalar.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperpurec_scalar.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperpurec_scalar.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperrvv.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperrvv.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helperrvv.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helperrvv.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helpers390x_128.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helpers390x_128.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helpers390x_128.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helpers390x_128.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helpersse2.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helpersse2.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helpersse2.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helpersse2.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helpersve.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helpersve.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helpersve.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helpersve.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helpervecext.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helpervecext.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/arch/helpervecext.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/arch/helpervecext.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/CMakeLists.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/CMakeLists.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/CMakeLists.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/CMakeLists.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/addSuffix.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/addSuffix.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/addSuffix.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/addSuffix.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/arraymap.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/arraymap.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/arraymap.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/arraymap.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/arraymap.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/arraymap.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/arraymap.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/arraymap.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/common.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/common.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/common.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/common.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/common.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/common.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/common.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/common.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/commonfuncs.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/commonfuncs.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/commonfuncs.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/commonfuncs.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/dd.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/dd.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/dd.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/dd.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/df.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/df.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/df.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/df.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/estrin.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/estrin.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/estrin.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/estrin.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/f128util.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/f128util.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/f128util.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/f128util.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/keywords.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/keywords.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/keywords.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/keywords.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/main_checkfeature.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/main_checkfeature.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/main_checkfeature.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/main_checkfeature.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/misc.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/misc.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/misc.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/misc.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/quaddef.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/quaddef.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/common/quaddef.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/common/quaddef.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/CMakeLists.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/CMakeLists.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/CMakeLists.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/CMakeLists.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/bench1d.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/bench1d.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/bench1d.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/bench1d.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/fftwtest1d.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/fftwtest1d.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/fftwtest1d.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/fftwtest1d.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/fftwtest2d.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/fftwtest2d.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/fftwtest2d.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/fftwtest2d.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/measuredft.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/measuredft.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/measuredft.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/measuredft.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/naivetest.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/naivetest.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/naivetest.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/naivetest.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/roundtriptest1d.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/roundtriptest1d.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/roundtriptest1d.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/roundtriptest1d.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/roundtriptest2d.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/roundtriptest2d.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/roundtriptest2d.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/roundtriptest2d.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/tutorial.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/tutorial.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft-tester/tutorial.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft-tester/tutorial.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/CMakeLists.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/CMakeLists.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/CMakeLists.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/CMakeLists.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/dft.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/dft.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/dft.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/dft.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/dftcommon.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/dftcommon.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/dftcommon.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/dftcommon.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/dftcommon.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/dftcommon.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/dftcommon.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/dftcommon.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/mkdispatch.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/mkdispatch.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/mkdispatch.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/mkdispatch.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/mkunroll.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/mkunroll.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/mkunroll.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/mkunroll.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/unroll0.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/unroll0.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/unroll0.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/unroll0.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/vectortype.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/vectortype.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/dft/vectortype.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/dft/vectortype.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/Makefile b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/Makefile
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/Makefile
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/Makefile
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/dp.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/dp.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/dp.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/dp.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/gencoef.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/gencoef.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/gencoef.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/gencoef.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/gencoef.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/gencoef.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/gencoef.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/gencoef.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/ld.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/ld.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/ld.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/ld.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/mkrempitab.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/mkrempitab.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/mkrempitab.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/mkrempitab.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/mkrempitabqp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/mkrempitabqp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/mkrempitabqp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/mkrempitabqp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/qp.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/qp.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/qp.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/qp.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/simplexfr.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/simplexfr.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/simplexfr.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/simplexfr.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/sp.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/sp.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/gencoef/sp.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/gencoef/sp.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/Makefile b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/Makefile
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/Makefile
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/Makefile
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/ProcessData.java b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/ProcessData.java
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/ProcessData.java
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/ProcessData.java
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/bench.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/bench.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/bench.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/bench.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsleef.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsleef.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsleef.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsleef.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsleef128.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsleef128.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsleef128.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsleef128.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsleef256.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsleef256.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsleef256.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsleef256.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsleef512.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsleef512.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsleef512.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsleef512.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsvml.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsvml.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsvml.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsvml.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsvml128.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsvml128.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsvml128.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsvml128.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsvml256.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsvml256.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsvml256.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsvml256.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsvml512.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsvml512.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/benchsvml512.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/benchsvml512.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/measure.sh b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/measure.sh
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-benchmarks/measure.sh
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-benchmarks/measure.sh
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/CMakeLists.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/CMakeLists.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/CMakeLists.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/CMakeLists.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/autovec.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/autovec.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/autovec.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/autovec.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/gnuabi_compatibility.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/gnuabi_compatibility.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/gnuabi_compatibility.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/gnuabi_compatibility.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/hash_cinz.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/hash_cinz.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/hash_cinz.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/hash_cinz.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/hash_finz.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/hash_finz.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/hash_finz.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/hash_finz.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/iut.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/iut.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/iut.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/iut.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/iutcuda.cu b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/iutcuda.cu
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/iutcuda.cu
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/iutcuda.cu
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/iutsimd.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/iutsimd.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/iutsimd.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/iutsimd.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/mveclibtest.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/mveclibtest.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/mveclibtest.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/mveclibtest.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester2dp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester2dp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester2dp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester2dp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester2ld.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester2ld.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester2ld.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester2ld.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester2qp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester2qp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester2qp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester2qp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester2simddp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester2simddp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester2simddp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester2simddp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester2simdsp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester2simdsp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester2simdsp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester2simdsp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester2sp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester2sp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester2sp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester2sp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester3.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester3.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/tester3.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/tester3.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/testerutil.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/testerutil.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/testerutil.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/testerutil.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/testerutil.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/testerutil.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/testerutil.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/testerutil.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/testervecabi.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/testervecabi.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm-tester/testervecabi.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm-tester/testervecabi.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/CMakeLists.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/CMakeLists.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/CMakeLists.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/CMakeLists.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/dispatcher.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/dispatcher.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/dispatcher.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/dispatcher.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/dispavx.c.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/dispavx.c.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/dispavx.c.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/dispavx.c.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/disppower_128.c.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/disppower_128.c.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/disppower_128.c.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/disppower_128.c.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/disps390x_128.c.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/disps390x_128.c.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/disps390x_128.c.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/disps390x_128.c.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/dispscalar.c.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/dispscalar.c.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/dispscalar.c.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/dispscalar.c.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/dispscalar_footer.c.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/dispscalar_footer.c.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/dispscalar_footer.c.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/dispscalar_footer.c.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/dispsse.c.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/dispsse.c.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/dispsse.c.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/dispsse.c.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/funcproto.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/funcproto.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/funcproto.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/funcproto.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/mkalias.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/mkalias.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/mkalias.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/mkalias.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/mkdisp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/mkdisp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/mkdisp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/mkdisp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/mkmasked_gnuabi.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/mkmasked_gnuabi.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/mkmasked_gnuabi.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/mkmasked_gnuabi.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/mkrename.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/mkrename.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/mkrename.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/mkrename.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/mkrename_gnuabi.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/mkrename_gnuabi.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/mkrename_gnuabi.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/mkrename_gnuabi.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/norename.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/norename.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/norename.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/norename.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/rempitab.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/rempitab.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/rempitab.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/rempitab.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/rename.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/rename.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/rename.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/rename.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleef.pc.in b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleef.pc.in
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleef.pc.in
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleef.pc.in
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefdp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefdp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefdp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefdp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefinline_cuda_header.h.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefinline_cuda_header.h.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefinline_cuda_header.h.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefinline_cuda_header.h.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefinline_header.h.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefinline_header.h.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefinline_header.h.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefinline_header.h.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefld.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefld.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefld.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefld.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleeflibm_footer.h.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleeflibm_footer.h.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleeflibm_footer.h.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleeflibm_footer.h.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleeflibm_header.h.org.in b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleeflibm_header.h.org.in
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleeflibm_header.h.org.in
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleeflibm_header.h.org.in
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefqp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefqp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefqp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefqp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefsimddp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefsimddp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefsimddp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefsimddp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefsimdsp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefsimdsp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefsimdsp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefsimdsp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefsp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefsp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/sleefsp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/sleefsp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/tryvsx3.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/tryvsx3.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/tryvsx3.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/tryvsx3.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/tryvxe2.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/tryvxe2.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/libm/tryvxe2.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/libm/tryvxe2.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/CMakeLists.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/CMakeLists.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/CMakeLists.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/CMakeLists.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/hash_printf.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/hash_printf.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/hash_printf.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/hash_printf.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/qiutcuda.cu b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/qiutcuda.cu
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/qiutcuda.cu
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/qiutcuda.cu
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/qiutsimd.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/qiutsimd.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/qiutsimd.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/qiutsimd.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/qtester.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/qtester.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/qtester.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/qtester.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/qtesterutil.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/qtesterutil.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/qtesterutil.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/qtesterutil.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/qtesterutil.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/qtesterutil.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/qtesterutil.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/qtesterutil.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/qutil.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/qutil.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/qutil.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/qutil.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/tester2printf.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/tester2printf.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/tester2printf.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/tester2printf.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/tester2simdqp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/tester2simdqp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/tester2simdqp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/tester2simdqp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/tester3printf.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/tester3printf.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad-tester/tester3printf.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad-tester/tester3printf.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/CMakeLists.txt b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/CMakeLists.txt
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/CMakeLists.txt
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/CMakeLists.txt
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/qdispatcher.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/qdispatcher.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/qdispatcher.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/qdispatcher.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/qdispscalar.c.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/qdispscalar.c.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/qdispscalar.c.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/qdispscalar.c.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/qdispx2.c.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/qdispx2.c.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/qdispx2.c.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/qdispx2.c.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/qfuncproto.h b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/qfuncproto.h
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/qfuncproto.h
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/qfuncproto.h
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/qmkdisp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/qmkdisp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/qmkdisp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/qmkdisp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/qmkrename.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/qmkrename.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/qmkrename.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/qmkrename.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/rempitabqp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/rempitabqp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/rempitabqp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/rempitabqp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/sleefquad_footer.h.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/sleefquad_footer.h.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/sleefquad_footer.h.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/sleefquad_footer.h.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/sleefquad_header.h.org.in b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/sleefquad_header.h.org.in
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/sleefquad_header.h.org.in
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/sleefquad_header.h.org.in
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/sleefquadinline_cuda_header.h.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/sleefquadinline_cuda_header.h.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/sleefquadinline_cuda_header.h.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/sleefquadinline_cuda_header.h.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/sleefquadinline_footer.h.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/sleefquadinline_footer.h.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/sleefquadinline_footer.h.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/sleefquadinline_footer.h.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/sleefquadinline_header.h.org b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/sleefquadinline_header.h.org
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/sleefquadinline_header.h.org
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/sleefquadinline_header.h.org
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/sleefsimdqp.c b/src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/sleefsimdqp.c
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/src/quad/sleefsimdqp.c
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/src/quad/sleefsimdqp.c
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/aarch64-gcc.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/aarch64-gcc.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/aarch64-gcc.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/aarch64-gcc.cmake
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/aarch64-llvm.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/aarch64-llvm.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/aarch64-llvm.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/aarch64-llvm.cmake
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/armhf-gcc.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/armhf-gcc.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/armhf-gcc.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/armhf-gcc.cmake
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/armhf-llvm.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/armhf-llvm.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/armhf-llvm.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/armhf-llvm.cmake
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/native-gcc.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/native-gcc.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/native-gcc.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/native-gcc.cmake
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/native-llvm.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/native-llvm.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/native-llvm.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/native-llvm.cmake
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/ppc64el-gcc.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/ppc64el-gcc.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/ppc64el-gcc.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/ppc64el-gcc.cmake
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/ppc64el-llvm.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/ppc64el-llvm.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/ppc64el-llvm.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/ppc64el-llvm.cmake
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/riscv64-gcc.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/riscv64-gcc.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/riscv64-gcc.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/riscv64-gcc.cmake
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/riscv64-llvm.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/riscv64-llvm.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/riscv64-llvm.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/riscv64-llvm.cmake
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/s390x-gcc.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/s390x-gcc.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/s390x-gcc.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/s390x-gcc.cmake
diff --git a/src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/s390x-llvm.cmake b/src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/s390x-llvm.cmake
similarity index 100%
rename from src/jdk.incubator.vector/linux/native/libsleef/upstream/toolchains/s390x-llvm.cmake
rename to src/jdk.incubator.vector/unix/native/libsleef/upstream/toolchains/s390x-llvm.cmake