tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support building on x64 hosts. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1095 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
bbahnsen 2006-07-25 21:08:04 +00:00
parent 4cb2253560
commit c7c42e4001
22 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Tools/Source/TianoTools/Common/build.xml
View File

@ -82,8 +82,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
outtype="static" outtype="static"
optimize="speed"> optimize="speed">
<compilerarg value="-fPIC" if="x86_64_linux"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<fileset dir="${basedir}/Common" <fileset dir="${basedir}/Common"
includes="*.c" /> includes="*.c" />

2
Tools/Source/TianoTools/CompressDll/build.xml
View File

@ -89,7 +89,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
> >
<fileset dir="${ToolName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/> <fileset dir="${ToolName}" includes="${LibFileSet}" defaultexcludes="TRUE" excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<includepath path="${env.JAVA_HOME}/include"/> <includepath path="${env.JAVA_HOME}/include"/>
<includepath path="${env.JAVA_HOME}/include/win32" if="windows"/> <includepath path="${env.JAVA_HOME}/include/win32" if="windows"/>

2
Tools/Source/TianoTools/EfiCompress/build.xml
View File

@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc> </cc>

2
Tools/Source/TianoTools/EfiRom/build.xml
View File

@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc> </cc>

2
Tools/Source/TianoTools/FlashMap/build.xml
View File

@ -97,7 +97,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc> </cc>

2
Tools/Source/TianoTools/FwImage/build.xml
View File

@ -91,7 +91,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc> </cc>

2
Tools/Source/TianoTools/GenCRC32Section/build.xml
View File

@ -89,7 +89,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
includes="${FileSet}"/> includes="${FileSet}"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>

2
Tools/Source/TianoTools/GenCapsuleHdr/build.xml
View File

@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc> </cc>

2
Tools/Source/TianoTools/GenFfsFile/build.xml
View File

@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/> <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
</cc> </cc>

6
Tools/Source/TianoTools/GenFvImage/build.xml
View File

@ -87,6 +87,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<os family="mac"/> <os family="mac"/>
</condition> </condition>
<condition property="syslibdirs" value="/lib64">
<istrue value="${x86_64_linux}"/>
</condition>
<condition property="syslibdirs" value="${env.CYGWIN_HOME}/lib/e2fsprogs"> <condition property="syslibdirs" value="${env.CYGWIN_HOME}/lib/e2fsprogs">
<os family="windows"/> <os family="windows"/>
</condition> </condition>
@ -123,7 +127,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/${ToolName}"/> <includepath path="${PACKAGE_DIR}/${ToolName}"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>

2
Tools/Source/TianoTools/GenSection/build.xml
View File

@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/> <libset dir="${LIB_DIR}" libs="CommonTools CustomizedCompress"/>
</cc> </cc>

2
Tools/Source/TianoTools/GenTEImage/build.xml
View File

@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc> </cc>

14
Tools/Source/TianoTools/Include/Common/BaseTypes.h
View File

@ -23,6 +23,7 @@
// Include processor specific binding // Include processor specific binding
// //
#include <ProcessorBind.h> #include <ProcessorBind.h>
#include <stdarg.h>
#define MEMORY_FENCE() MemoryFence () #define MEMORY_FENCE() MemoryFence ()
#define BREAKPOINT() CpuBreakpoint () #define BREAKPOINT() CpuBreakpoint ()
@ -123,10 +124,15 @@ typedef struct {
// //
#ifndef VA_START #ifndef VA_START
typedef CHAR8 *VA_LIST; // typedef CHAR8 *VA_LIST;
#define VA_START(ap, v) (ap = (VA_LIST) & (v) + _INT_SIZE_OF (v)) // #define VA_START(ap, v) (ap = (VA_LIST) & (v) + _INT_SIZE_OF (v))
#define VA_ARG(ap, t) (*(t *) ((ap += _INT_SIZE_OF (t)) - _INT_SIZE_OF (t))) // #define VA_ARG(ap, t) (*(t *) ((ap += _INT_SIZE_OF (t)) - _INT_SIZE_OF (t)))
#define VA_END(ap) (ap = (VA_LIST) 0) // #define VA_END(ap) (ap = (VA_LIST) 0)
// Use the native arguments for tools.
#define VA_START va_start
#define VA_ARG va_arg
#define VA_END va_end
#define VA_LIST va_list
#endif #endif

2
Tools/Source/TianoTools/MakeDeps/build.xml
View File

@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc> </cc>

2
Tools/Source/TianoTools/ModifyInf/build.xml
View File

@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
</cc> </cc>

2
Tools/Source/TianoTools/SecApResetVectorFixup/build.xml
View File

@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc> </cc>

2
Tools/Source/TianoTools/SecFixup/build.xml
View File

@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>
</cc> </cc>

2
Tools/Source/TianoTools/StrGather/build.xml
View File

@ -94,7 +94,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools String"/> <libset dir="${LIB_DIR}" libs="CommonTools String"/>
</cc> </cc>

3
Tools/Source/TianoTools/String/build.xml
View File

@ -107,6 +107,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<cc name="${ToolChain}" objdir="${BUILD_DIR}" <cc name="${ToolChain}" objdir="${BUILD_DIR}"
outfile="${LIB_DIR}/${LibName}" outfile="${LIB_DIR}/${LibName}"
outtype="static" outtype="static"
debug="true"
optimize="speed"> optimize="speed">
<compilerarg value="-fshort-wchar" if="gcc"/> <compilerarg value="-fshort-wchar" if="gcc"/>
@ -116,7 +117,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/${LibName}"/> <includepath path="${PACKAGE_DIR}/${LibName}"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
</cc> </cc>
</target> </target>

2
Tools/Source/TianoTools/VfrCompile/build.xml
View File

@ -124,7 +124,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<includepath path="${PACKAGE_DIR}/Pccts/h"/> <includepath path="${PACKAGE_DIR}/Pccts/h"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
<libset dir="${LIB_DIR}" libs="CommonTools"/> <libset dir="${LIB_DIR}" libs="CommonTools"/>
<syslibset libs="${gxx_extra_libs}" if="gcc"/> <syslibset libs="${gxx_extra_libs}" if="gcc"/>

2
Tools/Source/TianoTools/ZeroDebugData/build.xml
View File

@ -92,7 +92,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
excludes="*.xml *.inf"/> excludes="*.xml *.inf"/>
<includepath path="${PACKAGE_DIR}/Include"/> <includepath path="${PACKAGE_DIR}/Include"/>
<includepath path="${PACKAGE_DIR}/Include/Ia32"/> <includepath path="${PACKAGE_DIR}/Include/${HostArch}"/>
<includepath path="${PACKAGE_DIR}/Common"/> <includepath path="${PACKAGE_DIR}/Common"/>
</cc> </cc>
</target> </target>

16
Tools/Source/TianoTools/build.xml
View File

@ -15,6 +15,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<taskdef resource="net/sf/antcontrib/antlib.xml"/> <taskdef resource="net/sf/antcontrib/antlib.xml"/>
<property environment="env" /> <property environment="env" />
<condition property="HostArch" value="x64">
<os arch="amd64"/>
</condition>
<condition property="HostArch" value="Ia32">
<os arch="x86"/>
</condition>
<condition property="HostArch" value="Ia32">
<os arch="i386"/>
</condition>
<property name="WORKSPACE" value="${env.WORKSPACE}" /> <property name="WORKSPACE" value="${env.WORKSPACE}" />
<property name="WORKSPACE_DIR" value="${WORKSPACE}" /> <property name="WORKSPACE_DIR" value="${WORKSPACE}" />
<property name="PACKAGE" value="Tools" /> <property name="PACKAGE" value="Tools" />
@ -79,6 +88,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
<os name="Linux"/> <os name="Linux"/>
</condition> </condition>
<condition property="x86_64_linux">
<and>
<os name="Linux"/>
<equals arg1="${HostArch}" arg2="x64"/>
</and>
</condition>
<condition property="windows" value="true"> <condition property="windows" value="true">
<os family="Windows"/> <os family="Windows"/>
</condition> </condition>