Mirror
/
klipper-dgus
mirror of https://github.com/Desuuuu/klipper.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

build: Add __visible to variables in compile_time_request.c 

Add __visible to generated code in compile_time_request.c so that the
main code can be compiled with -fwhole-program.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2017-05-07 17:02:40 -04:00
parent 450c14b286
commit 233adfe660
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -38,7 +38,7 @@ CFLAGS := -I$(OUT) -Isrc -I$(OUT)board-generic/ -O2 -MD -g \
CFLAGS += -flto -fwhole-program -fno-use-linker-plugin CFLAGS += -flto -fwhole-program -fno-use-linker-plugin
CFLAGS_klipper.o = $(CFLAGS) -Wl,-r -nostdlib CFLAGS_klipper.o = $(CFLAGS) -Wl,-r -nostdlib
CFLAGS_klipper.elf = $(CFLAGS) -Wl,--gc-sections -fno-whole-program CFLAGS_klipper.elf = $(CFLAGS) -Wl,--gc-sections
CPPFLAGS = -I$(OUT) -P -MD -MT $@ CPPFLAGS = -I$(OUT) -P -MD -MT $@

14
scripts/buildcommands.py
View File

@ -15,6 +15,7 @@ FILEHEADER = """
#include "board/pgm.h" #include "board/pgm.h"
#include "command.h" #include "command.h"
#include "compiler.h"
""" """
def error(msg): def error(msg):
@ -68,7 +69,7 @@ def build_parsers(parsers, msg_to_id, all_param_types):
parsercode = build_parser(parser, 0, all_param_types) parsercode = build_parser(parser, 0, all_param_types)
pcode.append("{%s\n}, " % (parsercode,)) pcode.append("{%s\n}, " % (parsercode,))
fmt = """ fmt = """
const struct command_encoder command_encoders[] PROGMEM = { const struct command_encoder command_encoders[] PROGMEM __visible = {
%s %s
}; };
""" """
@ -101,7 +102,7 @@ def build_commands(cmd_by_id, messages_by_name, all_param_types):
index.append(" &%s," % (parsername,)) index.append(" &%s," % (parsername,))
parser = msgproto.MessageFormat(msgid, msg) parser = msgproto.MessageFormat(msgid, msg)
parsercode = build_parser(parser, 1, all_param_types) parsercode = build_parser(parser, 1, all_param_types)
parsers.append("const struct command_parser %s PROGMEM = {" parsers.append("const struct command_parser %s PROGMEM __visible = {"
" %s\n .flags=%s,\n .func=%s\n};" % ( " %s\n .flags=%s,\n .func=%s\n};" % (
parsername, parsercode, flags, funcname)) parsername, parsercode, flags, funcname))
index = "\n".join(index) index = "\n".join(index)
@ -112,11 +113,11 @@ def build_commands(cmd_by_id, messages_by_name, all_param_types):
%s %s
const struct command_parser * const command_index[] PROGMEM = { const struct command_parser * const command_index[] PROGMEM __visible = {
%s %s
}; };
const uint8_t command_index_size PROGMEM = ARRAY_SIZE(command_index); const uint8_t command_index_size PROGMEM __visible = ARRAY_SIZE(command_index);
""" """
return fmt % (externs, '\n'.join(parsers), index) return fmt % (externs, '\n'.join(parsers), index)
@ -146,11 +147,12 @@ def build_identify(cmd_by_id, msg_to_id, responses, static_strings
out.append('\n ') out.append('\n ')
out.append(" 0x%02x," % (ord(zdata[i]),)) out.append(" 0x%02x," % (ord(zdata[i]),))
fmt = """ fmt = """
const uint8_t command_identify_data[] PROGMEM = {%s const uint8_t command_identify_data[] PROGMEM __visible = {%s
}; };
// Identify size = %d (%d uncompressed) // Identify size = %d (%d uncompressed)
const uint32_t command_identify_size PROGMEM = ARRAY_SIZE(command_identify_data); const uint32_t command_identify_size PROGMEM __visible
= ARRAY_SIZE(command_identify_data);
""" """
return data, fmt % (''.join(out), len(zdata), len(data)) return data, fmt % (''.join(out), len(zdata), len(data))