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

Fix up the UnixPkg to work with clang on OS X. XCLANG toolchain configuration has already been checked into BaseTools project. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11350 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
andrewfish 2011-03-08 00:12:30 +00:00
parent a1fe1d6dd8
commit 2d7df6428c
5 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UnixPkg/Sec/SecMain.c
View File

@ -1012,7 +1012,7 @@ Returns:
Array = mImageContextModHandleArray; Array = mImageContextModHandleArray;
for (Index = 0; Index < mImageContextModHandleArraySize; Index++, Array++) { for (Index = 0; Index < mImageContextModHandleArraySize; Index++, Array++) {
if ((Array->ImageContext == ImageContext)) { if (Array->ImageContext == ImageContext) {
// //
// If you find a match return it and delete the entry // If you find a match return it and delete the entry
// //

2
UnixPkg/UnixGopDxe/UnixGopScreen.c
View File

@ -217,7 +217,7 @@ UnixGopBlt (
Status = Private->UgaIo->UgaBlt ( Status = Private->UgaIo->UgaBlt (
Private->UgaIo, Private->UgaIo,
(EFI_UGA_PIXEL *)BltBuffer, (EFI_UGA_PIXEL *)BltBuffer,
BltOperation, (EFI_UGA_BLT_OPERATION)BltOperation,
&GopBltArgs &GopBltArgs
); );

2
UnixPkg/UnixPkg.dsc
View File

@ -206,7 +206,7 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|L"Setup"|gEfiUnixSystemConfigGuid|0x0|80 gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|L"Setup"|gEfiUnixSystemConfigGuid|0x0|80
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|L"Setup"|gEfiUnixSystemConfigGuid|0x4|25 gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|L"Setup"|gEfiUnixSystemConfigGuid|0x4|25
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10 gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10
################################################################################################### ###################################################################################################
# #
# Components Section - list of the modules and components that will be processed by compilation # Components Section - list of the modules and components that will be processed by compilation

6
UnixPkg/UnixPkgX64.dsc
View File

@ -208,6 +208,12 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|L"Setup"|gEfiUnixSystemConfigGuid|0x4|25 gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|L"Setup"|gEfiUnixSystemConfigGuid|0x4|25
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10 gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut|L"Timeout"|gEfiGlobalVariableGuid|0x0|10
[BuildOptions]
# Magic to make system include files work
XCODE:*_XCLANG_*_CC_FLAGS = -U __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ -D __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1060 -D __APPLE__ -I/System/Library/Frameworks -I/Library/Frameworks
XCODE:*_XCLANG_*_PP_FLAGS = -U __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ -D __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=1060 -D __APPLE__ -I/System/Library/Frameworks -I/Library/Frameworks
################################################################################################### ###################################################################################################
# #
# Components Section - list of the modules and components that will be processed by compilation # Components Section - list of the modules and components that will be processed by compilation

2
UnixPkg/build64.sh
View File

@ -53,7 +53,7 @@ case `uname` in
exit 1 exit 1
else else
TARGET_TOOLS=XCODE32 TARGET_TOOLS=XCODE32
UNIXPKG_TOOLS=UNIXPKG UNIXPKG_TOOLS=XCLANG
fi fi
NETWORK_SUPPORT="-D NETWORK_SUPPORT" NETWORK_SUPPORT="-D NETWORK_SUPPORT"
;; ;;