diff --git a/releasenotes.md b/releasenotes.md
index b9f6143f4..713b59135 100644
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -6,6 +6,7 @@
 - Support `defer (catch err)`
 - Added `print-input` command argument to print all files used for compilation
 - Allow recursive function definitions as long as they are pointers. #1182
+- Default CPU to native if less than AVX, otherwise use AVX.
 
 ### Fixes
 - Incorrect length passed to scratch buffer printf.
diff --git a/src/build/build.h b/src/build/build.h
index e87b915d8..323a3b1db 100644
--- a/src/build/build.h
+++ b/src/build/build.h
@@ -202,7 +202,7 @@ typedef enum
 	X86VECTOR_SSE = 2,
 	X86VECTOR_AVX = 3,
 	X86VECTOR_AVX512 = 4,
-	X86VECTOR_NATIVE = 5,
+	X86VECTOR_CPU = 5,
 } X86VectorCapability;
 
 typedef enum
diff --git a/src/build/build_internal.h b/src/build/build_internal.h
index 57240dd70..a9fea1b2c 100644
--- a/src/build/build_internal.h
+++ b/src/build/build_internal.h
@@ -59,7 +59,7 @@ static const char *x86_vector_capability[6] = {
 	[X86VECTOR_SSE] = "sse",
 	[X86VECTOR_AVX] = "avx",
 	[X86VECTOR_AVX512] = "avx512",
-	[X86VECTOR_NATIVE] = "native"
+	[X86VECTOR_CPU] = "default"
 };
 
 static const char *optlevels[4] = {
diff --git a/src/build/build_options.c b/src/build/build_options.c
index 219c2e4ba..d91aeea4f 100644
--- a/src/build/build_options.c
+++ b/src/build/build_options.c
@@ -142,7 +142,7 @@ static void usage(void)
 	OUTPUT("");
 	OUTPUT("  --reloc=<option>           - Relocation model: none, pic, PIC, pie, PIE.");
 	OUTPUT("  --x86cpu=<option>          - Set general level of x64 cpu: baseline, ssse3, sse4, avx1, avx2-v1, avx2-v2 (Skylake/Zen1+), avx512 (Icelake/Zen4+), native.");
-	OUTPUT("  --x86vec=<option>          - Set max type of vector use: none, mmx, sse, avx, avx512, native.");
+	OUTPUT("  --x86vec=<option>          - Set max type of vector use: none, mmx, sse, avx, avx512, default.");
 	OUTPUT("  --riscvfloat=<option>      - Set type of RISC-V float support: none, float, double");
 	OUTPUT("  --memory-env=<option>      - Set the memory environment: normal, small, tiny, none.");
 	OUTPUT("  --strip-unused=<yes|no>    - Strip unused code and globals from the output. (default: yes)");
diff --git a/src/compiler/target.c b/src/compiler/target.c
index 5f6d410eb..b3cf0d2bc 100644
--- a/src/compiler/target.c
+++ b/src/compiler/target.c
@@ -738,7 +738,7 @@ static void x64features_limit_from_capability(X86Features *cpu_features, X86Vect
 			x86features_remove_feature(cpu_features, X86_FEAT_AVX512VPOPCNTDQ);
 			break;
 		case X86VECTOR_AVX512:
-		case X86VECTOR_NATIVE:
+		case X86VECTOR_CPU:
 		case X86VECTOR_DEFAULT:
 			break;
 	}
@@ -910,21 +910,16 @@ static inline void target_setup_x64_abi(BuildTarget *target)
 	platform_target.abi = ABI_X64;
 	X86CpuSet cpu_set;
 	platform_target.x64.is_win64 = platform_target.os == OS_TYPE_WIN32;
+	bool is_native = target->arch_os_target == default_target;
+	if (!is_native && target->feature.x86_cpu_set == X86CPU_NATIVE) target->feature.x86_cpu_set = X86CPU_DEFAULT;
 	if (target->feature.x86_cpu_set != X86CPU_DEFAULT)
 	{
 		cpu_set = target->feature.x86_cpu_set;
 	}
 	else
 	{
-		switch (platform_target.os)
-		{
-			case OS_TYPE_MACOSX:
-				cpu_set = X86CPU_AVX1;
-				break;
-			default:
-				cpu_set = X86CPU_SSSE3;
-				break;
-		}
+		cpu_set = is_native ? x64_cpu_default() : X86CPU_AVX1;
+		if (cpu_set > X86CPU_AVX1) cpu_set = X86CPU_AVX1;
 		INFO_LOG("Set default CPU as %s\n", x86_cpu_set[cpu_set]);
 	}
 
diff --git a/test/test_suite/expressions/elvis.c3t b/test/test_suite/expressions/elvis.c3t
index 0f64a0e3d..f9a734800 100644
--- a/test/test_suite/expressions/elvis.c3t
+++ b/test/test_suite/expressions/elvis.c3t
@@ -1,3 +1,4 @@
+// #target: macos-x64
 fn int* elvis(int *x, int *y)
 {
     return x ?: y;