[compiler-rt] r184805 - Remove the sysroot (or isysroot) restriction from the GCDAProfile.c

Chandler Carruth chandlerc at gmail.com
Mon Jun 24 18:31:22 PDT 2013


Not yet, the bots haven't caught up to this one. They were broken by an
earlier one. I'm actually watching the bot progress toward this one which
is intended *to* fix the build.


On Mon, Jun 24, 2013 at 6:27 PM, Kevin Enderby <enderby at apple.com> wrote:

> Hello Chandler. I believe that your commit r184805 has broken the
> following buildbot:
>
>
> http://lab.llvm.org:8013/builders/clang-x86_64-darwin11-nobootstrap-RAincremental/builds/3444
>
> And likely many others that are failing. Can you please fix this?
>
> Thanks,
> Kev (acting build czar at the moment)
>
> On Jun 24, 2013, at 5:57 PM, Chandler Carruth <chandlerc at gmail.com> wrote:
>
> > Author: chandlerc
> > Date: Mon Jun 24 19:57:06 2013
> > New Revision: 184805
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=184805&view=rev
> > Log:
> > Remove the sysroot (or isysroot) restriction from the GCDAProfile.c
> > runtime in the Makefile build system as well. Sorry for the temporary
> > fallout, it took me a while to find these bits.
> >
> > Bill, I'm not at all confident of the change for Darwin and iOS, but as
> > discussed we're completely blocked on fixing this. Anyways, please
> > review and let me know if this will work for you guys. If necessary,
> > I can work with you to rig up an errno.h stub for Darwin, but I expect
> > that to be... moderately challenging.
> >
> > Modified:
> >    compiler-rt/trunk/make/platform/clang_darwin.mk
> >    compiler-rt/trunk/make/platform/clang_linux.mk
> >
> > Modified: compiler-rt/trunk/make/platform/clang_darwin.mk
> > URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_darwin.mk?rev=184805&r1=184804&r2=184805&view=diff
> >
> ==============================================================================
> > --- compiler-rt/trunk/make/platform/clang_darwin.mk (original)
> > +++ compiler-rt/trunk/make/platform/clang_darwin.mk Mon Jun 24 19:57:06
> 2013
> > @@ -117,6 +117,18 @@ IOS_DEPLOYMENT_ARGS := -mios-version-min
> > IOS6_DEPLOYMENT_ARGS := -mios-version-min=6.0
> > IOSSIM_DEPLOYMENT_ARGS := -mios-simulator-version-min=1.0
> >
> > +# Setup the CFLAGS for the profile runtime library before narrowing the
> > +# deployment args to use the compiler-rt fake header sysroot as we want
> the
> > +# profile runtime to have access to basic libc routines, etc.
> > +CFLAGS.profile_osx.i386   := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
> > +CFLAGS.profile_osx.x86_64 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
> > +CFLAGS.profile_ios.i386   := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
> > +CFLAGS.profile_ios.x86_64 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
> > +CFLAGS.profile_ios.armv7  := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
> > +CFLAGS.profile_ios.armv7f := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
> > +CFLAGS.profile_ios.armv7k := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
> > +CFLAGS.profile_ios.armv7s := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
> > +
> > # Use our stub SDK as the sysroot to support more portable building.
> > OSX_DEPLOYMENT_ARGS += -isysroot $(ProjSrcRoot)/SDKs/darwin
> > IOS_DEPLOYMENT_ARGS += -isysroot $(ProjSrcRoot)/SDKs/darwin
> > @@ -152,14 +164,6 @@ CFLAGS.cc_kext_ios5.armv7  := $(CFLAGS)
> > CFLAGS.cc_kext_ios5.armv7f := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
> > CFLAGS.cc_kext_ios5.armv7k := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
> > CFLAGS.cc_kext_ios5.armv7s := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
> > -CFLAGS.profile_osx.i386   := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
> > -CFLAGS.profile_osx.x86_64 := $(CFLAGS) $(OSX_DEPLOYMENT_ARGS)
> > -CFLAGS.profile_ios.i386   := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
> > -CFLAGS.profile_ios.x86_64 := $(CFLAGS) $(IOSSIM_DEPLOYMENT_ARGS)
> > -CFLAGS.profile_ios.armv7  := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
> > -CFLAGS.profile_ios.armv7f := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
> > -CFLAGS.profile_ios.armv7k := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
> > -CFLAGS.profile_ios.armv7s := $(CFLAGS) $(IOS_DEPLOYMENT_ARGS)
> >
> > # Configure the asan_osx_dynamic library to be built shared.
> > SHARED_LIBRARY.asan_osx_dynamic := 1
> >
> > Modified: compiler-rt/trunk/make/platform/clang_linux.mk
> > URL:
> http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/make/platform/clang_linux.mk?rev=184805&r1=184804&r2=184805&view=diff
> >
> ==============================================================================
> > --- compiler-rt/trunk/make/platform/clang_linux.mk (original)
> > +++ compiler-rt/trunk/make/platform/clang_linux.mk Mon Jun 24 19:57:06
> 2013
> > @@ -112,12 +112,10 @@ LDFLAGS.asan-arm-android := $(LDFLAGS) $
> >       -Wl,-soname=libclang_rt.asan-arm-android.so
> >
> > # Use our stub SDK as the sysroot to support more portable building. For
> now we
> > -# just do this for the non-ASAN modules, because the stub SDK doesn't
> have
> > -# enough support to build ASAN.
> > +# just do this for the core module, because the stub SDK doesn't have
> > +# enough support to build the sanitizers or profile runtimes.
> > CFLAGS.full-i386 += --sysroot=$(ProjSrcRoot)/SDKs/linux
> > CFLAGS.full-x86_64 += --sysroot=$(ProjSrcRoot)/SDKs/linux
> > -CFLAGS.profile-i386 += --sysroot=$(ProjSrcRoot)/SDKs/linux
> > -CFLAGS.profile-x86_64 += --sysroot=$(ProjSrcRoot)/SDKs/linux
> >
> > FUNCTIONS.full-i386 := $(CommonFunctions) $(ArchFunctions.i386)
> > FUNCTIONS.full-x86_64 := $(CommonFunctions) $(ArchFunctions.x86_64)
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at cs.uiuc.edu
> > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130624/c37af465/attachment.html>


More information about the llvm-commits mailing list