From cb5e6cd051c60104034f26ec9feab44f224dd384 Mon Sep 17 00:00:00 2001 From: jljusten Date: Wed, 13 Oct 2010 07:06:53 +0000 Subject: UnixPkg SEC: Fix link flags for using GCC on Linux x86-64 git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10925 6f19259b-4bc3-4df7-8a09-765794883524 --- UnixPkg/Sec/SecMain.inf | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'UnixPkg/Sec') diff --git a/UnixPkg/Sec/SecMain.inf b/UnixPkg/Sec/SecMain.inf index da09d07f30..94d2d95fb7 100644 --- a/UnixPkg/Sec/SecMain.inf +++ b/UnixPkg/Sec/SecMain.inf @@ -34,17 +34,17 @@ UnixThunk.c FwVol.c SecMain.c - -[Sources.Ia32] + +[Sources.Ia32] Gasket.c Ia32/Gasket.S Ia32/Stack.S Ia32/SwitchStack.c -[Sources.X64] +[Sources.X64] # X64/Gasket.S # pure UINX x86_64 ABI also need to fix issues in BaseLib X64/MangleGasket.S # convert between UNIX x86_64 ABI and EFI X64 ABI - + X64/SwitchStack.S X64/NameManglingFix.c @@ -88,7 +88,7 @@ GCC:*_*_IA32_PP_FLAGS == -m32 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h GCC:*_*_IA32_ASM_FLAGS == -m32 -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h - 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 + 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 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 GCC:*_*_X64_PP_FLAGS == -m64 -E -x assembler-with-cpp -include $(DEST_DIR_DEBUG)/AutoGen.h GCC:*_*_X64_ASM_FLAGS == -m64 -c -x assembler -imacros $(DEST_DIR_DEBUG)/AutoGen.h @@ -97,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 # XCODE:*_*_IA32_DLINK_PATH == gcc - XCODE:*_*_IA32_DLINK_FLAGS == -arch i386 -o $(BIN_DIR)/SecMain -L/usr/X11R6/lib -lXext -lX11 -framework IOKit -framework Carbon + XCODE:*_*_IA32_DLINK_FLAGS == -arch i386 -o $(BIN_DIR)/SecMain -L/usr/X11R6/lib -lXext -lX11 -framework IOKit -framework Carbon XCODE:*_*_IA32_ASM_FLAGS == -arch i386 -g XCODE:*_*_X64_DLINK_PATH == gcc - XCODE:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/SecMain -L/usr/X11R6/lib -lXext -lX11 -lIOKit -framework Carbon + XCODE:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/SecMain -L/usr/X11R6/lib -lXext -lX11 -lIOKit -framework Carbon XCODE:*_*_X64_ASM_FLAGS == -g -- cgit v1.2.3