From 683031bac44753d480d8dcefc9cab8bd6c30a5ba Mon Sep 17 00:00:00 2001 From: Vladimir 'phcoder' Serbinenko Date: Sat, 26 May 2012 12:06:17 +0200 Subject: [PATCH] * gentpl.py: Remove error disabling for objconv. --- ChangeLog | 4 ++++ gentpl.py | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5bf57d0a9..42206a69c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2012-05-26 Vladimir Serbinenko + + * gentpl.py: Remove error disabling for objconv. + 2012-05-26 Vladimir Serbinenko * configure.ac: Remove -Wunitialized as it's not available on older diff --git a/gentpl.py b/gentpl.py index 1115843b0..6aa023648 100644 --- a/gentpl.py +++ b/gentpl.py @@ -419,13 +419,13 @@ def kernel(platform): r += rule("[+ name +].img", "[+ name +].exec$(EXEEXT)", if_platform_tagged(platform, "nostrip", """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 -ed2031 -ed2022 -wd1106 -nu -nd $< $@; \ + $(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -nu -nd $< $@; \ elif test ! -z '$(TARGET_OBJ2ELF)'; then \ cp $< $@.bin; $(TARGET_OBJ2ELF) $@.bin && cp $@.bin $@ || (rm -f $@.bin; exit 1); \ else cp $< $@; fi""", """if test x$(USE_APPLE_CC_FIXES) = xyes; then \ $(STRIP) $(""" + cname() + """) -o $@.bin $<; \ - $(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -ed2031 -ed2022 -wd1106 -nu -nd $@.bin $@; \ + $(OBJCONV) -f$(TARGET_MODULE_FORMAT) -nr:_grub_mod_init:grub_mod_init -nr:_grub_mod_fini:grub_mod_fini -wd1106 -nu -nd $@.bin $@; \ else """ + "$(STRIP) $(" + cname() + "_STRIPFLAGS) -o $@ $<; \ fi""")) return r