denshooter/genode
1
0
Fork 0
mirror of https://github.com/mmueller41/genode.git synced 2026-01-21 20:42:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

core: install core-<kernel>.o at bin/

Browse Source 
By installing the core object to bin/, we follow the same convention as
for regular binaries. This, in turn, enables us to ship core in a
regular binary archive. The patch also adjusts the run tool to pick up
the core object from bin/ for the final linking stage.
This commit is contained in:
Norman Feske
2017-04-05 10:18:35 +02:00
committed by Christian Helmuth
parent 60cda87b5c
commit 8c4a2a48ca
16 changed files with 27 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tool/run/boot_dir/fiasco
View File

@@ -1,5 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-fiasco.lib.so" }
proc binary_name_core_o { } { return "fiasco/core.o" }
proc binary_name_core_o { } { return "core-fiasco.o" }
proc binary_name_timer { } { return "fiasco_timer_drv" }

2
tool/run/boot_dir/foc
View File

@@ -1,5 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-foc.lib.so" }
proc binary_name_core_o { } { return "foc/core.o" }
proc binary_name_core_o { } { return "core-foc.o" }
proc binary_name_timer { } { return "foc_timer_drv" }

4
tool/run/boot_dir/hw
View File

@@ -1,5 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-hw.lib.so" }
proc binary_name_core_o { } { return "hw/core.o" }
proc binary_name_core_o { } { return "core-hw.o" }
proc binary_name_timer { } { return "hw_timer_drv" }
@@ -53,7 +53,7 @@ proc run_boot_dir {binaries} {
puts "core link address is [core_link_address]"
set core_obj core/hw/core.o
set core_obj core/hw/core-hw.o
set bootstrap_obj bootstrap/hw/bootstrap.o
# create core and bootstrap binary without modules for debugging

2
tool/run/boot_dir/nova
View File

@@ -1,5 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-nova.lib.so" }
proc binary_name_core_o { } { return "nova/core.o" }
proc binary_name_core_o { } { return "core-nova.o" }
proc binary_name_timer { } { return "nova_timer_drv" }

4
tool/run/boot_dir/okl4
View File

@@ -1,6 +1,6 @@
proc binary_name_ld_lib_so { } { return "ld-okl4.lib.so" }
proc binary_name_core_o { } { return "okl4/core.o" }
proc binary_name_timer { } { return "pit_timer_drv" }
proc binary_name_core_o { } { return "core-okl4.o" }
proc binary_name_timer { } { return "pit_timer_drv" }
##

2
tool/run/boot_dir/pistachio
View File

@@ -1,5 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-pistachio.lib.so" }
proc binary_name_core_o { } { return "pistachio/core.o" }
proc binary_name_core_o { } { return "core-pistachio.o" }
proc binary_name_timer { } { return "pit_timer_drv" }

2
tool/run/boot_dir/sel4
View File

@@ -1,5 +1,5 @@
proc binary_name_ld_lib_so { } { return "ld-sel4.lib.so" }
proc binary_name_core_o { } { return "sel4/core.o" }
proc binary_name_core_o { } { return "core-sel4.o" }
proc binary_name_timer { } { return "pit_timer_drv" }

2
tool/run/run
View File

@@ -776,7 +776,7 @@ proc build_core_image {binaries} {
copy_and_strip_genode_binaries_to_run_dir $modules
lappend modules "config"
set core_obj core/[kernel_specific_binary core.o]
set core_obj bin/[kernel_specific_binary core.o]
# create core binary without modules for debugging
build_core $core_obj {} [run_dir].core [core_link_address]