Revision: 16081
http://sourceforge.net/p/edk2/code/16081
Author: darylm503
Date: 2014-09-09 21:59:08 +0000 (Tue, 09 Sep 2014)
Log Message:
-----------
StdLib: Changes needed to support XCODE5
I had to make the following changes to make this build work: >build -p
AppPkg/AppPkg.dsc -a X64 -t XCODE5
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Andrew Fish <[email protected]>
Reviewed-by: Daryl McDaniel <[email protected]>
Modified Paths:
--------------
trunk/edk2/StdLib/Include/sys/cdefs_aout.h
trunk/edk2/StdLib/LibC/StdLib/Environs.c
trunk/edk2/StdLib/StdLib.inc
Modified: trunk/edk2/StdLib/Include/sys/cdefs_aout.h
===================================================================
--- trunk/edk2/StdLib/Include/sys/cdefs_aout.h 2014-09-09 17:59:19 UTC (rev
16080)
+++ trunk/edk2/StdLib/Include/sys/cdefs_aout.h 2014-09-09 21:59:08 UTC (rev
16081)
@@ -44,12 +44,12 @@
#define __weak_extern(sym) /* NOTHING */
#define __weak_reference(sym) /* NOTHING */
- #if !defined(__CC_ARM)
- #define __warn_references(sym,msg) \
- __asm(".stabs \"" msg "\",30,0,0,0"); \
+ #if defined(__CC_ARM) || defined(__APPLE__)
+ #define __warn_references(sym,msg)
+ #else
+ #define __warn_references(sym,msg) \
+ __asm(".stabs \"" msg "\",30,0,0,0"); \
__asm(".stabs \"_" #sym "\",1,0,0,0");
- #else
- #define __warn_references(sym,msg)
#endif
#endif
#else /* __STDC__ */
Modified: trunk/edk2/StdLib/LibC/StdLib/Environs.c
===================================================================
--- trunk/edk2/StdLib/LibC/StdLib/Environs.c 2014-09-09 17:59:19 UTC (rev
16080)
+++ trunk/edk2/StdLib/LibC/StdLib/Environs.c 2014-09-09 21:59:08 UTC (rev
16081)
@@ -120,7 +120,7 @@
longjmp(gMD->MainExit, 0x55); // Get out of here. longjmp can't return
0. Use 0x55 for a non-zero value.
#ifdef __GNUC__
- __builtin__Exit(status); /* Keep GCC happy - never reached */
+ _Exit(status); /* Keep GCC happy - never reached */
#endif
}
Modified: trunk/edk2/StdLib/StdLib.inc
===================================================================
--- trunk/edk2/StdLib/StdLib.inc 2014-09-09 17:59:19 UTC (rev 16080)
+++ trunk/edk2/StdLib/StdLib.inc 2014-09-09 21:59:08 UTC (rev 16081)
@@ -105,19 +105,21 @@
!ifndef $(EMULATE)
# These Build Options are used when building the Standard Libraries to be run
# on real hardware.
- INTEL:*_*_*_CC_FLAGS = /Qfreestanding /D UEFI_C_SOURCE
- MSFT:*_*_*_CC_FLAGS = /X /Zc:wchar_t /D UEFI_C_SOURCE
- GCC:*_*_*_CC_FLAGS = -nostdinc -nostdlib -DUEFI_C_SOURCE
- RVCT:*_*_*_CC_FLAGS = --library_interface=none -DUEFI_C_SOURCE
-J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm
- ARMGCC:*_*_*_CC_FLAGS = -nostdinc -nostdlib -DUEFI_C_SOURCE
-Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length
+ INTEL:*_*_*_CC_FLAGS = /Qfreestanding /D UEFI_C_SOURCE
+ MSFT:*_*_*_CC_FLAGS = /X /Zc:wchar_t /D UEFI_C_SOURCE
+ GCC:*_*_*_CC_FLAGS = -nostdinc -nostdlib -DUEFI_C_SOURCE
+ RVCT:*_*_*_CC_FLAGS = --library_interface=none -DUEFI_C_SOURCE
-J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm
+ ARMGCC:*_*_*_CC_FLAGS = -nostdinc -nostdlib -DUEFI_C_SOURCE
-Wno-unknown-pragmas -Wno-unused -Wno-format-zero-length
+ XCODE:*_*_*_CC_FLAGS = -nostdinc -nostdlib -DUEFI_C_SOURCE
-Wno-unused-const-variable -Wno-string-compare -Wno-sometimes-uninitialized
!else
# The Build Options, below, are only used when building the Standard
Libraries
# to be run under an emulation environment.
# They disable optimization which facillitates debugging under the Emulation
environment.
- INTEL:*_*_IA32_CC_FLAGS = /Od /D UEFI_C_SOURCE
- MSFT:*_*_IA32_CC_FLAGS = /Od /D UEFI_C_SOURCE
- GCC:*_*_IA32_CC_FLAGS = -O0 -DUEFI_C_SOURCE
- RVCT:*_*_*_CC_FLAGS = --library_interface=none -DUEFI_C_SOURCE
-J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm
- ARMGCC:*_*_*_CC_FLAGS = -O0 -DUEFI_C_SOURCE -Wno-unknown-pragmas
-Wno-unused -Wno-format-zero-length
+ INTEL:*_*_IA32_CC_FLAGS = /Od /D UEFI_C_SOURCE
+ MSFT:*_*_IA32_CC_FLAGS = /Od /D UEFI_C_SOURCE
+ GCC:*_*_IA32_CC_FLAGS = -O0 -DUEFI_C_SOURCE
+ RVCT:*_*_*_CC_FLAGS = --library_interface=none -DUEFI_C_SOURCE
-J$(WORKSPACE)/StdLib/Include -J$(WORKSPACE)/StdLib/Include/Arm
+ ARMGCC:*_*_*_CC_FLAGS = -O0 -DUEFI_C_SOURCE -Wno-unknown-pragmas
-Wno-unused -Wno-format-zero-length
+ XCODE:*_*_*_CC_FLAGS = -O0 -DUEFI_C_SOURCE -Wno-unused-const-variable
-Wno-string-compare -Wno-sometimes-uninitialized
!endif
------------------------------------------------------------------------------
Want excitement?
Manually upgrade your production database.
When you want reliability, choose Perforce.
Perforce version control. Predictably reliable.
http://pubads.g.doubleclick.net/gampad/clk?id=157508191&iu=/4140/ostg.clktrk
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
