diff options
| author | Andrew Fish <afish@apple.com> | 2019-08-15 09:48:57 -0700 |
|---|---|---|
| committer | Michael D Kinney <michael.d.kinney@intel.com> | 2019-08-19 09:57:25 -0700 |
| commit | 4331b9f5f0ae488cd59707cf3e37f4997a81909c (patch) | |
| tree | c58bc0c3483de9bbb55745e8b8aba10eb49d30b2 /EmulatorPkg | |
| parent | 57c320c932438485134fbe06699b98a2f153d9eb (diff) | |
| download | edk2-4331b9f5f0ae488cd59707cf3e37f4997a81909c.zip edk2-4331b9f5f0ae488cd59707cf3e37f4997a81909c.tar.gz edk2-4331b9f5f0ae488cd59707cf3e37f4997a81909c.tar.bz2 | |
EmulatorPkg/Unix/Host: Disable inline/optimizations for XCODE5
* Disable XCODE5 compiler optimizations fort Unix/Host.
* Disable inline of SecGdbScriptBreak() to improve
compatibility with XCODE5
* For X64 XCODE5 builds place output Host application
in $(BIN_DIR) to match all other EmulatorPkg Host
application builds.
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Andrew Fish <afish@apple.com>
Cc: Ray Ni <ray.ni@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Tested-by: Andrew Fish <afish@apple.com>
Diffstat (limited to 'EmulatorPkg')
| -rw-r--r-- | EmulatorPkg/Unix/Host/Host.c | 3 | ||||
| -rw-r--r-- | EmulatorPkg/Unix/Host/Host.inf | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c index febfb1f..b431a4c 100644 --- a/EmulatorPkg/Unix/Host/Host.c +++ b/EmulatorPkg/Unix/Host/Host.c @@ -1113,6 +1113,9 @@ DlLoadImage ( }
+#ifdef __APPLE__
+__attribute__((noinline))
+#endif
VOID
SecGdbScriptBreak (
char *FileName,
diff --git a/EmulatorPkg/Unix/Host/Host.inf b/EmulatorPkg/Unix/Host/Host.inf index ca42942..c479d2b 100644 --- a/EmulatorPkg/Unix/Host/Host.inf +++ b/EmulatorPkg/Unix/Host/Host.inf @@ -137,6 +137,6 @@ XCODE:*_*_IA32_ASM_FLAGS == -arch i386 -g
XCODE:*_*_X64_DLINK_PATH == gcc
- XCODE:*_*_X64_DLINK_FLAGS == -L/usr/X11R6/lib -lXext -lX11 -framework Carbon -Wl,-no_pie
+ XCODE:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/Host -L/usr/X11R6/lib -lXext -lX11 -framework Carbon -Wl,-no_pie
XCODE:*_*_X64_ASM_FLAGS == -g
- XCODE:*_*_X64_CC_FLAGS = -target x86_64-apple-darwin -I$(WORKSPACE)/EmulatorPkg/Unix/Host/X11IncludeHack "-DEFIAPI=__attribute__((ms_abi))"
+ XCODE:*_*_X64_CC_FLAGS = -O0 -target x86_64-apple-darwin -I$(WORKSPACE)/EmulatorPkg/Unix/Host/X11IncludeHack "-DEFIAPI=__attribute__((ms_abi))"
|