vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* gentpl.py: Ignore error 2022 in objconv since it's irrelevant for us.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-28 17:57:18 +02:00
parent 176d5f7d82
commit 0af1751d77
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2012-05-28 Vladimir Serbinenko <phcoder@gmail.com>
* gentpl.py: Ignore error 2022 in objconv since it's irrelevant for us.
2012-05-28 Vladimir Serbinenko <phcoder@gmail.com> 2012-05-28 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/posix_wrap/sys/types.h [__APPLE__]: Include stddef * grub-core/lib/posix_wrap/sys/types.h [__APPLE__]: Include stddef

4
gentpl.py
View file

@ -419,13 +419,13 @@ def kernel(platform):
r += rule("[+ name +].img", "[+ name +].exec$(EXEEXT)", r += rule("[+ name +].img", "[+ name +].exec$(EXEEXT)",
if_platform_tagged(platform, "nostrip", if_platform_tagged(platform, "nostrip",
"""if test x$(USE_APPLE_CC_FIXES) = xyes; then \ """if test x$(USE_APPLE_CC_FIXES) = xyes; then \
$(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -nu -nd $< $@; \ $(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2022 -wd1106 -nu -nd $< $@; \
elif test ! -z '$(TARGET_OBJ2ELF)'; then \ elif test ! -z '$(TARGET_OBJ2ELF)'; then \
cp $< $@.bin; $(TARGET_OBJ2ELF) $@.bin && cp $@.bin $@ || (rm -f $@.bin; exit 1); \ cp $< $@.bin; $(TARGET_OBJ2ELF) $@.bin && cp $@.bin $@ || (rm -f $@.bin; exit 1); \
else cp $< $@; fi""", else cp $< $@; fi""",
"""if test x$(USE_APPLE_CC_FIXES) = xyes; then \ """if test x$(USE_APPLE_CC_FIXES) = xyes; then \
$(STRIP) $(""" + cname() + """) -o $@.bin $<; \ $(STRIP) $(""" + cname() + """) -o $@.bin $<; \
$(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -nu -nd $@.bin $@; \ $(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2022 -wd1106 -nu -nd $@.bin $@; \
else """ + "$(STRIP) $(" + cname() + "_STRIPFLAGS) -o $@ $<; \ else """ + "$(STRIP) $(" + cname() + "_STRIPFLAGS) -o $@ $<; \
fi""")) fi"""))
return r return r