diff options
author | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-06-29 05:13:33 +0000 |
---|---|---|
committer | jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-06-29 05:13:33 +0000 |
commit | 59ad461d9d2ce06baee1248a9f856bc417e59e4c (patch) | |
tree | b3f547ee46b85b565a22728a886e3cba331c8557 /EmulatorPkg | |
parent | 5817d50862fa7d137ae3e61caff4c2578d473595 (diff) | |
download | edk2-59ad461d9d2ce06baee1248a9f856bc417e59e4c.tar.gz edk2-59ad461d9d2ce06baee1248a9f856bc417e59e4c.tar.bz2 edk2-59ad461d9d2ce06baee1248a9f856bc417e59e4c.zip |
EmulatorPkg/Unix: Rename SecMain to Host
Signed-off-by: jljusten
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11924 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'EmulatorPkg')
-rw-r--r-- | EmulatorPkg/Unix/GdbRun | 2 | ||||
-rw-r--r-- | EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c | 2 | ||||
-rw-r--r-- | EmulatorPkg/Unix/Host/BlockIo.c | 2 | ||||
-rw-r--r-- | EmulatorPkg/Unix/Host/EmuThunk.c | 2 | ||||
-rw-r--r-- | EmulatorPkg/Unix/Host/Host.c (renamed from EmulatorPkg/Unix/Host/SecMain.c) | 6 | ||||
-rw-r--r-- | EmulatorPkg/Unix/Host/Host.h (renamed from EmulatorPkg/Unix/Host/SecMain.h) | 0 | ||||
-rw-r--r-- | EmulatorPkg/Unix/Host/Host.inf (renamed from EmulatorPkg/Unix/Host/SecMain.inf) | 12 | ||||
-rw-r--r-- | EmulatorPkg/Unix/Host/Ia32/SwitchStack.c | 2 | ||||
-rw-r--r-- | EmulatorPkg/Unix/Host/LinuxPacketFilter.c | 2 | ||||
-rw-r--r-- | EmulatorPkg/Unix/Host/PosixFileSystem.c | 2 | ||||
-rw-r--r-- | EmulatorPkg/Unix/Host/Pthreads.c | 2 | ||||
-rw-r--r-- | EmulatorPkg/Unix/Host/X11GraphicsWindow.c | 2 | ||||
-rw-r--r-- | EmulatorPkg/Unix/UnixX64.dsc | 4 | ||||
-rw-r--r-- | EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser | 18 | ||||
-rw-r--r-- | EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser | 18 | ||||
-rwxr-xr-x | EmulatorPkg/Unix/build.sh | 6 | ||||
-rwxr-xr-x | EmulatorPkg/Unix/build64.sh | 6 |
17 files changed, 44 insertions, 44 deletions
diff --git a/EmulatorPkg/Unix/GdbRun b/EmulatorPkg/Unix/GdbRun index 14a398d62a..b2d6dccccb 100644 --- a/EmulatorPkg/Unix/GdbRun +++ b/EmulatorPkg/Unix/GdbRun @@ -28,7 +28,7 @@ define hook-stop if $_exitcode != 42 quit else - source SecMain.gdb + source Host.gdb end end diff --git a/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c b/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c index b94da9ee82..4ba27c2a6a 100644 --- a/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c +++ b/EmulatorPkg/Unix/Host/BerkeleyPacketFilter.c @@ -18,7 +18,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
-#include "SecMain.h"
+#include "Host.h"
#ifdef __APPLE__
diff --git a/EmulatorPkg/Unix/Host/BlockIo.c b/EmulatorPkg/Unix/Host/BlockIo.c index 657ce34e45..50fe9b575e 100644 --- a/EmulatorPkg/Unix/Host/BlockIo.c +++ b/EmulatorPkg/Unix/Host/BlockIo.c @@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
-#include "SecMain.h"
+#include "Host.h"
#define EMU_BLOCK_IO_PRIVATE_SIGNATURE SIGNATURE_32 ('E', 'M', 'b', 'k')
typedef struct {
diff --git a/EmulatorPkg/Unix/Host/EmuThunk.c b/EmulatorPkg/Unix/Host/EmuThunk.c index d9816298d4..52875c3bce 100644 --- a/EmulatorPkg/Unix/Host/EmuThunk.c +++ b/EmulatorPkg/Unix/Host/EmuThunk.c @@ -21,7 +21,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#include "SecMain.h" +#include "Host.h" #ifdef __APPLE__ #define DebugAssert _Mangle__DebugAssert diff --git a/EmulatorPkg/Unix/Host/SecMain.c b/EmulatorPkg/Unix/Host/Host.c index a0af3e4d53..17130168f0 100644 --- a/EmulatorPkg/Unix/Host/SecMain.c +++ b/EmulatorPkg/Unix/Host/Host.c @@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#include "SecMain.h" +#include "Host.h" #ifdef __APPLE__ #define MAP_ANONYMOUS MAP_ANON @@ -66,8 +66,8 @@ int gInXcode = 0; /*++ Breakpoint target for Xcode project. Set in the Xcode XML - Xcode breakpoint will 'source SecMain.gdb' - gGdbWorkingFileName is set to SecMain.gdb + Xcode breakpoint will 'source Host.gdb' + gGdbWorkingFileName is set to Host.gdb **/ VOID diff --git a/EmulatorPkg/Unix/Host/SecMain.h b/EmulatorPkg/Unix/Host/Host.h index aff7c36d79..aff7c36d79 100644 --- a/EmulatorPkg/Unix/Host/SecMain.h +++ b/EmulatorPkg/Unix/Host/Host.h diff --git a/EmulatorPkg/Unix/Host/SecMain.inf b/EmulatorPkg/Unix/Host/Host.inf index c9ba71dc4e..c2d16697c9 100644 --- a/EmulatorPkg/Unix/Host/SecMain.inf +++ b/EmulatorPkg/Unix/Host/Host.inf @@ -17,7 +17,7 @@ [Defines]
INF_VERSION = 0x00010005
- BASE_NAME = SecMain
+ BASE_NAME = Host
FILE_GUID = 8863C0AD-7724-C84B-88E5-A33B116D1485
MODULE_TYPE = USER_DEFINED
VERSION_STRING = 1.0
@@ -29,7 +29,7 @@ #
[Sources]
- SecMain.c
+ Host.c
EmuThunk.c
X11GraphicsWindow.c
Pthreads.c
@@ -113,13 +113,13 @@ [BuildOptions]
- GCC:*_*_IA32_DLINK_FLAGS == -o $(BIN_DIR)/SecMain -m elf_i386 -dynamic-linker /lib$(LIB_ARCH_SFX)/ld-linux.so.2 /usr/lib$(LIB_ARCH_SFX)/crt1.o /usr/lib$(LIB_ARCH_SFX)/crti.o -L/usr/X11R6/lib -lXext -lX11 /usr/lib$(LIB_ARCH_SFX)/crtn.o
+ GCC:*_*_IA32_DLINK_FLAGS == -o $(BIN_DIR)/Host -m elf_i386 -dynamic-linker /lib$(LIB_ARCH_SFX)/ld-linux.so.2 /usr/lib$(LIB_ARCH_SFX)/crt1.o /usr/lib$(LIB_ARCH_SFX)/crti.o -L/usr/X11R6/lib -lXext -lX11 /usr/lib$(LIB_ARCH_SFX)/crtn.o
GCC:*_*_*_DLINK2_FLAGS == -lpthread -lc
GCC:*_*_IA32_CC_FLAGS == -m32 -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:*_*_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_x86_64 -dynamic-linker /lib$(LIB_ARCH_SFX)/ld-linux-x86-64.so.2 /usr/lib$(LIB_ARCH_SFX)/crt1.o /usr/lib$(LIB_ARCH_SFX)/crti.o -L/usr/X11R6/lib -lXext -lX11 /usr/lib$(LIB_ARCH_SFX)/crtn.o
+ GCC:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/Host -m elf_x86_64 -dynamic-linker /lib$(LIB_ARCH_SFX)/ld-linux-x86-64.so.2 /usr/lib$(LIB_ARCH_SFX)/crt1.o /usr/lib$(LIB_ARCH_SFX)/crti.o -L/usr/X11R6/lib -lXext -lX11 /usr/lib$(LIB_ARCH_SFX)/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:*_GCC44_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))"
GCC:*_GCC45_X64_CC_FLAGS = "-DEFIAPI=__attribute__((ms_abi))"
@@ -131,10 +131,10 @@ #
XCODE:*_*_IA32_DLINK_PATH == gcc
XCODE:*_*_IA32_CC_FLAGS == -arch i386 -O0 -g -include $(DEST_DIR_DEBUG)/AutoGen.h -c -fshort-wchar -fno-strict-aliasing
- XCODE:*_*_IA32_DLINK_FLAGS == -arch i386 -o $(BIN_DIR)/SecMain -L/usr/X11R6/lib -lXext -lX11 -framework Carbon
+ XCODE:*_*_IA32_DLINK_FLAGS == -arch i386 -o $(BIN_DIR)/Host -L/usr/X11R6/lib -lXext -lX11 -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 -framework Carbon
+ XCODE:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/Host -L/usr/X11R6/lib -lXext -lX11 -framework Carbon
XCODE:*_*_X64_ASM_FLAGS == -g
diff --git a/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c b/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c index 1d36500e78..118083f4b5 100644 --- a/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c +++ b/EmulatorPkg/Unix/Host/Ia32/SwitchStack.c @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. --*/ -#include "SecMain.h" +#include "Host.h" /** diff --git a/EmulatorPkg/Unix/Host/LinuxPacketFilter.c b/EmulatorPkg/Unix/Host/LinuxPacketFilter.c index 41124f72eb..15e4bc9543 100644 --- a/EmulatorPkg/Unix/Host/LinuxPacketFilter.c +++ b/EmulatorPkg/Unix/Host/LinuxPacketFilter.c @@ -19,7 +19,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/
-#include "SecMain.h"
+#include "Host.h"
#ifndef __APPLE__
diff --git a/EmulatorPkg/Unix/Host/PosixFileSystem.c b/EmulatorPkg/Unix/Host/PosixFileSystem.c index aab7161b7f..40b412e5f2 100644 --- a/EmulatorPkg/Unix/Host/PosixFileSystem.c +++ b/EmulatorPkg/Unix/Host/PosixFileSystem.c @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#include "SecMain.h" +#include "Host.h" #define EMU_SIMPLE_FILE_SYSTEM_PRIVATE_SIGNATURE SIGNATURE_32 ('E', 'P', 'f', 's') diff --git a/EmulatorPkg/Unix/Host/Pthreads.c b/EmulatorPkg/Unix/Host/Pthreads.c index 36d1298651..c60c298099 100644 --- a/EmulatorPkg/Unix/Host/Pthreads.c +++ b/EmulatorPkg/Unix/Host/Pthreads.c @@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#include "SecMain.h" +#include "Host.h" #include <pthread.h> diff --git a/EmulatorPkg/Unix/Host/X11GraphicsWindow.c b/EmulatorPkg/Unix/Host/X11GraphicsWindow.c index 00d8c58a5b..adb9b2b830 100644 --- a/EmulatorPkg/Unix/Host/X11GraphicsWindow.c +++ b/EmulatorPkg/Unix/Host/X11GraphicsWindow.c @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ -#include "SecMain.h" +#include "Host.h" #include <sys/ipc.h> #include <sys/shm.h> diff --git a/EmulatorPkg/Unix/UnixX64.dsc b/EmulatorPkg/Unix/UnixX64.dsc index c1b30def08..6fb76e1c0c 100644 --- a/EmulatorPkg/Unix/UnixX64.dsc +++ b/EmulatorPkg/Unix/UnixX64.dsc @@ -205,7 +205,7 @@ gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareBlockSize|0x10000
gEmulatorPkgTokenSpaceGuid.PcdEmuFirmwareVolume|L"../FV/FV_RECOVERY.fd"
- gEmulatorPkgTokenSpaceGuid.PcdEmuMemorySizeForSecMain|L"64!64"
+ gEmulatorPkgTokenSpaceGuid.PcdEmuMemorySize|L"64!64"
!if $(BUILD_NEW_SHELL)
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 }
@@ -296,7 +296,7 @@ ##
# Emulator, OS POSIX application
##
- EmulatorPkg/Unix/Host/SecMain.inf
+ EmulatorPkg/Unix/Host/Host.inf
!endif
!ifndef $(SKIP_MAIN_BUILD)
diff --git a/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser b/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser index e2dfcb9f29..026a84544d 100644 --- a/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser +++ b/EmulatorPkg/Unix/Xcode/xcode_project32/xcode_project.xcodeproj/default.pbxuser @@ -2,14 +2,14 @@ { 08FB7793FE84155DC02AAC07 /* Project object */ = { activeBuildConfigurationName = Debug; - activeExecutable = BA11A1010FB10BCE00D06FEC /* SecMain.dll */; + activeExecutable = BA11A1010FB10BCE00D06FEC /* Host.dll */; activeTarget = D28A88AD04BDD90700651E21 /* xcode_project */; breakpoints = ( BA11A11A0FB10E0700D06FEC /* SecGdbConfigBreak */, ); codeSenseManager = BA11A0FE0FB10B4800D06FEC /* Code sense */; executables = ( - BA11A1010FB10BCE00D06FEC /* SecMain.dll */, + BA11A1010FB10BCE00D06FEC /* Host.dll */, ); perUserDictionary = { "PBXConfiguration.PBXBreakpointsDataSource.v1:1CA1AED706398EBD00589147" = { @@ -92,7 +92,7 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - BA11A1010FB10BCE00D06FEC /* SecMain.dll */ = { + BA11A1010FB10BCE00D06FEC /* Host.dll */ = { isa = PBXExecutable; activeArgIndices = ( ); @@ -144,9 +144,9 @@ ); executableSystemSymbolLevel = 0; executableUserSymbolLevel = 0; - launchableReference = BA11A1020FB10BCE00D06FEC /* SecMain.dll */; + launchableReference = BA11A1020FB10BCE00D06FEC /* Host.dll */; libgmallocEnabled = 0; - name = SecMain.dll; + name = Host.dll; savedGlobals = { }; showTypeColumn = 0; @@ -154,11 +154,11 @@ ); startupPath = ../../../../Build/EmuUnixIa32/DEBUG_XCLANG/IA32; }; - BA11A1020FB10BCE00D06FEC /* SecMain.dll */ = { + BA11A1020FB10BCE00D06FEC /* Host.dll */ = { isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; - name = SecMain.dll; - path = ../../../../Build/EmuUnixIa32/DEBUG_XCLANG/IA32/SecMain; + name = Host.dll; + path = ../../../../Build/EmuUnixIa32/DEBUG_XCLANG/IA32/Host; sourceTree = SOURCE_ROOT; }; BA11A11A0FB10E0700D06FEC /* SecGdbConfigBreak */ = { @@ -172,7 +172,7 @@ delayBeforeContinue = 0; hitCount = 0; ignoreCount = 0; - location = SecMain; + location = Host; modificationTime = 263261853.260195; originalNumberOfMultipleMatches = 1; state = 1; diff --git a/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser b/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser index 55c869f9fd..3cc5f92d36 100644 --- a/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser +++ b/EmulatorPkg/Unix/Xcode/xcode_project64/xcode_project.xcodeproj/default.pbxuser @@ -2,14 +2,14 @@ { 08FB7793FE84155DC02AAC07 /* Project object */ = { activeBuildConfigurationName = Debug; - activeExecutable = BA11A1010FB10BCE00D06FEC /* SecMain.dll */; + activeExecutable = BA11A1010FB10BCE00D06FEC /* Host.dll */; activeTarget = D28A88AD04BDD90700651E21 /* xcode_project */; breakpoints = ( BA11A11A0FB10E0700D06FEC /* SecGdbConfigBreak */, ); codeSenseManager = BA11A0FE0FB10B4800D06FEC /* Code sense */; executables = ( - BA11A1010FB10BCE00D06FEC /* SecMain.dll */, + BA11A1010FB10BCE00D06FEC /* Host.dll */, ); perUserDictionary = { "PBXConfiguration.PBXBreakpointsDataSource.v1:1CA1AED706398EBD00589147" = { @@ -92,7 +92,7 @@ isa = PBXCodeSenseManager; indexTemplatePath = ""; }; - BA11A1010FB10BCE00D06FEC /* SecMain.dll */ = { + BA11A1010FB10BCE00D06FEC /* Host.dll */ = { isa = PBXExecutable; activeArgIndices = ( ); @@ -144,9 +144,9 @@ ); executableSystemSymbolLevel = 0; executableUserSymbolLevel = 0; - launchableReference = BA11A1020FB10BCE00D06FEC /* SecMain.dll */; + launchableReference = BA11A1020FB10BCE00D06FEC /* Host.dll */; libgmallocEnabled = 0; - name = SecMain.dll; + name = Host.dll; savedGlobals = { }; showTypeColumn = 0; @@ -154,11 +154,11 @@ ); startupPath = ../../../../Build/EmuUnixX64/DEBUG_XCLANG/X64; }; - BA11A1020FB10BCE00D06FEC /* SecMain.dll */ = { + BA11A1020FB10BCE00D06FEC /* Host.dll */ = { isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; - name = SecMain.dll; - path = ../../../../Build/EmuUnixX64/DEBUG_XCLANG/X64/SecMain; + name = Host.dll; + path = ../../../../Build/EmuUnixX64/DEBUG_XCLANG/X64/Host; sourceTree = SOURCE_ROOT; }; BA11A11A0FB10E0700D06FEC /* SecGdbConfigBreak */ = { @@ -172,7 +172,7 @@ delayBeforeContinue = 0; hitCount = 0; ignoreCount = 0; - location = SecMain; + location = Host; modificationTime = 263261853.260195; originalNumberOfMultipleMatches = 1; state = 1; diff --git a/EmulatorPkg/Unix/build.sh b/EmulatorPkg/Unix/build.sh index b7dc0bb109..98b4f69479 100755 --- a/EmulatorPkg/Unix/build.sh +++ b/EmulatorPkg/Unix/build.sh @@ -96,13 +96,13 @@ do # # On Darwin we can't use dlopen, so we have to load the real PE/COFF images. # This .gdbinit script sets a breakpoint that loads symbols for the PE/COFFEE - # images that get loaded in SecMain + # images that get loaded in Host # cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$UNIXPKG_TOOLS"/IA32 ;; esac - /usr/bin/gdb $BUILD_ROOT_ARCH/SecMain -q -cd=$BUILD_ROOT_ARCH -x $WORKSPACE/EmulatorPkg/Unix/GdbRun + /usr/bin/gdb $BUILD_ROOT_ARCH/Host -q -cd=$BUILD_ROOT_ARCH -x $WORKSPACE/EmulatorPkg/Unix/GdbRun exit fi @@ -131,7 +131,7 @@ if [[ $TARGET_TOOLS == $UNIXPKG_TOOLS ]]; then else build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a IA32 -t $TARGET_TOOLS -D BUILD_32 -D UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 $1 $2 $3 $4 $5 $6 $7 $8 modules build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a IA32 -t $UNIXPKG_TOOLS -D BUILD_32 $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8 - cp $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$TARGET_TOOLS"/IA32/SecMain $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$UNIXPKG_TOOLS"/IA32 + cp $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$TARGET_TOOLS"/IA32/Host $WORKSPACE/Build/EmuUnixIa32/DEBUG_"$UNIXPKG_TOOLS"/IA32 fi exit $? diff --git a/EmulatorPkg/Unix/build64.sh b/EmulatorPkg/Unix/build64.sh index 25d14dfc67..6ddbe2d50d 100755 --- a/EmulatorPkg/Unix/build64.sh +++ b/EmulatorPkg/Unix/build64.sh @@ -97,13 +97,13 @@ do # # On Darwin we can't use dlopen, so we have to load the real PE/COFF images. # This .gdbinit script sets a breakpoint that loads symbols for the PE/COFFEE - # images that get loaded in SecMain + # images that get loaded in Host # cp $WORKSPACE/EmulatorPkg/Unix/.gdbinit $WORKSPACE/Build/EmuUnixX64/DEBUG_"$UNIXPKG_TOOLS"/X64 ;; esac - /usr/bin/gdb $BUILD_ROOT_ARCH/SecMain -q -cd=$BUILD_ROOT_ARCH -x $WORKSPACE/EmulatorPkg/Unix/GdbRun + /usr/bin/gdb $BUILD_ROOT_ARCH/Host -q -cd=$BUILD_ROOT_ARCH -x $WORKSPACE/EmulatorPkg/Unix/GdbRun exit fi @@ -132,7 +132,7 @@ if [[ $TARGET_TOOLS == $UNIXPKG_TOOLS ]]; then else build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a X64 -t $TARGET_TOOLS -D UNIX_SEC_BUILD -D SKIP_MAIN_BUILD -n 3 $1 $2 $3 $4 $5 $6 $7 $8 modules build -p $WORKSPACE/EmulatorPkg/Unix/UnixX64.dsc -a X64 -t $UNIXPKG_TOOLS $NETWORK_SUPPORT $BUILD_NEW_SHELL $BUILD_FAT -n 3 $1 $2 $3 $4 $5 $6 $7 $8 - cp $WORKSPACE/Build/EmuUnixX64/DEBUG_"$TARGET_TOOLS"/X64/SecMain $WORKSPACE/Build/EmuUnixX64/DEBUG_"$UNIXPKG_TOOLS"/X64 + cp $WORKSPACE/Build/EmuUnixX64/DEBUG_"$TARGET_TOOLS"/X64/Host $WORKSPACE/Build/EmuUnixX64/DEBUG_"$UNIXPKG_TOOLS"/X64 fi exit $? |