diff --git a/arch/sparc/core/offsets/offsets.c b/arch/sparc/core/offsets/offsets.c
index 59598e4fb10b2d2..0b6c172e73470ba 100644
--- a/arch/sparc/core/offsets/offsets.c
+++ b/arch/sparc/core/offsets/offsets.c
@@ -22,31 +22,20 @@ GEN_OFFSET_SYM(_callee_saved_t, psr);
 
 GEN_OFFSET_SYM(_callee_saved_t, l0_and_l1);
 GEN_OFFSET_SYM(_callee_saved_t, l2);
-GEN_OFFSET_SYM(_callee_saved_t, l3);
 GEN_OFFSET_SYM(_callee_saved_t, l4);
-GEN_OFFSET_SYM(_callee_saved_t, l5);
 GEN_OFFSET_SYM(_callee_saved_t, l6);
-GEN_OFFSET_SYM(_callee_saved_t, l7);
 GEN_OFFSET_SYM(_callee_saved_t, i0);
-GEN_OFFSET_SYM(_callee_saved_t, i1);
 GEN_OFFSET_SYM(_callee_saved_t, i2);
-GEN_OFFSET_SYM(_callee_saved_t, i3);
 GEN_OFFSET_SYM(_callee_saved_t, i4);
-GEN_OFFSET_SYM(_callee_saved_t, i5);
 GEN_OFFSET_SYM(_callee_saved_t, i6);
-GEN_OFFSET_SYM(_callee_saved_t, i7);
 GEN_OFFSET_SYM(_callee_saved_t, o6);
-GEN_OFFSET_SYM(_callee_saved_t, o7);
 
 /* esf member offsets */
 GEN_OFFSET_SYM(z_arch_esf_t, out);
 GEN_OFFSET_SYM(z_arch_esf_t, global);
-GEN_OFFSET_SYM(z_arch_esf_t, pc);
 GEN_OFFSET_SYM(z_arch_esf_t, npc);
 GEN_OFFSET_SYM(z_arch_esf_t, psr);
-GEN_OFFSET_SYM(z_arch_esf_t, wim);
 GEN_OFFSET_SYM(z_arch_esf_t, tbr);
-GEN_OFFSET_SYM(z_arch_esf_t, y);
 GEN_ABSOLUTE_SYM(__z_arch_esf_t_SIZEOF, STACK_ROUND_UP(sizeof(z_arch_esf_t)));
 
 /*
diff --git a/arch/sparc/include/offsets_short_arch.h b/arch/sparc/include/offsets_short_arch.h
index 074f82ae71f5b15..c53f2b3705beaf3 100644
--- a/arch/sparc/include/offsets_short_arch.h
+++ b/arch/sparc/include/offsets_short_arch.h
@@ -18,51 +18,27 @@
 #define _thread_offset_to_l2 \
 	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_l2_OFFSET)
 
-#define _thread_offset_to_l3 \
-	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_l3_OFFSET)
-
 #define _thread_offset_to_l4 \
 	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_l4_OFFSET)
 
-#define _thread_offset_to_l5 \
-	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_l5_OFFSET)
-
 #define _thread_offset_to_l6 \
 	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_l6_OFFSET)
 
-#define _thread_offset_to_l7 \
-	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_l7_OFFSET)
-
 #define _thread_offset_to_i0 \
 	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_i0_OFFSET)
 
-#define _thread_offset_to_i1 \
-	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_i1_OFFSET)
-
 #define _thread_offset_to_i2 \
 	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_i2_OFFSET)
 
-#define _thread_offset_to_i3 \
-	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_i3_OFFSET)
-
 #define _thread_offset_to_i4 \
 	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_i4_OFFSET)
 
-#define _thread_offset_to_i5 \
-	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_i5_OFFSET)
-
 #define _thread_offset_to_i6 \
 	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_i6_OFFSET)
 
-#define _thread_offset_to_i7 \
-	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_i7_OFFSET)
-
 #define _thread_offset_to_o6 \
 	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_o6_OFFSET)
 
-#define _thread_offset_to_o7 \
-	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_o7_OFFSET)
-
 #define _thread_offset_to_psr \
 	(___thread_t_callee_saved_OFFSET + ___callee_saved_t_psr_OFFSET)