These fixes are needed for it to work with gcc7
(From OE-Core rev: d31ee3eb2be020b072278262693ed7bd607ba18a)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>