From b742fd9b5b3c07129abfa3c099655346f6b1e6a6 Mon Sep 17 00:00:00 2001 From: Marty Gloff Date: Thu, 17 Dec 2015 10:10:47 -0600 Subject: Hostboot Bootloader Infrastructure New and changed code to provide bootloader infrastructure. Changes to build bootloader and create the image file. Change-Id: Ie400f0ca6954b86e275fd68c9462f8d18eeec98a RTC:127211 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22856 Tested-by: Jenkins Server Reviewed-by: Daniel M. Crowell --- src/libc++/builtins.C | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/libc++') diff --git a/src/libc++/builtins.C b/src/libc++/builtins.C index f8dc97aad..d66e81ec3 100755 --- a/src/libc++/builtins.C +++ b/src/libc++/builtins.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2010,2015 */ +/* Contributors Listed Below - COPYRIGHT 2010,2016 */ /* [+] International Business Machines Corp. */ /* */ /* */ @@ -22,6 +22,7 @@ /* permissions and limitations under the License. */ /* */ /* IBM_PROLOG_END_TAG */ +#ifndef bl_builtins_C #include #include @@ -58,6 +59,7 @@ void operator delete[](void* p) { return free(p); }; +#endif // bl_builtins_C extern "C" int __cxa_guard_acquire(volatile uint64_t* gv) { @@ -91,6 +93,7 @@ extern "C" void __cxa_guard_release(volatile uint64_t* gv) return; } +#ifndef bl_builtins_C extern "C" void __cxa_pure_virtual() { // TODO: Add better code for invalid pure virtual call. @@ -162,6 +165,6 @@ extern "C" int __cxa_atexit(void (*i_dtor)(void*), } return 0; } - +#endif // bl_builtins_C -- cgit v1.2.1