From: Dongkyun, Son Date: Mon, 7 Nov 2016 08:42:50 +0000 (+0900) Subject: build: fix gcc6 build error X-Git-Tag: accepted/tizen/mobile/20161215.074110^0 X-Git-Url: http://review.tizen.org/git/?p=profile%2Fmobile%2Fplatform%2Fkernel%2Fu-boot-tm1.git;a=commitdiff_plain;h=830e375db59ea2cfb502f9adca5b69e3c85356a1 build: fix gcc6 build error error: aliased to external symbol. Change-Id: I722d0051211d1835d6d4d764a05d959f2c88d315 Signed-off-by: Dongkyun, Son Signed-off-by: Seung-Woo Kim --- diff --git a/arch/arm/cpu/armv7/sc8830/check_reboot.c b/arch/arm/cpu/armv7/sc8830/check_reboot.c index 66c0842..f751d8f 100644 --- a/arch/arm/cpu/armv7/sc8830/check_reboot.c +++ b/arch/arm/cpu/armv7/sc8830/check_reboot.c @@ -41,7 +41,7 @@ extern int hw_watchdog_rst_pending(void); extern inline int is_7s_reset(void); extern int is_7s_reset_for_systemdump(void); extern inline int is_hw_smpl_enable(void); -extern inline int is_smpl_bootup(void); +__attribute__ ((gnu_inline))inline int is_smpl_bootup(void); unsigned check_reboot_mode(void) { unsigned val, rst_mode= 0; diff --git a/arch/arm/cpu/armv7/sc8830/misc.c b/arch/arm/cpu/armv7/sc8830/misc.c index 07fbd8c..33cf5fc 100644 --- a/arch/arm/cpu/armv7/sc8830/misc.c +++ b/arch/arm/cpu/armv7/sc8830/misc.c @@ -381,7 +381,7 @@ static int smpl_config(void) #endif } #else -inline int is_smpl_bootup(void) +__attribute__ ((gnu_inline))inline int is_smpl_bootup(void) { return 0; } diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h index ff1518e..8913a1c 100644 --- a/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h @@ -75,42 +75,42 @@ static inline phys_addr_t virt_to_phys(void * vaddr) #define __arch_putw(v,a) (*(volatile unsigned short *)(a) = (v)) #define __arch_putl(v,a) (*(volatile unsigned int *)(a) = (v)) -extern inline void __raw_writesb(unsigned int addr, const void *data, int bytelen) +static inline void __raw_writesb(unsigned int addr, const void *data, int bytelen) { uint8_t *buf = (uint8_t *)data; while(bytelen--) __arch_putb(*buf++, addr); } -extern inline void __raw_writesw(unsigned int addr, const void *data, int wordlen) +static inline void __raw_writesw(unsigned int addr, const void *data, int wordlen) { uint16_t *buf = (uint16_t *)data; while(wordlen--) __arch_putw(*buf++, addr); } -extern inline void __raw_writesl(unsigned int addr, const void *data, int longlen) +static inline void __raw_writesl(unsigned int addr, const void *data, int longlen) { uint32_t *buf = (uint32_t *)data; while(longlen--) __arch_putl(*buf++, addr); } -extern inline void __raw_readsb(unsigned int addr, void *data, int bytelen) +static inline void __raw_readsb(unsigned int addr, void *data, int bytelen) { uint8_t *buf = (uint8_t *)data; while(bytelen--) *buf++ = __arch_getb(addr); } -extern inline void __raw_readsw(unsigned int addr, void *data, int wordlen) +static inline void __raw_readsw(unsigned int addr, void *data, int wordlen) { uint16_t *buf = (uint16_t *)data; while(wordlen--) *buf++ = __arch_getw(addr); } -extern inline void __raw_readsl(unsigned int addr, void *data, int longlen) +static inline void __raw_readsl(unsigned int addr, void *data, int longlen) { uint32_t *buf = (uint32_t *)data; while(longlen--) diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c index 2e6bc6f..e91a131 100644 --- a/arch/arm/lib/board.c +++ b/arch/arm/lib/board.c @@ -92,23 +92,23 @@ extern void rtl8019_get_enetaddr (uchar * addr); ************************************************************************ * May be supplied by boards if desired */ -void inline __coloured_LED_init (void) {} +void __attribute__ ((gnu_inline))inline __coloured_LED_init (void) {} void coloured_LED_init (void) __attribute__((weak, alias("__coloured_LED_init"))); -void inline __red_LED_on (void) {} +void __attribute__ ((gnu_inline))inline __red_LED_on (void) {} void red_LED_on (void) __attribute__((weak, alias("__red_LED_on"))); -void inline __red_LED_off(void) {} +void __attribute__ ((gnu_inline))inline __red_LED_off(void) {} void red_LED_off(void) __attribute__((weak, alias("__red_LED_off"))); -void inline __green_LED_on(void) {} +void __attribute__ ((gnu_inline))inline __green_LED_on(void) {} void green_LED_on(void) __attribute__((weak, alias("__green_LED_on"))); -void inline __green_LED_off(void) {} +void __attribute__ ((gnu_inline))inline __green_LED_off(void) {} void green_LED_off(void) __attribute__((weak, alias("__green_LED_off"))); -void inline __yellow_LED_on(void) {} +void __attribute__ ((gnu_inline))inline __yellow_LED_on(void) {} void yellow_LED_on(void) __attribute__((weak, alias("__yellow_LED_on"))); -void inline __yellow_LED_off(void) {} +void __attribute__ ((gnu_inline))inline __yellow_LED_off(void) {} void yellow_LED_off(void) __attribute__((weak, alias("__yellow_LED_off"))); -void inline __blue_LED_on(void) {} +void __attribute__ ((gnu_inline))inline __blue_LED_on(void) {} void blue_LED_on(void) __attribute__((weak, alias("__blue_LED_on"))); -void inline __blue_LED_off(void) {} +void __attribute__ ((gnu_inline))inline __blue_LED_off(void) {} void blue_LED_off(void) __attribute__((weak, alias("__blue_LED_off"))); extern int boot_pwr_check(void); diff --git a/common/main.c b/common/main.c index 3b45583..f100fc7 100644 --- a/common/main.c +++ b/common/main.c @@ -47,7 +47,7 @@ DECLARE_GLOBAL_DATA_PTR; /* * Board-specific Platform code can reimplement show_boot_progress () if needed */ -void inline __show_boot_progress (int val) {} +void __attribute__ ((gnu_inline))inline __show_boot_progress (int val) {} void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); #if defined(CONFIG_BOOT_RETRY_TIME) && defined(CONFIG_RESET_TO_RETRY)