aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2010-07-12 21:08:35 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2010-07-12 21:08:35 +0000
commit588697d47836ceb0846a5eb15e821c7479f0d8a7 (patch)
tree7e5eea41970307d5954d4f124e550d863ca7c074 /sys/conf
parent05f81eb67de2bb2de5ee5c8e86aa8289d356b0ba (diff)
downloadsrc-588697d47836ceb0846a5eb15e821c7479f0d8a7.tar.gz
src-588697d47836ceb0846a5eb15e821c7479f0d8a7.zip
Move i386-inherited logic of building ACPI headers for acpi_wakeup.c into
better places and remove intermediate makefile and shell scripts. This makes parallel kernel build little bit safer for amd64.
Notes
Notes: svn path=/head/; revision=209957
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/files.amd6429
1 files changed, 19 insertions, 10 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index cd273ce8707d..3f7e284bcba0 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -70,17 +70,26 @@ hptrr_lib.o optional hptrr \
amd64/acpica/OsdEnvironment.c optional acpi
amd64/acpica/acpi_machdep.c optional acpi
amd64/acpica/acpi_switch.S optional acpi
-acpi_wakecode.h optional acpi \
- dependency "$S/amd64/acpica/acpi_wakecode.S assym.s" \
- compile-with "${MAKE} -f $S/amd64/acpica/Makefile ${.TARGET} MAKESRCPATH=$S/amd64/acpica" \
+acpi_wakecode.o optional acpi \
+ dependency "$S/amd64/acpica/acpi_wakecode.S assym.s" \
+ compile-with "${NORMAL_S}" \
no-obj no-implicit-rule before-depend \
- clean "acpi_wakecode.h acpi_wakecode.o acpi_wakecode.bin"
-#
-acpi_wakedata.h optional acpi \
- dependency "$S/amd64/acpica/acpi_wakecode.S assym.s" \
- compile-with "${MAKE} -f $S/amd64/acpica/Makefile ${.TARGET} MAKESRCPATH=$S/amd64/acpica" \
- no-obj no-implicit-rule before-depend \
- clean "acpi_wakedata.h acpi_wakecode.o acpi_wakecode.bin"
+ clean "acpi_wakecode.o"
+acpi_wakecode.bin optional acpi \
+ dependency "acpi_wakecode.o" \
+ compile-with "objcopy -S -O binary acpi_wakecode.o ${.TARGET}" \
+ no-obj no-implicit-rule before-depend \
+ clean "acpi_wakecode.bin"
+acpi_wakecode.h optional acpi \
+ dependency "acpi_wakecode.bin" \
+ compile-with "file2c -sx 'static char wakecode[] = {' '};' < acpi_wakecode.bin > ${.TARGET}" \
+ no-obj no-implicit-rule before-depend \
+ clean "acpi_wakecode.h"
+acpi_wakedata.h optional acpi \
+ dependency "acpi_wakecode.o" \
+ compile-with 'nm -n --defined-only acpi_wakecode.o | while read offset dummy what; do echo "#define $${what} 0x$${offset}"; done > ${.TARGET}' \
+ no-obj no-implicit-rule before-depend \
+ clean "acpi_wakedata.h"
#
amd64/acpica/acpi_wakeup.c optional acpi
amd64/acpica/madt.c optional acpi