svn commit: r187127 - in projects/vap7/sys: . arm/arm conf
contrib/pf dev dev/ath/ath_hal dev/ath/ath_hal/ar5210
dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212
dev/ath/ath_hal/ar5312 dev/ath/ath_hal...
Sam Leffler
sam at FreeBSD.org
Mon Jan 12 20:57:26 PST 2009
Author: sam
Date: Tue Jan 13 04:57:25 2009
New Revision: 187127
URL: http://svn.freebsd.org/changeset/base/187127
Log:
mfc the bits needed to make trampoline builds work
Modified:
projects/vap7/sys/ (props changed)
projects/vap7/sys/arm/arm/elf_trampoline.c
projects/vap7/sys/conf/Makefile.arm
projects/vap7/sys/contrib/pf/ (props changed)
projects/vap7/sys/dev/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5210/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5211/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5212/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5312/ (props changed)
projects/vap7/sys/dev/ath/ath_hal/ar5416/ (props changed)
projects/vap7/sys/dev/cxgb/ (props changed)
Modified: projects/vap7/sys/arm/arm/elf_trampoline.c
==============================================================================
--- projects/vap7/sys/arm/arm/elf_trampoline.c Tue Jan 13 04:56:41 2009 (r187126)
+++ projects/vap7/sys/arm/arm/elf_trampoline.c Tue Jan 13 04:57:25 2009 (r187127)
@@ -33,8 +33,6 @@ __FBSDID("$FreeBSD$");
#include <machine/cpufunc.h>
#include <machine/armreg.h>
-#include <stdlib.h>
-
/*
* Since we are compiled outside of the normal kernel build process, we
* need to include opt_global.h manually.
@@ -47,6 +45,7 @@ extern char kernel_end[];
extern void *_end;
+void _start(void);
void __start(void);
void __startC(void);
Modified: projects/vap7/sys/conf/Makefile.arm
==============================================================================
--- projects/vap7/sys/conf/Makefile.arm Tue Jan 13 04:56:41 2009 (r187126)
+++ projects/vap7/sys/conf/Makefile.arm Tue Jan 13 04:57:25 2009 (r187127)
@@ -37,6 +37,10 @@ SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscri
CC += -mbig-endian
SYSTEM_LD += -EB
LD += -EB
+.else
+CC += -mlittle-endian
+SYSTEM_LD += -EL
+LD += -EL
.endif
@@ -65,6 +69,8 @@ FILES_CPU_FUNC = $S/$M/$M/cpufunc_asm_ar
$S/$M/$M/cpufunc_asm_sa1.S $S/$M/$M/cpufunc_asm_arm10.S \
$S/$M/$M/cpufunc_asm_xscale.S $S/$M/$M/cpufunc_asm.S \
$S/$M/$M/cpufunc_asm_xscale_c3.S $S/$M/$M/cpufunc_asm_armv5_ec.S
+KERNEL_EXTRA=trampoline
+KERNEL_EXTRA_INSTALL=kernel.gz.tramp
trampoline: ${KERNEL_KO}.tramp
${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
@@ -78,10 +84,11 @@ ${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. -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 \
@@ -94,11 +101,12 @@ ${KERNEL_KO}.tramp: ${KERNEL_KO} $S/$M/$
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 \
More information about the svn-src-projects
mailing list