Merge the patch provided by Johnson

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2555 6f19259b-4bc3-4df7-8a09-765794883524

Tools/CCode/Source/FwImage/build.xml

@@ -45,7 +45,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>
 
       <includepath path="${PACKAGE_DIR}/Include"/>
-      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
+      <!-- <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/> -->
+      <!-- We can only convert IA32, not X64, ELF objects -->
+      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>
       <includepath path="${PACKAGE_DIR}/Common"/>
       <libset dir="${LIB_DIR}" libs="CommonTools"/>
     </cc>

Tools/CCode/Source/FwImage/fwimage.c

@@ -25,7 +25,7 @@ Abstract:
 // List of OS and CPU which support ELF to PE conversion
 //
 #if defined(linux)
-#if defined(i386)
+#if defined (__i386__) || defined(__x86_64__)
 #define HAVE_ELF
 #endif
 #endif