Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 356ae4de authored by Rasmus Villemoes's avatar Rasmus Villemoes Committed by Greg Kroah-Hartman
Browse files

x86/asm: Remove dead __GNUC__ conditionals 



commit 88ca66d8540ca26119b1428cddb96b37925bdf01 upstream.

The minimum supported gcc version is >= 4.6, so these can be removed.

Signed-off-by: default avatarRasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190111084931.24601-1-linux@rasmusvillemoes.dk


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f7b778b9

arch/x86/include/asm/bitops.h

+0 −6
Original line number Diff line number Diff line
@@ -36,13 +36,7 @@ 
 * bit 0 is the LSB of addr; bit 32 is the LSB of (addr+1).

 */



#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 1)

/* Technically wrong, but this avoids compilation errors on some gcc

   versions. */

#define BITOP_ADDR(x) "=m" (*(volatile long *) (x))

#else

#define BITOP_ADDR(x) "+m" (*(volatile long *) (x))

#endif



#define ADDR				BITOP_ADDR(addr)

arch/x86/include/asm/string_32.h

+0 −20
Original line number Diff line number Diff line
@@ -179,14 +179,7 @@ static inline void *__memcpy3d(void *to, const void *from, size_t len) 
 *	No 3D Now!

 */



#if (__GNUC__ >= 4)

#define memcpy(t, f, n) __builtin_memcpy(t, f, n)

#else

#define memcpy(t, f, n)				\

	(__builtin_constant_p((n))		\

	 ? __constant_memcpy((t), (f), (n))	\

	 : __memcpy((t), (f), (n)))

#endif



#endif

#endif /* !CONFIG_FORTIFY_SOURCE */
@@ -282,12 +275,7 @@ void *__constant_c_and_count_memset(void *s, unsigned long pattern, 


	{

		int d0, d1;

#if __GNUC__ == 4 && __GNUC_MINOR__ == 0

		/* Workaround for broken gcc 4.0 */

		register unsigned long eax asm("%eax") = pattern;

#else

		unsigned long eax = pattern;

#endif



		switch (count % 4) {

		case 0:
@@ -321,15 +309,7 @@ void *__constant_c_and_count_memset(void *s, unsigned long pattern, 
#define __HAVE_ARCH_MEMSET

extern void *memset(void *, int, size_t);

#ifndef CONFIG_FORTIFY_SOURCE

#if (__GNUC__ >= 4)

#define memset(s, c, count) __builtin_memset(s, c, count)

#else

#define memset(s, c, count)						\

	(__builtin_constant_p(c)					\

	 ? __constant_c_x_memset((s), (0x01010101UL * (unsigned char)(c)), \

				 (count))				\

	 : __memset((s), (c), (count)))

#endif

#endif /* !CONFIG_FORTIFY_SOURCE */



#define __HAVE_ARCH_MEMSET16

arch/x86/include/asm/string_64.h

+0 −15
Original line number Diff line number Diff line
@@ -32,21 +32,6 @@ static __always_inline void *__inline_memcpy(void *to, const void *from, size_t 
extern void *memcpy(void *to, const void *from, size_t len);

extern void *__memcpy(void *to, const void *from, size_t len);



#ifndef CONFIG_FORTIFY_SOURCE

#if (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || __GNUC__ < 4

#define memcpy(dst, src, len)					\

({								\

	size_t __len = (len);					\

	void *__ret;						\

	if (__builtin_constant_p(len) && __len >= 64)		\

		__ret = __memcpy((dst), (src), __len);		\

	else							\

		__ret = __builtin_memcpy((dst), (src), __len);	\

	__ret;							\

})

#endif

#endif /* !CONFIG_FORTIFY_SOURCE */



#define __HAVE_ARCH_MEMSET

void *memset(void *s, int c, size_t n);

void *__memset(void *s, int c, size_t n);