From 77c7137b3817ea87cf3ee9228c5b161adb68ba8d Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 12 Nov 2016 06:29:53 +0100 Subject: [PATCH 1/4] bl31_apis.c: correct indentation GCC 6 does not accept the incorrect indentation. Signed-off-by: Heinrich Schuchardt --- arch/arm/cpu/armv8/gxb/bl31_apis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/cpu/armv8/gxb/bl31_apis.c b/arch/arm/cpu/armv8/gxb/bl31_apis.c index 992742b5bcb..3e1c769e7bc 100644 --- a/arch/arm/cpu/armv8/gxb/bl31_apis.c +++ b/arch/arm/cpu/armv8/gxb/bl31_apis.c @@ -62,7 +62,7 @@ int32_t meson_trustzone_efuse(struct efuse_hal_api_arg *arg) if (arg->cmd == EFUSE_HAL_API_WRITE) memcpy((void *)sharemem_input_base, (const void *)arg->buffer_phy, size); - asm __volatile__("" : : : "memory"); + asm __volatile__("" : : : "memory"); register uint64_t x0 asm("x0") = cmd; register uint64_t x1 asm("x1") = offset; From 5ccf60ccbf5cb1f7f4c6c855ce85fac695a2abb8 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 12 Nov 2016 06:31:12 +0100 Subject: [PATCH 2/4] aml_sd_emmc.c: correct indentation GCC 6 does not accept the incoreect indentation Signed-off-by: Heinrich Schuchardt --- drivers/mmc/aml_sd_emmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/aml_sd_emmc.c b/drivers/mmc/aml_sd_emmc.c index 86ce0091ab1..cca0884e6d7 100644 --- a/drivers/mmc/aml_sd_emmc.c +++ b/drivers/mmc/aml_sd_emmc.c @@ -241,7 +241,7 @@ static int sd_inand_staff_init(struct mmc *mmc) } if (!sdio->inited_flag) sdio->inited_flag = 1; - return SD_NO_ERROR; + return SD_NO_ERROR; } From 858be1f94343cc22328cbccc40e7b2669d32f94e Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 12 Nov 2016 06:32:17 +0100 Subject: [PATCH 3/4] s3c_udc_otg.c: remove unused symbol GCC 6 does not accept unused symbols. Signed-off-by: Heinrich Schuchardt --- drivers/usb/gadget/s3c_udc_otg.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/usb/gadget/s3c_udc_otg.c b/drivers/usb/gadget/s3c_udc_otg.c index e6325e26050..c47be44715a 100644 --- a/drivers/usb/gadget/s3c_udc_otg.c +++ b/drivers/usb/gadget/s3c_udc_otg.c @@ -68,7 +68,6 @@ static char *state_names[] = { struct s3c_udc *the_controller; static const char driver_name[] = "s3c-udc"; -static const char driver_desc[] = DRIVER_DESC; static const char ep0name[] = "ep0-control"; /* Max packet size*/ From fd7bffc3c124555f686c80aef9bdfde17924fdb7 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Sat, 12 Nov 2016 06:36:09 +0100 Subject: [PATCH 4/4] compiler-gcc.h: Enable GCC 6 support Use compiler-gcc5.h for GCC 6. Signed-off-by: Heinrich Schuchardt --- include/linux/compiler-gcc.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index e057bd2a844..22eb7b962f0 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -110,7 +110,11 @@ #define __gcc_header(x) #x #define _gcc_header(x) __gcc_header(linux/compiler-gcc##x.h) +#if __GNUC__ > 5 +#define gcc_header(x) _gcc_header(5) +#else #define gcc_header(x) _gcc_header(x) +#endif #include gcc_header(__GNUC__) #if !defined(__noclone)