Hi Mike, > On Nov 18, 2016, at 2:45 AM, Rainer Orth <r...@cebitec.uni-bielefeld.de> > wrote: >> So the current suggestion is to combine my fixincludes patch and Jack's >> patch to disable <os/trace.h> use if !__BLOCKS__. > >> I guess this is ok for mainline now to restore bootstrap? > > I think we are down to everyone likes this, Ok. The big question is, does > this need a back port?
while they are not necessary to fix the libsanitizer bootstrap failure, they fix genuine header problems, so I think they're desirable. My plan has been to look into the problems discovered in 10.10 and 10.11 headers while developing this one, get them into mainline as time permits and backport the whole bunch afterwards. > If you fix includes virtual members or data members of C/C++ classes, just > be careful disappearing content as that can change the layout of the > structure or class. Understood. So far, the fixes have just removed attributes not supported by GCC, or types using such extensions and function declarations using them. Rainer -- ----------------------------------------------------------------------------- Rainer Orth, Center for Biotechnology, Bielefeld University