* gentpl.py (kernel): Remove the use of TARGET_OBJ2ELF after strip since

	strip already transforms he format.

diff --git a/ChangeLog b/ChangeLog
index 23c82d4c15e96e36a359cc060cfb51d66a0bdd3c..440487fdd7d54d7cf7dcf1b5d6eac3f214add342 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * gentpl.py (kernel): Remove the use of TARGET_OBJ2ELF after strip since
+       strip already transforms he format.
+
 2012-03-02  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * conf/i386-pc-cygwin-img-ld.sc: Define also _edata and __edata.

diff --git a/gentpl.py b/gentpl.py
index 717fd50f854947034536ab59f27f4c618cf3353f..d7552d43d0803ba59d7abd49ce2df4444b169216 100644 (file)
--- 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