diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-23 13:38:39 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-10-23 13:38:39 +0200 |
| commit | 6b8503baabb5a55dc6e21c80d02ac8729149525e (patch) | |
| tree | d5d5ae95990164e0cee130a629dabb9ba8226a8b /scripts | |
| parent | 9a5898e524437495cfdbcb84521136d2bb7ddf2d (diff) | |
| parent | dac6e90115de9b47295fc5289a26f686bcae4d35 (diff) | |
| download | barebox-6b8503baabb5a55dc6e21c80d02ac8729149525e.tar.gz barebox-6b8503baabb5a55dc6e21c80d02ac8729149525e.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.build | 2 | ||||
| -rw-r--r-- | scripts/mod/modpost.c | 2 | ||||
| -rw-r--r-- | scripts/mod/modpost.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build index c2bab5cb13..f70e2b946d 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -244,7 +244,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(always) # Linker scripts preprocessor (.lds.S -> .lds) # --------------------------------------------------------------------------- quiet_cmd_cpp_lds_S = LDS $@ - cmd_cpp_lds_S = $(CPP) $(cpp_flags) -D__ASSEMBLY__ -o $@ $< + cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -D__ASSEMBLY__ -o $@ $< %.lds: %.lds.S FORCE $(call if_changed_dep,cpp_lds_S) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 08b75b67f1..e99448602c 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1300,7 +1300,7 @@ static void read_symbols(char *modname) * following helper, then compare to the file on disk and * only update the later if anything changed */ -void __attribute__((format(printf, 2, 3))) buf_printf(struct buffer *buf, +void __attribute__((format(__printf__, 2, 3))) buf_printf(struct buffer *buf, const char *fmt, ...) { char tmp[SZ]; diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h index 4156dd34c5..0c23259836 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -94,7 +94,7 @@ struct buffer { int size; }; -void __attribute__((format(printf, 2, 3))) +void __attribute__((format(__printf__, 2, 3))) buf_printf(struct buffer *buf, const char *fmt, ...); void |