remove inlines,some other files

@@ -150,25 +150,17 @@
 
 #
 #       locore.o is special. It must be the first file relocated so that it
 #       it is relocated just where its name implies.
 #
-SPECIAL_OBJS_32 +=              \
+SPECIAL_OBJS +=                 \
         locore.o                \
         fast_trap_asm.o         \
         interrupt.o             \
-        syscall_asm.o
-
-SPECIAL_OBJS_64 +=              \
-        locore.o                \
-        fast_trap_asm.o         \
-        interrupt.o             \
-        syscall_asm_amd64.o     \
+        syscall_asm.o           \
         kpti_trampolines.o
 
-SPECIAL_OBJS += $(SPECIAL_OBJS_$(CLASS))
-
 #
 # Objects that get compiled into the identity mapped PT_LOAD section of unix
 # to handle the earliest part of booting.
 #
 DBOOT_OBJS_32 =

@@ -269,11 +261,10 @@
         locore.o                \
         mpcore.o                \
         sseblk.o                \
         swtch.o                 \
         syscall_asm.o           \
-        syscall_asm_amd64.o     \
         kpti_trampolines.o      \
         cpr_wakecode.o
 
 CPR_IMPL_OBJS   = cpr_impl.o    cpr_wakecode.o