diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2017-05-25 16:54:31 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2017-05-26 12:32:02 -0400 |
| commit | b9940f0e0d7b5b4fae497cc80d14948a091d71c2 (patch) | |
| tree | 298cfa831794e04980424932a4a03e8f387f689f /Makefile | |
| parent | f91a49c65d3ea7dd4679b192d8421f621f057304 (diff) | |
| download | kutter-b9940f0e0d7b5b4fae497cc80d14948a091d71c2.tar.gz kutter-b9940f0e0d7b5b4fae497cc80d14948a091d71c2.tar.xz kutter-b9940f0e0d7b5b4fae497cc80d14948a091d71c2.zip | |
build: Avoid linker magic in compile_time_request.c unique id generation
Avoid generating unique ids via memory locations and linker scripts.
Instead, generate them using code produced by buildcommands.py.
Utilize gcc's ability to perform static string comparisons at compile
time to produce a unique id for each unique string.
This fixes a build failure on ARM introduced in 142b92b8. It also
reduces the complexity of the build.
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 21 |
1 files changed, 12 insertions, 9 deletions
@@ -75,21 +75,24 @@ $(OUT)board-link: $(KCONFIG_CONFIG) $(Q)mkdir -p $(OUT)board-generic $(Q)ln -Tsf $(PWD)/src/generic $(OUT)board-generic/board +$(OUT)%.o.ctr: $(OUT)%.o + $(Q)$(OBJCOPY) -j '.compile_time_request' -O binary $^ $@ + +$(OUT)compile_time_request.o: $(patsubst %.c, $(OUT)src/%.o.ctr,$(src-y)) ./scripts/buildcommands.py + @echo " Building $@" + $(Q)cat $(patsubst %.c, $(OUT)src/%.o.ctr,$(src-y)) > $(OUT)klipper.compile_time_request + $(Q)$(PYTHON) ./scripts/buildcommands.py -d $(OUT)klipper.dict $(OUT)klipper.compile_time_request $(OUT)compile_time_request.c + $(Q)$(CC) $(CFLAGS) -c $(OUT)compile_time_request.c -o $@ + $(OUT)declfunc.lds: src/declfunc.lds.S @echo " Precompiling $@" $(Q)$(CPP) $(CPPFLAGS) -D__ASSEMBLY__ $< -o $@ -$(OUT)klipper.o: $(patsubst %.c, $(OUT)src/%.o,$(src-y)) $(OUT)declfunc.lds +$(OUT)klipper.o: $(patsubst %.c, $(OUT)src/%.o,$(src-y)) $(OUT)compile_time_request.o $(OUT)declfunc.lds @echo " Linking $@" - $(Q)$(CC) $(CFLAGS_klipper.o) -Wl,-T,$(OUT)declfunc.lds $(patsubst %.c, $(OUT)src/%.o,$(src-y)) -o $@ - -$(OUT)compile_time_request.o: $(OUT)klipper.o ./scripts/buildcommands.py - @echo " Building $@" - $(Q)$(OBJCOPY) -j '.compile_time_request' -O binary $< $(OUT)klipper.o.compile_time_request - $(Q)$(PYTHON) ./scripts/buildcommands.py -d $(OUT)klipper.dict $(OUT)klipper.o.compile_time_request $(OUT)compile_time_request.c - $(Q)$(CC) $(CFLAGS) -c $(OUT)compile_time_request.c -o $@ + $(Q)$(CC) $(CFLAGS_klipper.o) -Wl,-T,$(OUT)declfunc.lds $(patsubst %.c, $(OUT)src/%.o,$(src-y)) $(OUT)compile_time_request.o -o $@ -$(OUT)klipper.elf: $(OUT)klipper.o $(OUT)compile_time_request.o +$(OUT)klipper.elf: $(OUT)klipper.o @echo " Linking $@" $(Q)$(CC) $(CFLAGS_klipper.elf) $^ -o $@ |