diff options
| author | cognet <cognet@FreeBSD.org> | 2008-08-04 14:38:38 +0000 |
|---|---|---|
| committer | cognet <cognet@FreeBSD.org> | 2008-08-04 14:38:38 +0000 |
| commit | e73d09d9877ecca98e779ecc9270672be252446c (patch) | |
| tree | 9835f129e002142879671b4a97f4e2260ac96e58 /sys/conf | |
| parent | 7a8b05ad6311ae8c9656d73a60f69c089c3000a9 (diff) | |
| download | FreeBSD-src-e73d09d9877ecca98e779ecc9270672be252446c.zip FreeBSD-src-e73d09d9877ecca98e779ecc9270672be252446c.tar.gz | |
We need -I$S to compile the elf trampoline.
MFC after: 3 days
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/Makefile.arm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/conf/Makefile.arm b/sys/conf/Makefile.arm index 6bb5e00..da77634 100644 --- a/sys/conf/Makefile.arm +++ b/sys/conf/Makefile.arm @@ -91,10 +91,11 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$M/inckern.S $S/$M/$M/elf_trampoline.c -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. -Xlinker -T -Xlinker ldscript.$M.tramp \ + ${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. -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \ + ${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 \ @@ -107,11 +108,12 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$M/inckern.S $S/$M/$M/elf_trampoline.c gzip -9 ${KERNEL_KO}.tmp eval $$(stat -s ${KERNEL_KO}.tmp.gz) && \ echo "#define KERNCOMPSIZE $$st_size" >>opt_kernname.h - ${CC} -O2 -DKZIP -I. -c $S/kern/inflate.c -o inflate-tramp.o - ${CC} -O -nostdlib -I. -Xlinker -T -Xlinker ldscript.$M.tramp \ + ${CC} -O2 -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. -Xlinker -T -Xlinker ldscript.$M.tramp.noheader \ + ${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 \ |
