diff --git a/ChangeLog b/ChangeLog index 23c82d4c1..440487fdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-03-02 Vladimir Serbinenko + + * gentpl.py (kernel): Remove the use of TARGET_OBJ2ELF after strip since + strip already transforms he format. + 2012-03-02 Vladimir Serbinenko * conf/i386-pc-cygwin-img-ld.sc: Define also _edata and __edata. diff --git a/gentpl.py b/gentpl.py index 717fd50f8..d7552d43d 100644 --- a/gentpl.py +++ b/gentpl.py @@ -426,9 +426,6 @@ def kernel(platform): """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 $@; \ -elif test ! -z '$(TARGET_OBJ2ELF)'; then \ - $(STRIP) $(""" + cname() + """_STRIPFLAGS) -o $@ $<;\ - $(TARGET_OBJ2ELF) $@.bin && cp $@.bin $@ || (rm -f $@.bin; exit 1); \ else """ + "$(STRIP) $(" + cname() + "_STRIPFLAGS) -o $@ $<; \ fi""")) return r