diff options
| author | AJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-12-08 06:14:12 +0000 |
|---|---|---|
| committer | AJFISH <AJFISH@6f19259b-4bc3-4df7-8a09-765794883524> | 2009-12-08 06:14:12 +0000 |
| commit | 5af06fe3d0ddd4cd65d26aa9fde90173ad729e62 (patch) | |
| tree | 32ee8fffbdc48d6fa61ca8282b68d6ac3eeb8755 /UnixPkg/Sec | |
| parent | 73cbc5806925870a87a9ae815ad3d75b778576b8 (diff) | |
| download | edk2-5af06fe3d0ddd4cd65d26aa9fde90173ad729e62.zip edk2-5af06fe3d0ddd4cd65d26aa9fde90173ad729e62.tar.gz edk2-5af06fe3d0ddd4cd65d26aa9fde90173ad729e62.tar.bz2 | |
Fix for the Linux Build. #ifdef __APPLE__ around the files only needed to work around Mac OS X 16 byte IA-32 calling conventions issue. All the calls to this code is #ifdef __APPLE__, so no reason to build it on Linux or other gcc flavors.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9543 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'UnixPkg/Sec')
| -rw-r--r-- | UnixPkg/Sec/Gasket.c | 17 | ||||
| -rw-r--r-- | UnixPkg/Sec/Ia32/Gasket.S | 5 |
2 files changed, 22 insertions, 0 deletions
diff --git a/UnixPkg/Sec/Gasket.c b/UnixPkg/Sec/Gasket.c index 30f06a2..6c7b92f 100644 --- a/UnixPkg/Sec/Gasket.c +++ b/UnixPkg/Sec/Gasket.c @@ -1,3 +1,18 @@ +/** @file
+
+ Copyright (c) 2008-2009, Apple Inc. All rights reserved.
+
+ All rights reserved. This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution. The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifdef __APPLE__
#include "SecMain.h"
#include "Gasket.h"
@@ -416,3 +431,5 @@ GasketUgaBlt ( return GasketUintn10Args (UgaBlt, (UINTN)UgaIo, (UINTN)BltBuffer, BltOperation, SourceX, SourceY, DestinationX, DestinationY, Width, Height, Delta);
}
+#endif
+
diff --git a/UnixPkg/Sec/Ia32/Gasket.S b/UnixPkg/Sec/Ia32/Gasket.S index 77e8296..a89f5db 100644 --- a/UnixPkg/Sec/Ia32/Gasket.S +++ b/UnixPkg/Sec/Ia32/Gasket.S @@ -27,6 +27,8 @@ #
#------------------------------------------------------------------------------
+#ifdef __APPLE__
+
.text
#------------------------------------------------------------------------------
@@ -235,3 +237,6 @@ _GasketUintnUint16: ret
.subsections_via_symbols
+
+ #endif
+
|