Merge the patch provided by Johnson
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2555 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -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>
|
||||
|
@@ -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
|
||||
|
@@ -404,7 +404,11 @@ RELEASE_VS2005PRO_X64_DLINK_FLAGS = /NOLOGO /NODEFAULTLIB /IGNORE:4086 /OPT:REF
|
||||
*_ELFGCC_IA32_PP_NAME = gcc
|
||||
*_ELFGCC_IA32_VFRPP_NAME = gcc
|
||||
|
||||
*_ELFGCC_IA32_CC_FLAGS = -g -fshort-wchar -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h -DSTRING_ARRAY_NAME=${BASE_NAME}Strings
|
||||
*_ELFGCC_IA32_CC_FLAGS = -m32 -g -fshort-wchar -Wall -Werror -c -include ${DEST_DIR_DEBUG}/AutoGen.h -DSTRING_ARRAY_NAME=${BASE_NAME}Strings
|
||||
*_ELFGCC_IA32_DLINK_FLAGS = -melf_i386 -nostdlib -n -q -Ttext 0x220 --entry ${ENTRYPOINT} -u ${ENTRYPOINT}
|
||||
*_ELFGCC_IA32_ASM_FLAGS = -m32 -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h -DASM_PFX(name)=name
|
||||
*_ELFGCC_IA32_PP_FLAGS = -m32 -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h
|
||||
|
||||
*_ELFGCC_*_DLINK_FLAGS = -nostdlib -n -q -Ttext 0x220 --entry ${ENTRYPOINT} -u ${ENTRYPOINT}
|
||||
*_ELFGCC_*_ASM_FLAGS = -c -imacros ${DEST_DIR_DEBUG}/AutoGen.h -DASM_PFX(name)=name
|
||||
*_ELFGCC_*_PP_FLAGS = -E -x assembler-with-cpp -include ${DEST_DIR_DEBUG}/AutoGen.h
|
||||
|
Reference in New Issue
Block a user