On Fri, Feb 5, 2016 at 4:44 PM, Kees Cook <keescook@xxxxxxxxxxxx> wrote: > The Android compilers enable some non-standard features by default. While > most Android build systems inject the needed "-mno-android" option via > KCFLAGS, it happens too late (at least on x86_64), since KBUILD_CFLAGS > gains KCFLAGS after running (and failing) many cc-option tests. (For > example, the stack-protector tests happen after arch-specific > KBUILD_CFLAGS are added but before the external KCFLAGS are added.) As > such, we should notice this option and immediately turn it on as the > first cc-option test we run. > > Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> Michal, is this okay? I'd like to get it into -next soon if possible. Thanks! -Kees > --- > Makefile | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/Makefile b/Makefile > index 6c1a3c247988..126c98b582bb 100644 > --- a/Makefile > +++ b/Makefile > @@ -393,6 +393,10 @@ KBUILD_CFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ > -Wno-format-security \ > -std=gnu89 > > +# We must turn off the Android-specific compiler options as early as possible > +# otherwise cc-option calls below may erroneously fail. > +KBUILD_CFLAGS += $(call cc-option,-mno-android,) > + > KBUILD_AFLAGS_KERNEL := > KBUILD_CFLAGS_KERNEL := > KBUILD_AFLAGS := -D__ASSEMBLY__ > -- > 2.6.3 > > > -- > Kees Cook > Chrome OS & Brillo Security -- Kees Cook Chrome OS & Brillo Security -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
