M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

runtime: fix generation of service_table.h

This commit is contained in:
Sebastien Bourdeauducq 2015-11-04 11:22:56 +08:00
parent 3404a6565b
commit 087c2fd078
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,7 +5,6 @@ __pycache__
*.bin *.bin
*.elf *.elf
*.fbi *.fbi
artiq/runtime/service_table.h
doc/manual/_build doc/manual/_build
/build /build
/dist /dist

7
artiq/runtime/Makefile
View File

@ -6,7 +6,7 @@ PYTHON ?= python3
OBJECTS := isr.o flash_storage.o clock.o rtiocrg.o elf_loader.o services.o session.o log.o test_mode.o kloader.o bridge_ctl.o mailbox.o ksupport_data.o net_server.o moninj.o main.o OBJECTS := isr.o flash_storage.o clock.o rtiocrg.o elf_loader.o services.o session.o log.o test_mode.o kloader.o bridge_ctl.o mailbox.o ksupport_data.o net_server.o moninj.o main.o
OBJECTS_KSUPPORT := ksupport.o exception_jmp.o exceptions.o mailbox.o bridge.o rtio.o ttl.o dds.o OBJECTS_KSUPPORT := ksupport.o exception_jmp.o exceptions.o mailbox.o bridge.o rtio.o ttl.o dds.o
CFLAGS += -I$(LIBLWIP_DIRECTORY)/../lwip/src/include -I$(LIBLWIP_DIRECTORY) CFLAGS += -I$(LIBLWIP_DIRECTORY)/../lwip/src/include -I$(LIBLWIP_DIRECTORY) -I.
all: runtime.bin runtime.fbi all: runtime.bin runtime.fbi
@ -45,7 +45,10 @@ ksupport_data.o: ksupport.bin
service_table.h: ksupport.elf $(RUNTIME_DIRECTORY)/gen_service_table.py service_table.h: ksupport.elf $(RUNTIME_DIRECTORY)/gen_service_table.py
@echo " GEN " $@ && $(PYTHON) $(RUNTIME_DIRECTORY)/gen_service_table.py ksupport.elf > $@ @echo " GEN " $@ && $(PYTHON) $(RUNTIME_DIRECTORY)/gen_service_table.py ksupport.elf > $@
services.c: service_table.h $(RUNTIME_DIRECTORY)/services.c: service_table.h
services.o: $(RUNTIME_DIRECTORY)/services.c service_table.h
$(compile)
main.o: $(RUNTIME_DIRECTORY)/main.c main.o: $(RUNTIME_DIRECTORY)/main.c
$(compile) $(compile)

2
artiq/runtime/services.c
View File

@ -8,7 +8,7 @@
#include "exceptions.h" #include "exceptions.h"
#include "services.h" #include "services.h"
#include "service_table.h" #include <service_table.h>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wimplicit-int" #pragma GCC diagnostic ignored "-Wimplicit-int"