do not link klib at native
This commit is contained in:
parent
27f4a456a1
commit
52e593fbd2
|
@ -12,11 +12,16 @@ $(shell mkdir -p $(DST_DIR))
|
|||
|
||||
include $(AM_HOME)/Makefile.compile
|
||||
|
||||
LINK_FILES = $(AM_HOME)/am/build/am-$(ARCH).a $(OBJS)
|
||||
|
||||
ifneq ($(ARCH), native)
|
||||
LINK_FILES += $(AM_HOME)/klib/build/klib-$(ARCH).a
|
||||
endif
|
||||
|
||||
.PHONY: app run clean
|
||||
app: $(OBJS)
|
||||
@cd $(AM_HOME) && make ARCH=$(ARCH)
|
||||
@$(AM_HOME)/am/arch/$(ARCH)/img/build $(BINARY) $(AM_HOME)/am/build/am-$(ARCH).a $(AM_HOME)/klib/build/klib-$(ARCH).a $(OBJS)
|
||||
|
||||
@$(AM_HOME)/am/arch/$(ARCH)/img/build $(BINARY) $(LINK_FILES)
|
||||
run: app
|
||||
@$(AM_HOME)/am/arch/$(ARCH)/img/run $(BINARY)
|
||||
|
||||
|
|
|
@ -94,7 +94,7 @@ int main() {
|
|||
pass &= succ;
|
||||
|
||||
ulong cur = score(bench, tsc, msec);
|
||||
printk("\n min time: %dK cycles in %d ms [%d]\n", tsc, msec, cur);
|
||||
printk("\n min time: %dK cycles in %d ms [%d]\n", (uint)tsc, (uint)msec, (uint)cur);
|
||||
|
||||
bench_score += cur;
|
||||
}
|
||||
|
@ -103,7 +103,7 @@ int main() {
|
|||
bench_score /= sizeof(benchmarks) / sizeof(benchmarks[0]);
|
||||
|
||||
printk("==================================================\n");
|
||||
printk("MicroBench %s %d Marks\n", pass ? "PASS" : "FAIL", bench_score);
|
||||
printk("MicroBench %s %d Marks\n", pass ? "PASS" : "FAIL", (uint)bench_score);
|
||||
printk(" vs. %d Marks (%s)\n", REF_SCORE, REF_CPU);
|
||||
|
||||
_halt(0);
|
||||
|
|
|
@ -42,9 +42,10 @@ void srand(unsigned int seed);
|
|||
int rand();
|
||||
|
||||
// stdio.h
|
||||
int printk(const char* fmt, ...);
|
||||
int printf(const char* fmt, ...);
|
||||
int sprintf(char* s, char* format, ...);
|
||||
int snprintf(char* s, size_t n, const char* format, ...);
|
||||
#define printk printf
|
||||
|
||||
// assert.h
|
||||
#ifdef NDEBUG
|
||||
|
|
|
@ -85,7 +85,7 @@ int vprintk(char* out,const char* fmt,va_list ap){
|
|||
return 0;
|
||||
}
|
||||
|
||||
int printk(const char* fmt,...){
|
||||
int printf(const char* fmt,...){
|
||||
va_list ap;
|
||||
va_start(ap,fmt);
|
||||
int r=vprintk(0,fmt,ap);
|
||||
|
|
Loading…
Reference in New Issue