]> git.proxmox.com Git - mirror_edk2.git/commitdiff
EmulatorPkg/Unix/Host: Disable inline/optimizations for XCODE5
authorAndrew Fish <afish@apple.com>
Thu, 15 Aug 2019 16:48:57 +0000 (09:48 -0700)
committerMichael D Kinney <michael.d.kinney@intel.com>
Mon, 19 Aug 2019 16:57:25 +0000 (09:57 -0700)
* 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>
EmulatorPkg/Unix/Host/Host.c
EmulatorPkg/Unix/Host/Host.inf

index febfb1f44c87d31e8f040553349676380159c245..b431a4c2ed39ab8583f4c2949160c84172ad0c2f 100644 (file)
@@ -1113,6 +1113,9 @@ DlLoadImage (
 }\r
 \r
 \r
+#ifdef __APPLE__\r
+__attribute__((noinline))\r
+#endif\r
 VOID\r
 SecGdbScriptBreak (\r
   char                *FileName,\r
index ca4294249bf617dc758a5b47883545121c930654..c479d2b7d02968eb453d8ee14fdbdd934f81db74 100644 (file)
    XCODE:*_*_IA32_ASM_FLAGS == -arch i386 -g\r
 \r
    XCODE:*_*_X64_DLINK_PATH == gcc\r
-   XCODE:*_*_X64_DLINK_FLAGS == -L/usr/X11R6/lib -lXext -lX11 -framework Carbon -Wl,-no_pie\r
+   XCODE:*_*_X64_DLINK_FLAGS == -o $(BIN_DIR)/Host -L/usr/X11R6/lib -lXext -lX11 -framework Carbon -Wl,-no_pie\r
    XCODE:*_*_X64_ASM_FLAGS == -g\r
-   XCODE:*_*_X64_CC_FLAGS = -target x86_64-apple-darwin -I$(WORKSPACE)/EmulatorPkg/Unix/Host/X11IncludeHack "-DEFIAPI=__attribute__((ms_abi))"\r
+   XCODE:*_*_X64_CC_FLAGS = -O0 -target x86_64-apple-darwin -I$(WORKSPACE)/EmulatorPkg/Unix/Host/X11IncludeHack "-DEFIAPI=__attribute__((ms_abi))"\r