Adding Simple Pointer, GOP, SimpleTextInEx, and Networking protocols to the emulator...

[mirror_edk2.git] / UnixPkg / Sec / SecMain.inf

diff --git a/UnixPkg/Sec/SecMain.inf b/UnixPkg/Sec/SecMain.inf
index 88477c60cda1d42391e13dcf18735feb4c49281a..abee48519c364da8ea46e307f21d48ffc7e3e573 100644 (file)
--- a/UnixPkg/Sec/SecMain.inf
+++ b/UnixPkg/Sec/SecMain.inf
@@ -3,7 +3,7 @@
 #\r
 # Main executable file of Unix Emulator that loads PEI core after initialization finished.\r
 # Copyright (c) 2008 - 2010, Intel Corporation. All rights reserved.<BR>\r
-# Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+# Portions copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -34,20 +34,20 @@
   UnixThunk.c\r
   FwVol.c\r
   SecMain.c\r
-  \r
-[Sources.Ia32]  \r
+\r
+[Sources.Ia32]\r
   Gasket.c\r
   Ia32/Gasket.S\r
   Ia32/Stack.S\r
   Ia32/SwitchStack.c\r
 \r
-[Sources.X64]  \r
-  X64/Gasket.S\r
+[Sources.X64]\r
+#  X64/Gasket.S       # pure UNIX x86_64 ABI also need to fix issues in BaseLib\r
+  X64/MangleGasket.S  # convert between UNIX x86_64 ABI and EFI X64 ABI\r
+\r
   X64/SwitchStack.S\r
   X64/NameManglingFix.c\r
-  \r
-# Only used to help construct Gasket.S\r
-#  X64/GasketEfiTemplate.c\r
+\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
@@ -62,6 +62,7 @@
   BaseLib\r
   PeCoffLib\r
   ReportStatusCodeLib\r
+  SecDispatchTableLib\r
 \r
 \r
 [Ppis]\r
@@ -87,7 +88,7 @@
    GCC:*_*_IA32_PP_FLAGS == -m32 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
    GCC:*_*_IA32_ASM_FLAGS == -m32 -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
 \r
-   GCC:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/SecMain -m elf_i386 -dynamic-linker /lib/ld-linux.so.2 /usr/lib/crt1.o /usr/lib/crti.o -L/usr/X11R6/lib -lXext -lX11 /usr/lib/crtn.o\r
+   GCC:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/SecMain -m elf_x86_64 -dynamic-linker /lib64/ld-linux-x86-64.so.2 /usr/lib/crt1.o /usr/lib/crti.o -L/usr/X11R6/lib -lXext -lX11 /usr/lib/crtn.o\r
    GCC:*_*_X64_CC_FLAGS == -m64 -g -fshort-wchar -fno-strict-aliasing -Wall -malign-double -idirafter/usr/include -c -include $(DEST_DIR_DEBUG)/AutoGen.h -DSTRING_ARRAY_NAME=$(BASE_NAME)Strings\r
    GCC:*_*_X64_PP_FLAGS == -m64 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h\r
    GCC:*_*_X64_ASM_FLAGS == -m64 -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h\r
@@ -96,9 +97,9 @@
 # Need to do this link via gcc and not ld as the pathing to libraries changes from OS version to OS version\r
 #\r
    XCODE:*_*_IA32_DLINK_PATH == gcc\r
-   XCODE:*_*_IA32_DLINK_FLAGS == -arch i386 -o $(BIN_DIR)/SecMain -L/usr/X11R6/lib -lXext -lX11 -lIOKit -framework Carbon              \r
+   XCODE:*_*_IA32_DLINK_FLAGS == -arch i386 -o $(BIN_DIR)/SecMain -L/usr/X11R6/lib -lXext -lX11 -framework IOKit -framework Carbon\r
    XCODE:*_*_IA32_ASM_FLAGS == -arch i386 -g\r
 \r
    XCODE:*_*_X64_DLINK_PATH == gcc\r
-   XCODE:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/SecMain -L/usr/X11R6/lib -lXext -lX11 -lIOKit -framework Carbon          \r
+   XCODE:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/SecMain -L/usr/X11R6/lib -lXext -lX11 -lIOKit -framework Carbon\r
    XCODE:*_*_X64_ASM_FLAGS == -g\r