MFC

4 files changed, 26 insertions, 23 deletions

diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm
index 8e3b82e..8348e2a 100644
--- a/sys/conf/Makefile.arm
+++ b/sys/conf/Makefile.arm
@@ -44,7 +44,9 @@ CFLAGS += -mno-thumb-interwork
 .endif
 
 .if empty(DDB_ENABLED)
+.if !defined(WITH_ARM_EABI) && ${COMPILER_TYPE} != "clang"
 CFLAGS += -mno-apcs-frame
+.endif
 .elif defined(WITH_ARM_EABI)
 CFLAGS += -funwind-tables
 .if ${COMPILER_TYPE} == "clang"
@@ -82,44 +84,43 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$M/inckern.S $S/$M/$M/elf_trampoline.c
 	echo "#define KERNNAME \"${KERNEL_KO}.tmp\"" >opt_kernname.h 
 	sed s/${KERNVIRTADDR}/${KERNPHYSADDR}/ ldscript.$M > ldscript.$M.tramp
 	sed s/" + SIZEOF_HEADERS"// ldscript.$M.tramp > \
-	ldscript.$M.tramp.noheader
+	    ldscript.$M.tramp.noheader
 	echo "#include <machine/asm.h>" >tmphack.S
 	echo "ENTRY(_start)" >>tmphack.S
 	echo "bl _startC" >>tmphack.S
 	${OBJCOPY} --strip-symbol '$$d' --strip-symbol '$$a' \
-	-g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp
+	    -g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp
 	eval $$(stat -s ${KERNEL_KO}.tmp) && \
-	echo "#define KERNSIZE $$st_size" >>opt_kernname.h
+	    echo "#define KERNSIZE $$st_size" >>opt_kernname.h
 	${CC} -O -nostdlib -I. -I$S -Xlinker -T -Xlinker ldscript.$M.tramp \
-	tmphack.S $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S \
-	${FILES_CPU_FUNC} -o ${KERNEL_KO}.tramp
+	    tmphack.S $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S \
+	    ${FILES_CPU_FUNC} -o ${KERNEL_KO}.tramp
 	${CC} -O -nostdlib -I. -I$S -Xlinker -T -Xlinker \
-	ldscript.$M.tramp.noheader \
-	tmphack.S $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S \
-	${FILES_CPU_FUNC} -o ${KERNEL_KO}.tramp.noheader 
+	    ldscript.$M.tramp.noheader \
+	    tmphack.S $S/$M/$M/elf_trampoline.c $S/$M/$M/inckern.S \
+	    ${FILES_CPU_FUNC} -o ${KERNEL_KO}.tramp.noheader 
 	${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \
-	${KERNEL_KO}.tramp.bin 
+	    ${KERNEL_KO}.tramp.bin 
 	${OBJCOPY} ${STRIP_FLAGS} ${KERNEL_KO}.tmp 
-	echo "#define KERNNAME \"${KERNEL_KO}.tmp.gz\"" \
-	>opt_kernname.h 
+	echo "#define KERNNAME \"${KERNEL_KO}.tmp.gz\"" >opt_kernname.h 
 	eval $$(stat -s ${KERNEL_KO}.tmp) && \
-	echo "#define KERNSIZE $$st_size" >>opt_kernname.h
+	    echo "#define KERNSIZE $$st_size" >>opt_kernname.h
 	gzip -f9 ${KERNEL_KO}.tmp
 	eval $$(stat -s ${KERNEL_KO}.tmp.gz) && \
-	echo "#define KERNCOMPSIZE $$st_size" >>opt_kernname.h
+	    echo "#define KERNCOMPSIZE $$st_size" >>opt_kernname.h
 	${CC} -O2 -ffreestanding -DKZIP -I. -I$S -c $S/kern/inflate.c -o \
 	    inflate-tramp.o
 	${CC} -O -nostdlib -I. -I$S -Xlinker -T -Xlinker ldscript.$M.tramp \
-	-DKZIP tmphack.S $S/$M/$M/elf_trampoline.c inflate-tramp.o \
-	$S/$M/$M/inckern.S ${FILES_CPU_FUNC} -o ${KERNEL_KO}.gz.tramp
+	    -DKZIP tmphack.S $S/$M/$M/elf_trampoline.c inflate-tramp.o \
+	    $S/$M/$M/inckern.S ${FILES_CPU_FUNC} -o ${KERNEL_KO}.gz.tramp
 	${CC} -O -nostdlib -I. -I$S -Xlinker -T -Xlinker \
-	ldscript.$M.tramp.noheader \
-	-DKZIP tmphack.S $S/$M/$M/elf_trampoline.c inflate-tramp.o \
-	$S/$M/$M/inckern.S ${FILES_CPU_FUNC} -o ${KERNEL_KO}.tramp.noheader
+	    ldscript.$M.tramp.noheader \
+	    -DKZIP tmphack.S $S/$M/$M/elf_trampoline.c inflate-tramp.o \
+	    $S/$M/$M/inckern.S ${FILES_CPU_FUNC} -o ${KERNEL_KO}.tramp.noheader
 	${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \
-	${KERNEL_KO}.gz.tramp.bin
+	    ${KERNEL_KO}.gz.tramp.bin
 	rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \
-	inflate-tramp.o tmphack.S
+	    inflate-tramp.o tmphack.S
 
 MKMODULESENV+=	MACHINE=${MACHINE}
 
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 27c3380..5a5000c 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -986,7 +986,7 @@ options 	DUMMYNET
 # See zero_copy(9) for more details.
 # XXX: The COW based send mechanism is not safe and may result in
 # kernel crashes.
-# XXX: None of the current NIC drivers support disposeable pages.
+# XXX: None of the current NIC drivers support disposable pages.
 options		SOCKET_SEND_COW
 options		SOCKET_RECV_PFLIP
 
diff --git a/sys/conf/files b/sys/conf/files
index b0d772e..04e66a1 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -55,9 +55,9 @@ aic79xx_reg_print.o		optional ahd pci ahd_reg_pretty_print	   \
 # from the specified source (DTS) file: <platform>.dts -> <platform>.dtb
 #
 fdt_dtb_file			optional fdt \
-	compile-with "if [ -f $S/boot/fdt/dts/${FDT_DTS_FILE} ]; then dtc -O dtb -o `echo ${FDT_DTS_FILE} | cut -d. -f1`.dtb -b 0 -p 1024 $S/boot/fdt/dts/${FDT_DTS_FILE}; fi" \
+	compile-with "if [ -f $S/boot/fdt/dts/${FDT_DTS_FILE} ]; then dtc -O dtb -o ${FDT_DTS_FILE:R}.dtb -b 0 -p 1024 $S/boot/fdt/dts/${FDT_DTS_FILE}; fi" \
 	no-obj no-implicit-rule before-depend	\
-	clean		"`echo ${FDT_DTS_FILE} | cut -d. -f1`.dtb"
+	clean		"${FDT_DTS_FILE:R}.dtb"
 fdt_static_dtb.h		optional fdt fdt_dtb_static \
 	compile-with "sh $S/tools/fdt/make_dtbh.sh ${FDT_DTS_FILE} ." \
 	no-obj no-implicit-rule before-depend \
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 33ec0fb..f9e0be8 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -72,11 +72,13 @@ font.h				optional	sc			\
 	clean	"font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8"
 kern/subr_busdma_bufalloc.c	standard
 kern/subr_dummy_vdso_tc.c	standard
+libkern/arm/aeabi_unwind.c	standard
 libkern/arm/divsi3.S		standard
 libkern/arm/ffs.S		standard
 libkern/arm/ldivmod.S		standard
 libkern/arm/ldivmod_helper.c	standard
 libkern/arm/memcpy.S		standard
+libkern/arm/memset.S		standard
 libkern/arm/muldi3.c		standard
 libkern/ashldi3.c		standard
 libkern/ashrdi3.c		standard