Support building on x64 hosts.

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

diff --git a/Tools/Source/TianoTools/Common/build.xml b/Tools/Source/TianoTools/Common/build.xml
index 749df92bcaf235c148bef58755cc9c61fe5893b7..5351eebe0923c0db9632aba3369dff75ca18ee1b 100644 (file)
--- a/Tools/Source/TianoTools/Common/build.xml
+++ b/Tools/Source/TianoTools/Common/build.xml
@@ -82,8 +82,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         outtype="static"\r
         optimize="speed">\r
 \r
+      <compilerarg value="-fPIC" if="x86_64_linux"/>\r
+\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
 \r
       <fileset dir="${basedir}/Common" \r
         includes="*.c" />\r

diff --git a/Tools/Source/TianoTools/CompressDll/build.xml b/Tools/Source/TianoTools/CompressDll/build.xml
index 93873c9932d6c8ce339f16fb8e886592e2f40783..1588ab6dad440e9f85fc388e8c88f58ee4c0b353 100644 (file)
--- a/Tools/Source/TianoTools/CompressDll/build.xml
+++ b/Tools/Source/TianoTools/CompressDll/build.xml
@@ -89,7 +89,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       >\r
       <fileset dir="${ToolName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <includepath path="${env.JAVA_HOME}/include"/>\r
       <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>\r

diff --git a/Tools/Source/TianoTools/EfiCompress/build.xml b/Tools/Source/TianoTools/EfiCompress/build.xml
index f582b7bc29b9cafb100d32bc5a4adcc167f8c6c0..dae9729146c10b3abb21a6fa21cea1a80cfde99a 100644 (file)
--- a/Tools/Source/TianoTools/EfiCompress/build.xml
+++ b/Tools/Source/TianoTools/EfiCompress/build.xml
@@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r

diff --git a/Tools/Source/TianoTools/EfiRom/build.xml b/Tools/Source/TianoTools/EfiRom/build.xml
index ee07603e8c38a8da34c71a000216a38b37bee625..035a6a4b6a53d053ea25a2469d9a939cad5ae9ad 100644 (file)
--- a/Tools/Source/TianoTools/EfiRom/build.xml
+++ b/Tools/Source/TianoTools/EfiRom/build.xml
@@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r

diff --git a/Tools/Source/TianoTools/FlashMap/build.xml b/Tools/Source/TianoTools/FlashMap/build.xml
index 7b2ac0ce8fa2e693e8842147032cae4634833a0e..126893d5e6bd33ed6f35f553c2efa11b33cd39f1 100644 (file)
--- a/Tools/Source/TianoTools/FlashMap/build.xml
+++ b/Tools/Source/TianoTools/FlashMap/build.xml
@@ -97,7 +97,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r

diff --git a/Tools/Source/TianoTools/FwImage/build.xml b/Tools/Source/TianoTools/FwImage/build.xml
index bd085c55ac143e2fb241000aeb94d50e4f53577b..fb85dc4ea7a9d6e386b6fd6fa64642534f7da39f 100644 (file)
--- a/Tools/Source/TianoTools/FwImage/build.xml
+++ b/Tools/Source/TianoTools/FwImage/build.xml
@@ -91,7 +91,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r

diff --git a/Tools/Source/TianoTools/GenCRC32Section/build.xml b/Tools/Source/TianoTools/GenCRC32Section/build.xml
index 5b61b6d62e807ef98c3421260622a8b1be1b2d11..dd461ad0ccfc75c61ae81b88580c8f146db7ef2a 100644 (file)
--- a/Tools/Source/TianoTools/GenCRC32Section/build.xml
+++ b/Tools/Source/TianoTools/GenCRC32Section/build.xml
@@ -89,7 +89,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         includes="${FileSet}"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
 \r

diff --git a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
index d05ab1983cb45d33b1566abd5b72406703cd417b..369a9395a493fbf0a0f26c85d934ee6f07d8362b 100644 (file)
--- a/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
+++ b/Tools/Source/TianoTools/GenCapsuleHdr/build.xml
@@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r

diff --git a/Tools/Source/TianoTools/GenFfsFile/build.xml b/Tools/Source/TianoTools/GenFfsFile/build.xml
index ccf34c82cd5793ba5cfa751ba4fa3b343cf65a4f..81d4048949c80dd69f08f7de0b21d4ea73907cc5 100644 (file)
--- a/Tools/Source/TianoTools/GenFfsFile/build.xml
+++ b/Tools/Source/TianoTools/GenFfsFile/build.xml
@@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
     </cc>\r

diff --git a/Tools/Source/TianoTools/GenFvImage/build.xml b/Tools/Source/TianoTools/GenFvImage/build.xml
index 15fbf7cb35d0b4cd5753cf21cf5a5d1168665b2d..a320e8f3ed8b810d7cfefcff74e619d873379fc5 100644 (file)
--- a/Tools/Source/TianoTools/GenFvImage/build.xml
+++ b/Tools/Source/TianoTools/GenFvImage/build.xml
@@ -87,6 +87,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <os family="mac"/>\r
     </condition>\r
     \r
+    <condition property="syslibdirs" value="/lib64">\r
+      <istrue value="${x86_64_linux}"/>\r
+    </condition>\r
+    \r
     <condition property="syslibdirs" value="${env.CYGWIN_HOME}/lib/e2fsprogs">\r
       <os family="windows"/>\r
     </condition>\r
@@ -123,7 +127,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/${ToolName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
 \r

diff --git a/Tools/Source/TianoTools/GenSection/build.xml b/Tools/Source/TianoTools/GenSection/build.xml
index d56a933b3433b1dc8d8ebd6667c45c6abd8733eb..92fd1514541d0da1cb7a5c44ca441030af9e86d1 100644 (file)
--- a/Tools/Source/TianoTools/GenSection/build.xml
+++ b/Tools/Source/TianoTools/GenSection/build.xml
@@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>\r
     </cc>\r

diff --git a/Tools/Source/TianoTools/GenTEImage/build.xml b/Tools/Source/TianoTools/GenTEImage/build.xml
index ac45f5ed4c227e9679151e44deded18906405b6a..fd92c01bbaf444bb8a611d0ba8ddbc92757b57b1 100644 (file)
--- a/Tools/Source/TianoTools/GenTEImage/build.xml
+++ b/Tools/Source/TianoTools/GenTEImage/build.xml
@@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r

diff --git a/Tools/Source/TianoTools/Include/Common/BaseTypes.h b/Tools/Source/TianoTools/Include/Common/BaseTypes.h
index 86c3c71fb3bb7afbfb4b5a5203ef0d80b580c340..b87e7141e6d063baa554749df0b798da30cc22d4 100644 (file)
--- a/Tools/Source/TianoTools/Include/Common/BaseTypes.h
+++ b/Tools/Source/TianoTools/Include/Common/BaseTypes.h
@@ -23,6 +23,7 @@
 // Include processor specific binding\r
 //\r
 #include <ProcessorBind.h>\r
+#include <stdarg.h>\r
 \r
 #define MEMORY_FENCE()  MemoryFence ()\r
 #define BREAKPOINT()    CpuBreakpoint ()\r
@@ -123,10 +124,15 @@ typedef struct {
 //\r
 #ifndef VA_START\r
 \r
-typedef CHAR8 *VA_LIST;\r
-#define VA_START(ap, v) (ap = (VA_LIST) & (v) + _INT_SIZE_OF (v))\r
-#define VA_ARG(ap, t)   (*(t *) ((ap += _INT_SIZE_OF (t)) - _INT_SIZE_OF (t)))\r
-#define VA_END(ap)      (ap = (VA_LIST) 0)\r
+// typedef CHAR8 *VA_LIST;\r
+// #define VA_START(ap, v) (ap = (VA_LIST) & (v) + _INT_SIZE_OF (v))\r
+// #define VA_ARG(ap, t)   (*(t *) ((ap += _INT_SIZE_OF (t)) - _INT_SIZE_OF (t)))\r
+// #define VA_END(ap)      (ap = (VA_LIST) 0)\r
+// Use the native arguments for tools.\r
+#define VA_START va_start\r
+#define VA_ARG   va_arg\r
+#define VA_END   va_end\r
+#define VA_LIST  va_list\r
 \r
 #endif\r
 \r

diff --git a/Tools/Source/TianoTools/MakeDeps/build.xml b/Tools/Source/TianoTools/MakeDeps/build.xml
index 54988762b242e7da93edf119c2f495b1ae57ac12..4cc82f0ebb38eaf6ca0da32e7f06b944b314ad8b 100755 (executable)
--- a/Tools/Source/TianoTools/MakeDeps/build.xml
+++ b/Tools/Source/TianoTools/MakeDeps/build.xml
@@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r

diff --git a/Tools/Source/TianoTools/ModifyInf/build.xml b/Tools/Source/TianoTools/ModifyInf/build.xml
index baa7bedaa34f918c98300ccb305bd68f1daaff1d..c31e5537900e14dfa56e4aff89d37c52316bd224 100644 (file)
--- a/Tools/Source/TianoTools/ModifyInf/build.xml
+++ b/Tools/Source/TianoTools/ModifyInf/build.xml
@@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
 \r
     </cc>\r

diff --git a/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml b/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
index e065f7cc8206fa397342e5d3eeaf7230317e63b5..bad8205131de902741dd1d05322c81b82fa8991b 100644 (file)
--- a/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
+++ b/Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
@@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r

diff --git a/Tools/Source/TianoTools/SecFixup/build.xml b/Tools/Source/TianoTools/SecFixup/build.xml
index e5e01f7adeb28450ec6d6d69206e5c6458c1f89a..57764ccead179597d16d2defeb030c7ed2f991a1 100644 (file)
--- a/Tools/Source/TianoTools/SecFixup/build.xml
+++ b/Tools/Source/TianoTools/SecFixup/build.xml
@@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
     </cc>\r

diff --git a/Tools/Source/TianoTools/StrGather/build.xml b/Tools/Source/TianoTools/StrGather/build.xml
index 8d2ce83a8b0aa89d79982312b4a7e5d4effb95eb..05035f488a3d6e2153e6636515b737541e504466 100644 (file)
--- a/Tools/Source/TianoTools/StrGather/build.xml
+++ b/Tools/Source/TianoTools/StrGather/build.xml
@@ -94,7 +94,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools String"/>\r
     </cc>\r

diff --git a/Tools/Source/TianoTools/String/build.xml b/Tools/Source/TianoTools/String/build.xml
index b77b69069742fa718c1a1e33bd143c26ff521282..868a072e243ee70752e7a2d21cbc1b2a36d2f3a0 100644 (file)
--- a/Tools/Source/TianoTools/String/build.xml
+++ b/Tools/Source/TianoTools/String/build.xml
@@ -107,6 +107,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <cc name="${ToolChain}" objdir="${BUILD_DIR}" \r
         outfile="${LIB_DIR}/${LibName}"\r
         outtype="static"\r
+        debug="true"\r
         optimize="speed">\r
 \r
       <compilerarg value="-fshort-wchar" if="gcc"/>\r
@@ -116,7 +117,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/${LibName}"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r

diff --git a/Tools/Source/TianoTools/VfrCompile/build.xml b/Tools/Source/TianoTools/VfrCompile/build.xml
index d927c44a5751146a2657176197d75c52e9e9c6d0..9c9de3879f82e86383fe15df68d72c7da5f2f6ba 100644 (file)
--- a/Tools/Source/TianoTools/VfrCompile/build.xml
+++ b/Tools/Source/TianoTools/VfrCompile/build.xml
@@ -124,7 +124,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
       <includepath path="${PACKAGE_DIR}/Pccts/h"/>\r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
       <libset dir="${LIB_DIR}" libs="CommonTools"/>\r
       <syslibset libs="${gxx_extra_libs}" if="gcc"/>\r

diff --git a/Tools/Source/TianoTools/ZeroDebugData/build.xml b/Tools/Source/TianoTools/ZeroDebugData/build.xml
index fa3e63731e1bdbd2070f29c759cb4ceafd824571..151299bc9c6d8f164e4ae0b85bed8f1a612ad172 100644 (file)
--- a/Tools/Source/TianoTools/ZeroDebugData/build.xml
+++ b/Tools/Source/TianoTools/ZeroDebugData/build.xml
@@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         excludes="*.xml *.inf"/>\r
 \r
       <includepath path="${PACKAGE_DIR}/Include"/>\r
-      <includepath path="${PACKAGE_DIR}/Include/Ia32"/>\r
+      <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>\r
       <includepath path="${PACKAGE_DIR}/Common"/>\r
     </cc>\r
   </target>\r

diff --git a/Tools/Source/TianoTools/build.xml b/Tools/Source/TianoTools/build.xml
index ca81aae7c5ee921722ad92427fe99159bb6e30d1..0d6d2fbc6f9f9559327c706591a89d02abd907ca 100644 (file)
--- a/Tools/Source/TianoTools/build.xml
+++ b/Tools/Source/TianoTools/build.xml
@@ -15,6 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
   <taskdef resource="net/sf/antcontrib/antlib.xml"/>\r
   <property environment="env" />\r
+  <condition property="HostArch" value="x64">\r
+    <os arch="amd64"/>\r
+  </condition>\r
+  <condition property="HostArch" value="Ia32">\r
+    <os arch="x86"/>\r
+  </condition>\r
+  <condition property="HostArch" value="Ia32">\r
+    <os arch="i386"/>\r
+  </condition>\r
   <property name="WORKSPACE" value="${env.WORKSPACE}" />\r
   <property name="WORKSPACE_DIR" value="${WORKSPACE}" />\r
   <property name="PACKAGE" value="Tools" />\r
@@ -79,6 +88,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <os name="Linux"/>\r
     </condition>\r
     \r
+    <condition property="x86_64_linux">\r
+      <and>\r
+        <os name="Linux"/>\r
+        <equals arg1="${HostArch}" arg2="x64"/>\r
+      </and>\r
+    </condition>\r
+    \r
     <condition property="windows" value="true">\r
       <os family="Windows"/>\r
     </condition>\r