From ad5518d79bdd273882adfb1d682f2e93c5ee626b Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 2 Mar 2012 11:11:00 +0100
Subject: [PATCH] 	* gentpl.py (kernel): Remove the use of TARGET_OBJ2ELF
 after strip since 	strip already transforms he format.

---
 ChangeLog | 5 +++++
 gentpl.py | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 23c82d4c1..440487fdd 100644
--- 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 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