Include the tool name for toolchain variables when using CROSS_TOOLCHAIN.

[jhb]

Summary

Previously variables such as AS, LD, etc. were only set to the path
but not the tool itself due to a typo.

Test Plan

• cross-building base/gcc after updating it to work with freebsd-gcc6 fails since base/gcc now uses these variables to set the corresponding <foo>_FOR_TARGET variables

[jhb]

Ping. This is only relevant when CROSS_TOOLCHAIN is set, so should be low risk. It is a dependency of D22594.

[jhb]

Ping @bapt

head/Mk/bsd.port.mk

 
 #include <vm/vm.h>
 #include <vm/pmap.h>
 #include <vm/vm_param.h>
 
 #include <machine/elf.h>
 #include <machine/md_var.h>
 
-static const char *riscv_machine_arch(struct proc *p);
-
 u_long elf_hwcap;
 
 static struct sysentvec elf64_freebsd_sysvec = {
         .sv_size        = SYS_MAXSYSCALL,
         .sv_table       = sysent,
         .sv_fixup        = __elfN(freebsd_fixup),
         .sv_sendsig     = sendsig,
         .sv_sigcode     = sigcode,
static struct sysentvec elf64_freebsd_sysvec = {
         .sv_fetch_syscall_args = cpu_fetch_syscall_args,
         .sv_syscallnames = syscallnames,
         .sv_shared_page_base = 0,        /* Filled in during boot. */
         .sv_shared_page_len = PAGE_SIZE,
         .sv_schedtail   = NULL,
         .sv_thread_detach = NULL,
         .sv_trap        = NULL,
         .sv_hwcap       = &elf_hwcap,
-        .sv_machine_arch = riscv_machine_arch,
         .sv_onexec_old  = exec_onexec_old,
         .sv_onexit      = exit_onexit,
         .sv_regset_begin = SET_BEGIN(__elfN(regset)),
         .sv_regset_end  = SET_LIMIT(__elfN(regset)),
 };
 INIT_SYSENTVEC(elf64_sysvec, &elf64_freebsd_sysvec);
-
-static const char *
-riscv_machine_arch(struct proc *p)
-{
-
-        if ((p->p_elf_flags & EF_RISCV_FLOAT_ABI_MASK) ==
-            EF_RISCV_FLOAT_ABI_SOFT)
-                return (MACHINE_ARCH "sf");
-        return (MACHINE_ARCH);
-}
 
 static Elf64_Brandinfo freebsd_brand_info = {
         .brand          = ELFOSABI_FREEBSD,
         .machine        = EM_RISCV,
         .compat_3_brand = "FreeBSD",
         .interp_path    = "/libexec/ld-elf.so.1",
         .sysvec         = &elf64_freebsd_sysvec,
         .interp_newpath = NULL,