ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-29 15:29:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

muen: Build sinfo code as static sinfo-muen library

Browse Source 
And link it with core and virtualbox.
This commit is contained in:
Reto Buerki 2017-01-17 17:13:06 +01:00 committed by Norman Feske
parent eec2cb34f8
commit 0938d69192
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
repos/base-hw/lib/mk/spec/muen/base-hw-common.mk
View File

@ -1,5 +0,0 @@
SRC_CC += sinfo.cc
vpath %.cc $(REP_DIR)/src/base/muen
include $(REP_DIR)/lib/mk/base-hw-common.mk

4
repos/base-hw/lib/mk/spec/muen/sinfo-muen.mk Normal file
View File

@ -0,0 +1,4 @@
SRC_CC = sinfo.cc
INC_DIR += $(REP_DIR)/include/spec/x86_64/muen
vpath sinfo.cc $(REP_DIR)/src/lib/muen

2
repos/base-hw/lib/mk/spec/x86_64/core-hw-muen_on.mk
View File

@ -20,5 +20,7 @@ SRC_CC += spec/x86_64/muen/kernel/vm.cc
SRC_CC += spec/x86_64/muen/platform_services.cc SRC_CC += spec/x86_64/muen/platform_services.cc
SRC_CC += kernel/vm_thread_on.cc SRC_CC += kernel/vm_thread_on.cc
LIBS += sinfo-muen
# include less specific configuration # include less specific configuration
include $(REP_DIR)/lib/mk/spec/x86_64/core-hw.inc include $(REP_DIR)/lib/mk/spec/x86_64/core-hw.inc

6
repos/base-hw/src/base/muen/musinfo.h → repos/base-hw/src/lib/muen/musinfo.h
View File

@ -11,8 +11,8 @@
* under the terms of the GNU General Public License version 2. * under the terms of the GNU General Public License version 2.
*/ */
#ifndef _BASE__MUEN__MUSINFO_H_ #ifndef _LIB__MUEN__MUSINFO_H_
#define _BASE__MUEN__MUSINFO_H_ #define _LIB__MUEN__MUSINFO_H_
#include <base/stdint.h> #include <base/stdint.h>
@ -82,4 +82,4 @@ struct subject_info_type {
struct dev_info_type dev_info[MAX_RESOURCE_COUNT]; struct dev_info_type dev_info[MAX_RESOURCE_COUNT];
} __attribute__((packed, aligned (8))); } __attribute__((packed, aligned (8)));
#endif /* _BASE__MUEN__MUSINFO_H_ */ #endif /* _LIB__MUEN__MUSINFO_H_ */

0
repos/base-hw/src/base/muen/sinfo.cc → repos/base-hw/src/lib/muen/sinfo.cc
View File

2
repos/ports/lib/mk/spec/muen/virtualbox-muen.mk
View File

@ -6,7 +6,7 @@ include $(REP_DIR)/lib/mk/virtualbox-common.inc
# #
VBOX_CC_OPT += -include base/log.h VBOX_CC_OPT += -include base/log.h
LIBS += stdcxx LIBS += stdcxx sinfo-muen
SRC_CC = pgm.cc sup.cc SRC_CC = pgm.cc sup.cc