[U-Boot] [PATCH 0/2] Add support for GCC 5.x for MicroBlaze

public inbox for u-boot@lists.denx.de
 help / color / mirror / Atom feed

* [U-Boot] [PATCH 0/2] Add support for GCC 5.x for MicroBlaze
@ 2015-11-06  9:25 Nathan Rossi
  2015-11-06  9:25 ` [U-Boot] [PATCH 1/2] microblaze: Fix style issues in header files Nathan Rossi
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Nathan Rossi @ 2015-11-06  9:25 UTC (permalink / raw)
  To: u-boot

This patch series fixes some issues with some MicroBlaze functions and
declarations that are not compatible with newer C standards (e.g. C99) this
includes the default C standard set by the GCC 5.x compiler (which is gnu11 by
default).

This series is split into two patches, the first patch being some code style
clean up, followed by the patch that fixes the compatiblity.

Nathan Rossi (2):
  microblaze: Fix style issues in header files
  microblaze: Fix C99/gnu99 compatiblity for inline functions

 arch/microblaze/include/asm/bitops.h | 63 ++++++++++++------------------------
 arch/microblaze/include/asm/system.h |  2 +-
 2 files changed, 22 insertions(+), 43 deletions(-)

-- 
2.6.2

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [U-Boot] [PATCH 1/2] microblaze: Fix style issues in header files
  2015-11-06  9:25 [U-Boot] [PATCH 0/2] Add support for GCC 5.x for MicroBlaze Nathan Rossi
@ 2015-11-06  9:25 ` Nathan Rossi
  2015-11-06  9:25 ` [U-Boot] [PATCH 2/2] microblaze: Fix C99/gnu99 compatiblity for inline functions Nathan Rossi
  2015-11-09 11:29 ` [U-Boot] [PATCH 0/2] Add support for GCC 5.x for MicroBlaze Michal Simek
  2 siblings, 0 replies; 5+ messages in thread
From: Nathan Rossi @ 2015-11-06  9:25 UTC (permalink / raw)
  To: u-boot

Fix various style issues in MicroBlaze header files. Specifically fixing
style voilations including '__inline__', 'foo * bar' and 'void foo ('.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Tom Rini <trini@konsulko.com>
---
 arch/microblaze/include/asm/bitops.h | 66 ++++++++++++++++++------------------
 arch/microblaze/include/asm/system.h |  2 +-
 2 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/arch/microblaze/include/asm/bitops.h b/arch/microblaze/include/asm/bitops.h
index 0ac78d7..d42ee61 100644
--- a/arch/microblaze/include/asm/bitops.h
+++ b/arch/microblaze/include/asm/bitops.h
@@ -17,31 +17,31 @@
  * The __ functions are not atomic
  */
 
-extern void set_bit(int nr, volatile void * addr);
-extern void __set_bit(int nr, volatile void * addr);
+extern void set_bit(int nr, volatile void *addr);
+extern void __set_bit(int nr, volatile void *addr);
 
-extern void clear_bit(int nr, volatile void * addr);
+extern void clear_bit(int nr, volatile void *addr);
 #define __clear_bit(nr, addr) clear_bit(nr, addr)
 #define PLATFORM__CLEAR_BIT
 
-extern void change_bit(int nr, volatile void * addr);
-extern void __change_bit(int nr, volatile void * addr);
-extern int test_and_set_bit(int nr, volatile void * addr);
-extern int __test_and_set_bit(int nr, volatile void * addr);
-extern int test_and_clear_bit(int nr, volatile void * addr);
-extern int __test_and_clear_bit(int nr, volatile void * addr);
-extern int test_and_change_bit(int nr, volatile void * addr);
-extern int __test_and_change_bit(int nr, volatile void * addr);
-extern int __constant_test_bit(int nr, const volatile void * addr);
-extern int __test_bit(int nr, volatile void * addr);
-extern int find_first_zero_bit(void * addr, unsigned size);
-extern int find_next_zero_bit (void * addr, int size, int offset);
+extern void change_bit(int nr, volatile void *addr);
+extern void __change_bit(int nr, volatile void *addr);
+extern int test_and_set_bit(int nr, volatile void *addr);
+extern int __test_and_set_bit(int nr, volatile void *addr);
+extern int test_and_clear_bit(int nr, volatile void *addr);
+extern int __test_and_clear_bit(int nr, volatile void *addr);
+extern int test_and_change_bit(int nr, volatile void *addr);
+extern int __test_and_change_bit(int nr, volatile void *addr);
+extern int __constant_test_bit(int nr, const volatile void *addr);
+extern int __test_bit(int nr, volatile void *addr);
+extern int find_first_zero_bit(void *addr, unsigned size);
+extern int find_next_zero_bit(void *addr, int size, int offset);
 
 /*
  * ffz = Find First Zero in word. Undefined if no zero exists,
  * so code should check against ~0UL first..
  */
-extern __inline__ unsigned long ffz(unsigned long word)
+extern inline unsigned long ffz(unsigned long word)
 {
 	unsigned long result = 0;
 
@@ -53,7 +53,7 @@ extern __inline__ unsigned long ffz(unsigned long word)
 }
 
 
-extern __inline__ void set_bit(int nr, volatile void * addr)
+extern inline void set_bit(int nr, volatile void *addr)
 {
 	int	* a = (int *) addr;
 	int	mask;
@@ -66,7 +66,7 @@ extern __inline__ void set_bit(int nr, volatile void * addr)
 	restore_flags(flags);
 }
 
-extern __inline__ void __set_bit(int nr, volatile void * addr)
+extern inline void __set_bit(int nr, volatile void *addr)
 {
 	int	* a = (int *) addr;
 	int	mask;
@@ -83,7 +83,7 @@ extern __inline__ void __set_bit(int nr, volatile void * addr)
 #define smp_mb__before_clear_bit()	barrier()
 #define smp_mb__after_clear_bit()	barrier()
 
-extern __inline__ void clear_bit(int nr, volatile void * addr)
+extern inline void clear_bit(int nr, volatile void *addr)
 {
 	int	* a = (int *) addr;
 	int	mask;
@@ -96,7 +96,7 @@ extern __inline__ void clear_bit(int nr, volatile void * addr)
 	restore_flags(flags);
 }
 
-extern __inline__ void change_bit(int nr, volatile void * addr)
+extern inline void change_bit(int nr, volatile void *addr)
 {
 	int mask;
 	unsigned long flags;
@@ -109,7 +109,7 @@ extern __inline__ void change_bit(int nr, volatile void * addr)
 	restore_flags(flags);
 }
 
-extern __inline__ void __change_bit(int nr, volatile void * addr)
+extern inline void __change_bit(int nr, volatile void *addr)
 {
 	int mask;
 	unsigned long *ADDR = (unsigned long *) addr;
@@ -119,7 +119,7 @@ extern __inline__ void __change_bit(int nr, volatile void * addr)
 	*ADDR ^= mask;
 }
 
-extern __inline__ int test_and_set_bit(int nr, volatile void * addr)
+extern inline int test_and_set_bit(int nr, volatile void *addr)
 {
 	int	mask, retval;
 	volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -135,7 +135,7 @@ extern __inline__ int test_and_set_bit(int nr, volatile void * addr)
 	return retval;
 }
 
-extern __inline__ int __test_and_set_bit(int nr, volatile void * addr)
+extern inline int __test_and_set_bit(int nr, volatile void *addr)
 {
 	int	mask, retval;
 	volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -147,7 +147,7 @@ extern __inline__ int __test_and_set_bit(int nr, volatile void * addr)
 	return retval;
 }
 
-extern __inline__ int test_and_clear_bit(int nr, volatile void * addr)
+extern inline int test_and_clear_bit(int nr, volatile void *addr)
 {
 	int	mask, retval;
 	volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -163,7 +163,7 @@ extern __inline__ int test_and_clear_bit(int nr, volatile void * addr)
 	return retval;
 }
 
-extern __inline__ int __test_and_clear_bit(int nr, volatile void * addr)
+extern inline int __test_and_clear_bit(int nr, volatile void *addr)
 {
 	int	mask, retval;
 	volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -175,7 +175,7 @@ extern __inline__ int __test_and_clear_bit(int nr, volatile void * addr)
 	return retval;
 }
 
-extern __inline__ int test_and_change_bit(int nr, volatile void * addr)
+extern inline int test_and_change_bit(int nr, volatile void *addr)
 {
 	int	mask, retval;
 	volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -191,7 +191,7 @@ extern __inline__ int test_and_change_bit(int nr, volatile void * addr)
 	return retval;
 }
 
-extern __inline__ int __test_and_change_bit(int nr, volatile void * addr)
+extern inline int __test_and_change_bit(int nr, volatile void *addr)
 {
 	int	mask, retval;
 	volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -206,12 +206,12 @@ extern __inline__ int __test_and_change_bit(int nr, volatile void * addr)
 /*
  * This routine doesn't need to be atomic.
  */
-extern __inline__ int __constant_test_bit(int nr, const volatile void * addr)
+extern inline int __constant_test_bit(int nr, const volatile void *addr)
 {
 	return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0;
 }
 
-extern __inline__ int __test_bit(int nr, volatile void * addr)
+extern inline int __test_bit(int nr, volatile void *addr)
 {
 	int	* a = (int *) addr;
 	int	mask;
@@ -229,7 +229,7 @@ extern __inline__ int __test_bit(int nr, volatile void * addr)
 #define find_first_zero_bit(addr, size) \
 	find_next_zero_bit((addr), (size), 0)
 
-extern __inline__ int find_next_zero_bit (void * addr, int size, int offset)
+extern inline int find_next_zero_bit(void *addr, int size, int offset)
 {
 	unsigned long *p = ((unsigned long *) addr) + (offset >> 5);
 	unsigned long result = offset & ~31UL;
@@ -275,7 +275,7 @@ found_middle:
 #define hweight8(x) generic_hweight8(x)
 
 
-extern __inline__ int ext2_set_bit(int nr, volatile void * addr)
+extern inline int ext2_set_bit(int nr, volatile void *addr)
 {
 	int		mask, retval;
 	unsigned long	flags;
@@ -290,7 +290,7 @@ extern __inline__ int ext2_set_bit(int nr, volatile void * addr)
 	return retval;
 }
 
-extern __inline__ int ext2_clear_bit(int nr, volatile void * addr)
+extern inline int ext2_clear_bit(int nr, volatile void *addr)
 {
 	int		mask, retval;
 	unsigned long	flags;
@@ -305,7 +305,7 @@ extern __inline__ int ext2_clear_bit(int nr, volatile void * addr)
 	return retval;
 }
 
-extern __inline__ int ext2_test_bit(int nr, const volatile void * addr)
+extern inline int ext2_test_bit(int nr, const volatile void *addr)
 {
 	int			mask;
 	const volatile unsigned char	*ADDR = (const unsigned char *) addr;
diff --git a/arch/microblaze/include/asm/system.h b/arch/microblaze/include/asm/system.h
index 0297a11..3090835 100644
--- a/arch/microblaze/include/asm/system.h
+++ b/arch/microblaze/include/asm/system.h
@@ -131,7 +131,7 @@ extern void *switch_thread (struct thread_struct *last,
   ((__typeof__ (*(ptr)))__xchg ((unsigned long)(with), (ptr), sizeof (*(ptr))))
 #define tas(ptr) (xchg ((ptr), 1))
 
-extern inline unsigned long __xchg (unsigned long with,
+extern inline unsigned long __xchg(unsigned long with,
 				    __volatile__ void *ptr, int size)
 {
 	unsigned long tmp, flags;
-- 
2.6.2

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [U-Boot] [PATCH 2/2] microblaze: Fix C99/gnu99 compatiblity for inline functions
  2015-11-06  9:25 [U-Boot] [PATCH 0/2] Add support for GCC 5.x for MicroBlaze Nathan Rossi
  2015-11-06  9:25 ` [U-Boot] [PATCH 1/2] microblaze: Fix style issues in header files Nathan Rossi
@ 2015-11-06  9:25 ` Nathan Rossi
  2015-11-06 12:27   ` Måns Rullgård
  2015-11-09 11:29 ` [U-Boot] [PATCH 0/2] Add support for GCC 5.x for MicroBlaze Michal Simek
  2 siblings, 1 reply; 5+ messages in thread
From: Nathan Rossi @ 2015-11-06  9:25 UTC (permalink / raw)
  To: u-boot

'extern inline' is not portable across various C standards. To ensure
compatiblity with various standards/compilers change the functions to
static inline. This is a portable construct and serves as a comparable
definition to 'extern inline' from the gnu90 standard.

Additionally remove the function prototypes as they are not required due
to the functions being declared static and functions are correctly
ordered based on dependence.

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Tom Rini <trini@konsulko.com>
---
 arch/microblaze/include/asm/bitops.h | 63 ++++++++++++------------------------
 arch/microblaze/include/asm/system.h |  2 +-
 2 files changed, 22 insertions(+), 43 deletions(-)

diff --git a/arch/microblaze/include/asm/bitops.h b/arch/microblaze/include/asm/bitops.h
index d42ee61..2c11d1a 100644
--- a/arch/microblaze/include/asm/bitops.h
+++ b/arch/microblaze/include/asm/bitops.h
@@ -10,38 +10,14 @@
 
 #ifdef __KERNEL__
 /*
- * Function prototypes to keep gcc -Wall happy
- */
-
-/*
  * The __ functions are not atomic
  */
 
-extern void set_bit(int nr, volatile void *addr);
-extern void __set_bit(int nr, volatile void *addr);
-
-extern void clear_bit(int nr, volatile void *addr);
-#define __clear_bit(nr, addr) clear_bit(nr, addr)
-#define PLATFORM__CLEAR_BIT
-
-extern void change_bit(int nr, volatile void *addr);
-extern void __change_bit(int nr, volatile void *addr);
-extern int test_and_set_bit(int nr, volatile void *addr);
-extern int __test_and_set_bit(int nr, volatile void *addr);
-extern int test_and_clear_bit(int nr, volatile void *addr);
-extern int __test_and_clear_bit(int nr, volatile void *addr);
-extern int test_and_change_bit(int nr, volatile void *addr);
-extern int __test_and_change_bit(int nr, volatile void *addr);
-extern int __constant_test_bit(int nr, const volatile void *addr);
-extern int __test_bit(int nr, volatile void *addr);
-extern int find_first_zero_bit(void *addr, unsigned size);
-extern int find_next_zero_bit(void *addr, int size, int offset);
-
 /*
  * ffz = Find First Zero in word. Undefined if no zero exists,
  * so code should check against ~0UL first..
  */
-extern inline unsigned long ffz(unsigned long word)
+static inline unsigned long ffz(unsigned long word)
 {
 	unsigned long result = 0;
 
@@ -53,7 +29,7 @@ extern inline unsigned long ffz(unsigned long word)
 }
 
 
-extern inline void set_bit(int nr, volatile void *addr)
+static inline void set_bit(int nr, volatile void *addr)
 {
 	int	* a = (int *) addr;
 	int	mask;
@@ -66,7 +42,7 @@ extern inline void set_bit(int nr, volatile void *addr)
 	restore_flags(flags);
 }
 
-extern inline void __set_bit(int nr, volatile void *addr)
+static inline void __set_bit(int nr, volatile void *addr)
 {
 	int	* a = (int *) addr;
 	int	mask;
@@ -83,7 +59,7 @@ extern inline void __set_bit(int nr, volatile void *addr)
 #define smp_mb__before_clear_bit()	barrier()
 #define smp_mb__after_clear_bit()	barrier()
 
-extern inline void clear_bit(int nr, volatile void *addr)
+static inline void clear_bit(int nr, volatile void *addr)
 {
 	int	* a = (int *) addr;
 	int	mask;
@@ -96,7 +72,10 @@ extern inline void clear_bit(int nr, volatile void *addr)
 	restore_flags(flags);
 }
 
-extern inline void change_bit(int nr, volatile void *addr)
+#define __clear_bit(nr, addr) clear_bit(nr, addr)
+#define PLATFORM__CLEAR_BIT
+
+static inline void change_bit(int nr, volatile void *addr)
 {
 	int mask;
 	unsigned long flags;
@@ -109,7 +88,7 @@ extern inline void change_bit(int nr, volatile void *addr)
 	restore_flags(flags);
 }
 
-extern inline void __change_bit(int nr, volatile void *addr)
+static inline void __change_bit(int nr, volatile void *addr)
 {
 	int mask;
 	unsigned long *ADDR = (unsigned long *) addr;
@@ -119,7 +98,7 @@ extern inline void __change_bit(int nr, volatile void *addr)
 	*ADDR ^= mask;
 }
 
-extern inline int test_and_set_bit(int nr, volatile void *addr)
+static inline int test_and_set_bit(int nr, volatile void *addr)
 {
 	int	mask, retval;
 	volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -135,7 +114,7 @@ extern inline int test_and_set_bit(int nr, volatile void *addr)
 	return retval;
 }
 
-extern inline int __test_and_set_bit(int nr, volatile void *addr)
+static inline int __test_and_set_bit(int nr, volatile void *addr)
 {
 	int	mask, retval;
 	volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -147,7 +126,7 @@ extern inline int __test_and_set_bit(int nr, volatile void *addr)
 	return retval;
 }
 
-extern inline int test_and_clear_bit(int nr, volatile void *addr)
+static inline int test_and_clear_bit(int nr, volatile void *addr)
 {
 	int	mask, retval;
 	volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -163,7 +142,7 @@ extern inline int test_and_clear_bit(int nr, volatile void *addr)
 	return retval;
 }
 
-extern inline int __test_and_clear_bit(int nr, volatile void *addr)
+static inline int __test_and_clear_bit(int nr, volatile void *addr)
 {
 	int	mask, retval;
 	volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -175,7 +154,7 @@ extern inline int __test_and_clear_bit(int nr, volatile void *addr)
 	return retval;
 }
 
-extern inline int test_and_change_bit(int nr, volatile void *addr)
+static inline int test_and_change_bit(int nr, volatile void *addr)
 {
 	int	mask, retval;
 	volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -191,7 +170,7 @@ extern inline int test_and_change_bit(int nr, volatile void *addr)
 	return retval;
 }
 
-extern inline int __test_and_change_bit(int nr, volatile void *addr)
+static inline int __test_and_change_bit(int nr, volatile void *addr)
 {
 	int	mask, retval;
 	volatile unsigned int *a = (volatile unsigned int *) addr;
@@ -206,12 +185,12 @@ extern inline int __test_and_change_bit(int nr, volatile void *addr)
 /*
  * This routine doesn't need to be atomic.
  */
-extern inline int __constant_test_bit(int nr, const volatile void *addr)
+static inline int __constant_test_bit(int nr, const volatile void *addr)
 {
 	return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0;
 }
 
-extern inline int __test_bit(int nr, volatile void *addr)
+static inline int __test_bit(int nr, volatile void *addr)
 {
 	int	* a = (int *) addr;
 	int	mask;
@@ -229,7 +208,7 @@ extern inline int __test_bit(int nr, volatile void *addr)
 #define find_first_zero_bit(addr, size) \
 	find_next_zero_bit((addr), (size), 0)
 
-extern inline int find_next_zero_bit(void *addr, int size, int offset)
+static inline int find_next_zero_bit(void *addr, int size, int offset)
 {
 	unsigned long *p = ((unsigned long *) addr) + (offset >> 5);
 	unsigned long result = offset & ~31UL;
@@ -275,7 +254,7 @@ found_middle:
 #define hweight8(x) generic_hweight8(x)
 
 
-extern inline int ext2_set_bit(int nr, volatile void *addr)
+static inline int ext2_set_bit(int nr, volatile void *addr)
 {
 	int		mask, retval;
 	unsigned long	flags;
@@ -290,7 +269,7 @@ extern inline int ext2_set_bit(int nr, volatile void *addr)
 	return retval;
 }
 
-extern inline int ext2_clear_bit(int nr, volatile void *addr)
+static inline int ext2_clear_bit(int nr, volatile void *addr)
 {
 	int		mask, retval;
 	unsigned long	flags;
@@ -305,7 +284,7 @@ extern inline int ext2_clear_bit(int nr, volatile void *addr)
 	return retval;
 }
 
-extern inline int ext2_test_bit(int nr, const volatile void *addr)
+static inline int ext2_test_bit(int nr, const volatile void *addr)
 {
 	int			mask;
 	const volatile unsigned char	*ADDR = (const unsigned char *) addr;
diff --git a/arch/microblaze/include/asm/system.h b/arch/microblaze/include/asm/system.h
index 3090835..3107748 100644
--- a/arch/microblaze/include/asm/system.h
+++ b/arch/microblaze/include/asm/system.h
@@ -131,7 +131,7 @@ extern void *switch_thread (struct thread_struct *last,
   ((__typeof__ (*(ptr)))__xchg ((unsigned long)(with), (ptr), sizeof (*(ptr))))
 #define tas(ptr) (xchg ((ptr), 1))
 
-extern inline unsigned long __xchg(unsigned long with,
+static inline unsigned long __xchg(unsigned long with,
 				    __volatile__ void *ptr, int size)
 {
 	unsigned long tmp, flags;
-- 
2.6.2

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [U-Boot] [PATCH 2/2] microblaze: Fix C99/gnu99 compatiblity for inline functions
  2015-11-06  9:25 ` [U-Boot] [PATCH 2/2] microblaze: Fix C99/gnu99 compatiblity for inline functions Nathan Rossi
@ 2015-11-06 12:27   ` Måns Rullgård
  0 siblings, 0 replies; 5+ messages in thread
From: Måns Rullgård @ 2015-11-06 12:27 UTC (permalink / raw)
  To: u-boot

Nathan Rossi <nathan@nathanrossi.com> writes:

> 'extern inline' is not portable across various C standards. To ensure
> compatiblity with various standards/compilers change the functions to
> static inline. This is a portable construct and serves as a comparable
> definition to 'extern inline' from the gnu90 standard.
>
> Additionally remove the function prototypes as they are not required due
> to the functions being declared static and functions are correctly
> ordered based on dependence.
>
> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
> Cc: Michal Simek <monstr@monstr.eu>
> Cc: Tom Rini <trini@konsulko.com>

Acked-by: Mans Rullgard <mans@mansr.com>

> ---
>  arch/microblaze/include/asm/bitops.h | 63 ++++++++++++------------------------
>  arch/microblaze/include/asm/system.h |  2 +-
>  2 files changed, 22 insertions(+), 43 deletions(-)
>
> diff --git a/arch/microblaze/include/asm/bitops.h b/arch/microblaze/include/asm/bitops.h
> index d42ee61..2c11d1a 100644
> --- a/arch/microblaze/include/asm/bitops.h
> +++ b/arch/microblaze/include/asm/bitops.h
> @@ -10,38 +10,14 @@
>  
>  #ifdef __KERNEL__
>  /*
> - * Function prototypes to keep gcc -Wall happy
> - */
> -
> -/*
>   * The __ functions are not atomic
>   */
>  
> -extern void set_bit(int nr, volatile void *addr);
> -extern void __set_bit(int nr, volatile void *addr);
> -
> -extern void clear_bit(int nr, volatile void *addr);
> -#define __clear_bit(nr, addr) clear_bit(nr, addr)
> -#define PLATFORM__CLEAR_BIT
> -
> -extern void change_bit(int nr, volatile void *addr);
> -extern void __change_bit(int nr, volatile void *addr);
> -extern int test_and_set_bit(int nr, volatile void *addr);
> -extern int __test_and_set_bit(int nr, volatile void *addr);
> -extern int test_and_clear_bit(int nr, volatile void *addr);
> -extern int __test_and_clear_bit(int nr, volatile void *addr);
> -extern int test_and_change_bit(int nr, volatile void *addr);
> -extern int __test_and_change_bit(int nr, volatile void *addr);
> -extern int __constant_test_bit(int nr, const volatile void *addr);
> -extern int __test_bit(int nr, volatile void *addr);
> -extern int find_first_zero_bit(void *addr, unsigned size);
> -extern int find_next_zero_bit(void *addr, int size, int offset);
> -
>  /*
>   * ffz = Find First Zero in word. Undefined if no zero exists,
>   * so code should check against ~0UL first..
>   */
> -extern inline unsigned long ffz(unsigned long word)
> +static inline unsigned long ffz(unsigned long word)
>  {
>  	unsigned long result = 0;
>  
> @@ -53,7 +29,7 @@ extern inline unsigned long ffz(unsigned long word)
>  }
>  
>  
> -extern inline void set_bit(int nr, volatile void *addr)
> +static inline void set_bit(int nr, volatile void *addr)
>  {
>  	int	* a = (int *) addr;
>  	int	mask;
> @@ -66,7 +42,7 @@ extern inline void set_bit(int nr, volatile void *addr)
>  	restore_flags(flags);
>  }
>  
> -extern inline void __set_bit(int nr, volatile void *addr)
> +static inline void __set_bit(int nr, volatile void *addr)
>  {
>  	int	* a = (int *) addr;
>  	int	mask;
> @@ -83,7 +59,7 @@ extern inline void __set_bit(int nr, volatile void *addr)
>  #define smp_mb__before_clear_bit()	barrier()
>  #define smp_mb__after_clear_bit()	barrier()
>  
> -extern inline void clear_bit(int nr, volatile void *addr)
> +static inline void clear_bit(int nr, volatile void *addr)
>  {
>  	int	* a = (int *) addr;
>  	int	mask;
> @@ -96,7 +72,10 @@ extern inline void clear_bit(int nr, volatile void *addr)
>  	restore_flags(flags);
>  }
>  
> -extern inline void change_bit(int nr, volatile void *addr)
> +#define __clear_bit(nr, addr) clear_bit(nr, addr)
> +#define PLATFORM__CLEAR_BIT
> +
> +static inline void change_bit(int nr, volatile void *addr)
>  {
>  	int mask;
>  	unsigned long flags;
> @@ -109,7 +88,7 @@ extern inline void change_bit(int nr, volatile void *addr)
>  	restore_flags(flags);
>  }
>  
> -extern inline void __change_bit(int nr, volatile void *addr)
> +static inline void __change_bit(int nr, volatile void *addr)
>  {
>  	int mask;
>  	unsigned long *ADDR = (unsigned long *) addr;
> @@ -119,7 +98,7 @@ extern inline void __change_bit(int nr, volatile void *addr)
>  	*ADDR ^= mask;
>  }
>  
> -extern inline int test_and_set_bit(int nr, volatile void *addr)
> +static inline int test_and_set_bit(int nr, volatile void *addr)
>  {
>  	int	mask, retval;
>  	volatile unsigned int *a = (volatile unsigned int *) addr;
> @@ -135,7 +114,7 @@ extern inline int test_and_set_bit(int nr, volatile void *addr)
>  	return retval;
>  }
>  
> -extern inline int __test_and_set_bit(int nr, volatile void *addr)
> +static inline int __test_and_set_bit(int nr, volatile void *addr)
>  {
>  	int	mask, retval;
>  	volatile unsigned int *a = (volatile unsigned int *) addr;
> @@ -147,7 +126,7 @@ extern inline int __test_and_set_bit(int nr, volatile void *addr)
>  	return retval;
>  }
>  
> -extern inline int test_and_clear_bit(int nr, volatile void *addr)
> +static inline int test_and_clear_bit(int nr, volatile void *addr)
>  {
>  	int	mask, retval;
>  	volatile unsigned int *a = (volatile unsigned int *) addr;
> @@ -163,7 +142,7 @@ extern inline int test_and_clear_bit(int nr, volatile void *addr)
>  	return retval;
>  }
>  
> -extern inline int __test_and_clear_bit(int nr, volatile void *addr)
> +static inline int __test_and_clear_bit(int nr, volatile void *addr)
>  {
>  	int	mask, retval;
>  	volatile unsigned int *a = (volatile unsigned int *) addr;
> @@ -175,7 +154,7 @@ extern inline int __test_and_clear_bit(int nr, volatile void *addr)
>  	return retval;
>  }
>  
> -extern inline int test_and_change_bit(int nr, volatile void *addr)
> +static inline int test_and_change_bit(int nr, volatile void *addr)
>  {
>  	int	mask, retval;
>  	volatile unsigned int *a = (volatile unsigned int *) addr;
> @@ -191,7 +170,7 @@ extern inline int test_and_change_bit(int nr, volatile void *addr)
>  	return retval;
>  }
>  
> -extern inline int __test_and_change_bit(int nr, volatile void *addr)
> +static inline int __test_and_change_bit(int nr, volatile void *addr)
>  {
>  	int	mask, retval;
>  	volatile unsigned int *a = (volatile unsigned int *) addr;
> @@ -206,12 +185,12 @@ extern inline int __test_and_change_bit(int nr, volatile void *addr)
>  /*
>   * This routine doesn't need to be atomic.
>   */
> -extern inline int __constant_test_bit(int nr, const volatile void *addr)
> +static inline int __constant_test_bit(int nr, const volatile void *addr)
>  {
>  	return ((1UL << (nr & 31)) & (((const volatile unsigned int *) addr)[nr >> 5])) != 0;
>  }
>  
> -extern inline int __test_bit(int nr, volatile void *addr)
> +static inline int __test_bit(int nr, volatile void *addr)
>  {
>  	int	* a = (int *) addr;
>  	int	mask;
> @@ -229,7 +208,7 @@ extern inline int __test_bit(int nr, volatile void *addr)
>  #define find_first_zero_bit(addr, size) \
>  	find_next_zero_bit((addr), (size), 0)
>  
> -extern inline int find_next_zero_bit(void *addr, int size, int offset)
> +static inline int find_next_zero_bit(void *addr, int size, int offset)
>  {
>  	unsigned long *p = ((unsigned long *) addr) + (offset >> 5);
>  	unsigned long result = offset & ~31UL;
> @@ -275,7 +254,7 @@ found_middle:
>  #define hweight8(x) generic_hweight8(x)
>  
>  
> -extern inline int ext2_set_bit(int nr, volatile void *addr)
> +static inline int ext2_set_bit(int nr, volatile void *addr)
>  {
>  	int		mask, retval;
>  	unsigned long	flags;
> @@ -290,7 +269,7 @@ extern inline int ext2_set_bit(int nr, volatile void *addr)
>  	return retval;
>  }
>  
> -extern inline int ext2_clear_bit(int nr, volatile void *addr)
> +static inline int ext2_clear_bit(int nr, volatile void *addr)
>  {
>  	int		mask, retval;
>  	unsigned long	flags;
> @@ -305,7 +284,7 @@ extern inline int ext2_clear_bit(int nr, volatile void *addr)
>  	return retval;
>  }
>  
> -extern inline int ext2_test_bit(int nr, const volatile void *addr)
> +static inline int ext2_test_bit(int nr, const volatile void *addr)
>  {
>  	int			mask;
>  	const volatile unsigned char	*ADDR = (const unsigned char *) addr;
> diff --git a/arch/microblaze/include/asm/system.h b/arch/microblaze/include/asm/system.h
> index 3090835..3107748 100644
> --- a/arch/microblaze/include/asm/system.h
> +++ b/arch/microblaze/include/asm/system.h
> @@ -131,7 +131,7 @@ extern void *switch_thread (struct thread_struct *last,
>    ((__typeof__ (*(ptr)))__xchg ((unsigned long)(with), (ptr), sizeof (*(ptr))))
>  #define tas(ptr) (xchg ((ptr), 1))
>  
> -extern inline unsigned long __xchg(unsigned long with,
> +static inline unsigned long __xchg(unsigned long with,
>  				    __volatile__ void *ptr, int size)
>  {
>  	unsigned long tmp, flags;
> -- 
> 2.6.2

-- 
M?ns Rullg?rd
mans at mansr.com

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [U-Boot] [PATCH 0/2] Add support for GCC 5.x for MicroBlaze
  2015-11-06  9:25 [U-Boot] [PATCH 0/2] Add support for GCC 5.x for MicroBlaze Nathan Rossi
  2015-11-06  9:25 ` [U-Boot] [PATCH 1/2] microblaze: Fix style issues in header files Nathan Rossi
  2015-11-06  9:25 ` [U-Boot] [PATCH 2/2] microblaze: Fix C99/gnu99 compatiblity for inline functions Nathan Rossi
@ 2015-11-09 11:29 ` Michal Simek
  2 siblings, 0 replies; 5+ messages in thread
From: Michal Simek @ 2015-11-09 11:29 UTC (permalink / raw)
  To: u-boot

On 11/06/2015 10:25 AM, Nathan Rossi wrote:
> This patch series fixes some issues with some MicroBlaze functions and
> declarations that are not compatible with newer C standards (e.g. C99) this
> includes the default C standard set by the GCC 5.x compiler (which is gnu11 by
> default).
> 
> This series is split into two patches, the first patch being some code style
> clean up, followed by the patch that fixes the compatiblity.
> 
> Nathan Rossi (2):
>   microblaze: Fix style issues in header files
>   microblaze: Fix C99/gnu99 compatiblity for inline functions
> 
>  arch/microblaze/include/asm/bitops.h | 63 ++++++++++++------------------------
>  arch/microblaze/include/asm/system.h |  2 +-
>  2 files changed, 22 insertions(+), 43 deletions(-)
> 

Applied both.

Thanks,
Michal


-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20151109/0180c44e/attachment.sig>

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2015-11-09 11:29 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-06  9:25 [U-Boot] [PATCH 0/2] Add support for GCC 5.x for MicroBlaze Nathan Rossi
2015-11-06  9:25 ` [U-Boot] [PATCH 1/2] microblaze: Fix style issues in header files Nathan Rossi
2015-11-06  9:25 ` [U-Boot] [PATCH 2/2] microblaze: Fix C99/gnu99 compatiblity for inline functions Nathan Rossi
2015-11-06 12:27   ` Måns Rullgård
2015-11-09 11:29 ` [U-Boot] [PATCH 0/2] Add support for GCC 5.x for MicroBlaze Michal Simek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox