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

Commit b20dcab9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'llvmlinux-for-v3.16' of git://git.linuxfoundation.org/llvmlinux/kernel 

Pull LLVM patches from Behan Webster:
 "Next set of patches to support compiling the kernel with clang.
  They've been soaking in linux-next since the last merge window.

  More still in the works for the next merge window..."

* tag 'llvmlinux-for-v3.16' of git://git.linuxfoundation.org/llvmlinux/kernel:
  arm, unwind, LLVMLinux: Enable clang to be used for unwinding the stack
  ARM: LLVMLinux: Change "extern inline" to "static inline" in glue-cache.h
  all: LLVMLinux: Change DWARF flag to support gcc and clang
  net: netfilter: LLVMLinux: vlais-netfilter
  crypto: LLVMLinux: aligned-attribute.patch
parents ed81e780 e6b80757

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ endif 


ifdef CONFIG_DEBUG_INFO

KBUILD_CFLAGS	+= -g

KBUILD_AFLAGS	+= -Wa,--gdwarf-2

KBUILD_AFLAGS	+= -Wa,-gdwarf-2

endif



ifdef CONFIG_DEBUG_INFO_REDUCED

arch/arm/include/asm/glue-cache.h

+11 −11
Original line number Diff line number Diff line
@@ -130,22 +130,22 @@ 
#endif



#ifndef __ASSEMBLER__

extern inline void nop_flush_icache_all(void) { }

extern inline void nop_flush_kern_cache_all(void) { }

extern inline void nop_flush_kern_cache_louis(void) { }

extern inline void nop_flush_user_cache_all(void) { }

extern inline void nop_flush_user_cache_range(unsigned long a,

static inline void nop_flush_icache_all(void) { }

static inline void nop_flush_kern_cache_all(void) { }

static inline void nop_flush_kern_cache_louis(void) { }

static inline void nop_flush_user_cache_all(void) { }

static inline void nop_flush_user_cache_range(unsigned long a,

		unsigned long b, unsigned int c) { }



extern inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { }

extern inline int nop_coherent_user_range(unsigned long a,

static inline void nop_coherent_kern_range(unsigned long a, unsigned long b) { }

static inline int nop_coherent_user_range(unsigned long a,

		unsigned long b) { return 0; }

extern inline void nop_flush_kern_dcache_area(void *a, size_t s) { }

static inline void nop_flush_kern_dcache_area(void *a, size_t s) { }



extern inline void nop_dma_flush_range(const void *a, const void *b) { }

static inline void nop_dma_flush_range(const void *a, const void *b) { }



extern inline void nop_dma_map_area(const void *s, size_t l, int f) { }

extern inline void nop_dma_unmap_area(const void *s, size_t l, int f) { }

static inline void nop_dma_map_area(const void *s, size_t l, int f) { }

static inline void nop_dma_unmap_area(const void *s, size_t l, int f) { }

#endif



#ifndef MULTI_CACHE

arch/arm/kernel/unwind.c

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#warning Your compiler does not have EABI support.

#warning    ARM unwind is known to compile only with EABI compilers.

#warning    Change compiler or disable ARM_UNWIND option.

#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 2)

#elif (__GNUC__ == 4 && __GNUC_MINOR__ <= 2) && !defined(__clang__)

#warning Your compiler is too buggy; it is known to not compile ARM unwind support.

#warning    Change compiler or disable ARM_UNWIND option.

#endif

crypto/shash.c

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ EXPORT_SYMBOL_GPL(crypto_shash_setkey); 
static inline unsigned int shash_align_buffer_size(unsigned len,

						   unsigned long mask)

{

	return len + (mask & ~(__alignof__(u8 __attribute__ ((aligned))) - 1));

	typedef u8 __attribute__ ((aligned)) u8_aligned;

	return len + (mask & ~(__alignof__(u8_aligned) - 1));

}



static int shash_update_unaligned(struct shash_desc *desc, const u8 *data,

net/netfilter/xt_repldata.h

+17 −5
Original line number Diff line number Diff line
@@ -5,19 +5,31 @@ 
 * they serve as the hanging-off data accessed through repl.data[].

 */



/* tbl has the following structure equivalent, but is C99 compliant:

 * struct {

 *	struct type##_replace repl;

 *	struct type##_standard entries[nhooks];

 *	struct type##_error term;

 * } *tbl;

 */



#define xt_alloc_initial_table(type, typ2) ({ \

	unsigned int hook_mask = info->valid_hooks; \

	unsigned int nhooks = hweight32(hook_mask); \

	unsigned int bytes = 0, hooknum = 0, i = 0; \

	struct { \

		struct type##_replace repl; \

		struct type##_standard entries[nhooks]; \

		struct type##_error term; \

	} *tbl = kzalloc(sizeof(*tbl), GFP_KERNEL); \

		struct type##_standard entries[]; \

	} *tbl; \

	struct type##_error *term; \

	size_t term_offset = (offsetof(typeof(*tbl), entries[nhooks]) + \

		__alignof__(*term) - 1) & ~(__alignof__(*term) - 1); \

	tbl = kzalloc(term_offset + sizeof(*term), GFP_KERNEL); \

	if (tbl == NULL) \

		return NULL; \

	term = (struct type##_error *)&(((char *)tbl)[term_offset]); \

	strncpy(tbl->repl.name, info->name, sizeof(tbl->repl.name)); \

	tbl->term = (struct type##_error)typ2##_ERROR_INIT;  \

	*term = (struct type##_error)typ2##_ERROR_INIT;  \

	tbl->repl.valid_hooks = hook_mask; \

	tbl->repl.num_entries = nhooks + 1; \

	tbl->repl.size = nhooks * sizeof(struct type##_standard) + \