Index: sys/arm64/arm64/elf_machdep.c
===================================================================
--- sys/arm64/arm64/elf_machdep.c
+++ sys/arm64/arm64/elf_machdep.c
@@ -136,6 +136,24 @@
 	return (ELF_R_TYPE(r_info) == R_AARCH64_IRELATIVE);
 }
 
+static int
+reloc_instr_imm(Elf32_Addr *where, Elf_Addr val, u_int msb, u_int lsb)
+{
+
+	/* Check bounds: upper bits must be all ones or all zeros. */
+	if ((uint64_t)((int64_t)val >> (msb + 1)) + 1 > 1)
+		return (-1);
+	val >>= lsb;
+	val &= (1 << (msb - lsb + 1)) - 1;
+	*where |= (Elf32_Addr)val;
+	return (0);
+}
+
+/*
+ * Process a relocation.  Support for some static relocations is required
+ * in order for the -zifunc-noplt optimization to work.  Unfortunately, this
+ * means that our kernel and modules may not comply with the AArch64 ABI.
+ */
 static int
 elf_reloc_internal(linker_file_t lf, Elf_Addr relocbase, const void *data,
     int type, int local, elf_lookup_fn lookup)
@@ -171,10 +189,33 @@
 		return (0);
 	}
 
+	error = 0;
 	switch (rtype) {
 	case R_AARCH64_NONE:
 	case R_AARCH64_RELATIVE:
 		break;
+	case R_AARCH64_TSTBR14:
+		error = lookup(lf, symidx, 1, &addr);
+		if (error != 0)
+			return (-1);
+		error = reloc_instr_imm((Elf32_Addr *)where,
+		    addr + addend - (Elf_Addr)where, 15, 2);
+		break;
+	case R_AARCH64_CONDBR19:
+		error = lookup(lf, symidx, 1, &addr);
+		if (error != 0)
+			return (-1);
+		error = reloc_instr_imm((Elf32_Addr *)where,
+		    addr + addend - (Elf_Addr)where, 20, 2);
+		break;
+	case R_AARCH64_JUMP26:
+	case R_AARCH64_CALL26:
+		error = lookup(lf, symidx, 1, &addr);
+		if (error != 0)
+			return (-1);
+		error = reloc_instr_imm((Elf32_Addr *)where,
+		    addr + addend - (Elf_Addr)where, 27, 2);
+		break;
 	case R_AARCH64_ABS64:
 	case R_AARCH64_GLOB_DAT:
 	case R_AARCH64_JUMP_SLOT:
@@ -193,7 +234,7 @@
 		printf("kldload: unexpected relocation type %d\n", rtype);
 		return (-1);
 	}
-	return (0);
+	return (error);
 }
 
 int
Index: sys/sys/elf_common.h
===================================================================
--- sys/sys/elf_common.h
+++ sys/sys/elf_common.h
@@ -927,6 +927,10 @@
 #define	R_AARCH64_PREL64	260	/* PC relative */
 #define	R_AARCH64_PREL32	261	/* PC relative, 32-bit overflow check */
 #define	R_AARCH64_PREL16	262	/* PC relative, 16-bit overflow check */
+#define	R_AARCH64_TSTBR14	279	/* PC relative, branch if (not) zero */
+#define	R_AARCH64_CONDBR19	280	/* PC relative, conditional branch */
+#define	R_AARCH64_JUMP26	282	/* PC relative, branch */
+#define	R_AARCH64_CALL26	283	/* PC relative, call */
 #define	R_AARCH64_COPY		1024	/* Copy data from shared object */
 #define	R_AARCH64_GLOB_DAT	1025	/* Set GOT entry to data address */
 #define	R_AARCH64_JUMP_SLOT	1026	/* Set GOT entry to code address */