Added support for Xcode on Snow Leopard. Upaded with bug fixes for Snow Leopard.

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

2 files changed, 79 insertions, 8 deletions

diff --git a/UnixPkg/Include/Ppi/UnixFwh.h b/UnixPkg/Include/Ppi/UnixFwh.h
index 1deed11454..a989c8a0aa 100644
--- a/UnixPkg/Include/Ppi/UnixFwh.h
+++ b/UnixPkg/Include/Ppi/UnixFwh.h
@@ -34,7 +34,8 @@ EFI_STATUS
 (EFIAPI *UNIX_FWH_INFORMATION) (

   IN     UINTN                  Index,

   IN OUT EFI_PHYSICAL_ADDRESS   *FdBase,

-  IN OUT UINT64                 *FdSize

+  IN OUT UINT64                 *FdSize,

+  IN OUT EFI_PHYSICAL_ADDRESS   *FixUp

   );

 

 /*++

@@ -47,6 +48,7 @@ Arguments:
   Index  - Which FD, starts at zero.

   FdSize - Size of the FD in bytes

   FdBase - Start address of the FD. Assume it points to an FV Header

+  FixUp  - Difference between actual FD address and build address

 

 Returns:

   EFI_SUCCESS     - Return the Base address and size of the FV

diff --git a/UnixPkg/Include/Protocol/UnixThunk.h b/UnixPkg/Include/Protocol/UnixThunk.h
index 29a9791292..93e77e8f5d 100644
--- a/UnixPkg/Include/Protocol/UnixThunk.h
+++ b/UnixPkg/Include/Protocol/UnixThunk.h
@@ -62,11 +62,80 @@ Abstract:
 
 #include <utime.h>
 #include <dlfcn.h>
+#include <ucontext.h>
 
 #include <Base.h>
 #include <Library/PeCoffLib.h>
 
 
+#if __APPLE__
+//
+// EFI packing is not compatible witht he default OS packing for struct stat.
+// st_size is 64-bit but starts on a 32-bit offset in the structure. The compiler
+// flags used to produce compatible EFI images, break struct stat
+//
+#pragma pack(4)
+
+#if __DARWIN_64_BIT_INO_T
+
+typedef struct stat_fix { \
+	dev_t		st_dev;			/* [XSI] ID of device containing file */ 
+	mode_t		st_mode;		/* [XSI] Mode of file (see below) */ 
+	nlink_t		st_nlink;		/* [XSI] Number of hard links */ 
+	__darwin_ino64_t st_ino;		/* [XSI] File serial number */ 
+	uid_t		st_uid;			/* [XSI] User ID of the file */ 
+	gid_t		st_gid;			/* [XSI] Group ID of the file */ 
+	dev_t		st_rdev;		/* [XSI] Device ID */ 
+	__DARWIN_STRUCT_STAT64_TIMES 
+	off_t		st_size;		/* [XSI] file size, in bytes */ 
+	blkcnt_t	st_blocks;		/* [XSI] blocks allocated for file */ 
+	blksize_t	st_blksize;		/* [XSI] optimal blocksize for I/O */ 
+	__uint32_t	st_flags;		/* user defined flags for file */ 
+	__uint32_t	st_gen;			/* file generation number */ 
+	__int32_t	st_lspare;		/* RESERVED: DO NOT USE! */ 
+	__int64_t	st_qspare[2];		/* RESERVED: DO NOT USE! */ 
+} STAT_FIX;
+
+#else /* !__DARWIN_64_BIT_INO_T */
+
+typedef struct stat_fix {
+	dev_t	 	st_dev;		/* [XSI] ID of device containing file */
+	ino_t	  	st_ino;		/* [XSI] File serial number */
+	mode_t	 	st_mode;	/* [XSI] Mode of file (see below) */
+	nlink_t		st_nlink;	/* [XSI] Number of hard links */
+	uid_t		st_uid;		/* [XSI] User ID of the file */
+	gid_t		st_gid;		/* [XSI] Group ID of the file */
+	dev_t		st_rdev;	/* [XSI] Device ID */
+#if !defined(_POSIX_C_SOURCE) || defined(_DARWIN_C_SOURCE)
+	struct	timespec st_atimespec;	/* time of last access */
+	struct	timespec st_mtimespec;	/* time of last data modification */
+	struct	timespec st_ctimespec;	/* time of last status change */
+#else
+	time_t		st_atime;	/* [XSI] Time of last access */
+	long		st_atimensec;	/* nsec of last access */
+	time_t		st_mtime;	/* [XSI] Last data modification time */
+	long		st_mtimensec;	/* last data modification nsec */
+	time_t		st_ctime;	/* [XSI] Time of last status change */
+	long		st_ctimensec;	/* nsec of last status change */
+#endif
+	off_t		st_size;	/* [XSI] file size, in bytes */
+	blkcnt_t	st_blocks;	/* [XSI] blocks allocated for file */
+	blksize_t	st_blksize;	/* [XSI] optimal blocksize for I/O */
+	__uint32_t	st_flags;	/* user defined flags for file */
+	__uint32_t	st_gen;		/* file generation number */
+	__int32_t	st_lspare;	/* RESERVED: DO NOT USE! */
+	__int64_t	st_qspare[2];	/* RESERVED: DO NOT USE! */
+} STAT_FIX;
+
+#pragma pack()
+#endif
+
+#else 
+
+  typedef struct stat STAT_FIX;
+
+#endif
+
 #define EFI_UNIX_THUNK_PROTOCOL_GUID \
   { \
     0xf2e98868, 0x8985, 0x11db, {0x9a, 0x59, 0x00, 0x40, 0xd0, 0x2b, 0x18, 0x35 } \
@@ -115,8 +184,8 @@ typedef
 int
 (*UnixOpen) (const char *name, int flags, int mode);
 typedef
-long int
-(*UnixSeek) (int fd, long int off, int whence);
+off_t
+(*UnixSeek) (int fd, off_t off, int whence);
 typedef
 int
 (*UnixFtruncate) (int fd, long int len);
@@ -150,7 +219,7 @@ int
 (*UnixCloseDir)(DIR *dir);
 typedef
 int
-(*UnixStat)(const char *path, struct stat *buf);
+(*UnixStat)(const char *path, STAT_FIX *buf);
 typedef
 int
 (*UnixStatFs)(const char *path, struct statfs *buf);
@@ -213,7 +282,7 @@ int
 (*UnixTcsetattr) (int __fd, int __optional_actions,
 		      __const struct termios *__termios_p);
 
-typedef
+typedef 
 VOID *
 (*UnixDlopen) (const char *FileName, int Flag);
 
@@ -230,20 +299,20 @@ VOID *
 // Work functions to enable source level debug in the emulator
 //
 
-typedef
+typedef 
 RETURN_STATUS
 (EFIAPI *UnixPeCoffGetEntryPoint) (
   IN     VOID  *Pe32Data,
   IN OUT VOID  **EntryPoint
   );
 
-typedef
+typedef 
 VOID
 (EFIAPI *UnixPeCoffRelocateImageExtraAction) (
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext
   );
 
-typedef
+typedef 
 VOID
 (EFIAPI *UnixPeCoffLoaderUnloadImageExtraAction) (
   IN OUT PE_COFF_LOADER_IMAGE_CONTEXT  *ImageContext