svn commit: r306639 - head/sys/conf

[Andrew Turner]

Author: andrew
Date: Mon Oct  3 14:18:13 2016
New Revision: 306639
URL: https://svnweb.freebsd.org/changeset/base/306639

Log:
  Split the compiler command line for building the arm elf trampoline code
  so common parts of the command are on separate lines.
  
  Sponsored by:	ABT Systems Ltd

Modified:
  head/sys/conf/Makefile.arm

Modified: head/sys/conf/Makefile.arm
==============================================================================
--- head/sys/conf/Makefile.arm	Mon Oct  3 14:07:15 2016	(r306638)
+++ head/sys/conf/Makefile.arm	Mon Oct  3 14:18:13 2016	(r306639)
@@ -90,13 +90,20 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$
 	    -g --strip-symbol '$$t' ${FULLKERNEL} ${KERNEL_KO}.tmp
 	eval $$(stat -s ${KERNEL_KO}.tmp) && \
 	    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
-	${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 
+	${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
+	${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 
 	${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \
 	    ${KERNEL_KO}.tramp.bin 
 	${OBJCOPY} ${STRIP_FLAGS} ${KERNEL_KO}.tmp 
@@ -106,15 +113,28 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$
 	gzip -f9 ${KERNEL_KO}.tmp
 	eval $$(stat -s ${KERNEL_KO}.tmp.gz) && \
 	    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
-	${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
+	${CC} -O2 -ffreestanding -I. -I$S -c \
+	    -DKZIP \
+	    $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
+	${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
 	${OBJCOPY} -S -O binary ${KERNEL_KO}.tramp.noheader \
 	    ${KERNEL_KO}.gz.tramp.bin
 	rm ${KERNEL_KO}.tmp.gz ${KERNEL_KO}.tramp.noheader opt_kernname.h \