Indeed. It should be removed. On Jan 23, 2012, at 4:29 PM, Jean-Daniel Dupas wrote:
> Not guarded enough though. > __APPLE__ is unconditionally defined by clang and GCC when compiling on OS X > and iOS, and the second condition is true on Lion which actually does not > include this header. > > Le 24 janv. 2012 à 01:18, Howard Hinnant a écrit : > >> Right, its inclusion is guarded: >> >>> +#if __APPLE__ >>> + #include <Availability.h> >>> + #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 >>> + #include <CrashReporterClient.h> >> >> Howard >> >> On Jan 23, 2012, at 7:15 PM, Jean-Daniel Dupas wrote: >> >>> I know this part is not done yet, but I want just to be sure that you know >>> CrashReporterClient.h is a private header and is not available outside of >>> Apple (unless it is part of the latest Xcode beta that I don't have). >>> >>> Le 24 janv. 2012 à 00:58, Howard Hinnant a écrit : >>> >>>> Author: hhinnant >>>> Date: Mon Jan 23 17:58:26 2012 >>>> New Revision: 148752 >>>> >>>> URL: http://llvm.org/viewvc/llvm-project?rev=148752&view=rev >>>> Log: >>>> I renamed abort_message to be a C++ file to simplify my simplistic build >>>> script which I'm still working on. I also added a struct for the crash >>>> reporter on __APPLE__. >>>> >>>> Added: >>>> libcxxabi/trunk/src/abort_message.cpp >>>> >>>> Added: libcxxabi/trunk/src/abort_message.cpp >>>> URL: >>>> http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/src/abort_message.cpp?rev=148752&view=auto >>>> ============================================================================== >>>> --- libcxxabi/trunk/src/abort_message.cpp (added) >>>> +++ libcxxabi/trunk/src/abort_message.cpp Mon Jan 23 17:58:26 2012 >>>> @@ -0,0 +1,58 @@ >>>> +//===-------------------------- abort_message.c >>>> ---------------------------===// >>>> +// >>>> +// The LLVM Compiler Infrastructure >>>> +// >>>> +// This file is dual licensed under the MIT and the University of >>>> Illinois Open >>>> +// Source Licenses. See LICENSE.TXT for details. >>>> +// >>>> +//===----------------------------------------------------------------------===// >>>> + >>>> +#include <stdlib.h> >>>> +#include <stdio.h> >>>> +#include <stdarg.h> >>>> + >>>> +#if __APPLE__ >>>> + #include <Availability.h> >>>> + #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 >>>> + #include <CrashReporterClient.h> >>>> + >>>> + // If any clients of llvm try to link to >>>> libCrashReporterClient.a themselves, >>>> + // only one crash info struct will be used. >>>> + extern "C" { >>>> + CRASH_REPORTER_CLIENT_HIDDEN >>>> + struct crashreporter_annotations_t gCRAnnotations >>>> + __attribute__((section("__DATA," >>>> CRASHREPORTER_ANNOTATIONS_SECTION))) >>>> + = { CRASHREPORTER_ANNOTATIONS_VERSION, 0, 0, 0, 0, 0, 0 }; >>>> + } >>>> + >>>> + #endif >>>> +#endif >>>> + >>>> +#include "abort_message.h" >>>> + >>>> +__attribute__((visibility("hidden"))) >>>> +void abort_message(const char* format, ...) >>>> +{ >>>> + // write message to stderr >>>> +#if __APPLE__ >>>> + fprintf(stderr, "libc++abi.dylib: "); >>>> +#endif >>>> + va_list list; >>>> + va_start(list, format); >>>> + vfprintf(stderr, format, list); >>>> + va_end(list); >>>> + fprintf(stderr, "\n"); >>>> + >>>> +#if __APPLE__ && (__MAC_OS_X_VERSION_MIN_REQUIRED >= 1070) >>>> + // record message in crash report >>>> + char* buffer; >>>> + va_list list2; >>>> + va_start(list2, format); >>>> + vasprintf(&buffer, format, list2); >>>> + va_end(list2); >>>> + CRSetCrashLogMessage(buffer); >>>> +#endif >>>> + >>>> + abort(); >>>> +} >>> >>> >>> -- Jean-Daniel >>> >>> >>> >>> >> > > -- Jean-Daniel > > > > > > _______________________________________________ > cfe-commits mailing list > [email protected] > http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
