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

Commit 12f1cbf6 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 80cb08ef on remote branch 

Change-Id: I270427b762a19e22283edf694d7ca2585a228ad1
parents b67de9bf 80cb08ef

Makefile

+2 −2
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 4

SUBLEVEL = 184

SUBLEVEL = 185

EXTRAVERSION =

NAME = Blurry Fish Butt
@@ -648,6 +648,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) 
KBUILD_CFLAGS	+= $(call cc-disable-warning, format-truncation)

KBUILD_CFLAGS	+= $(call cc-disable-warning, format-overflow)

KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)

KBUILD_CFLAGS	+= $(call cc-disable-warning, address-of-packed-member)

KBUILD_CFLAGS	+= $(call cc-disable-warning, attribute-alias)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE
@@ -732,7 +733,6 @@ ifeq ($(cc-name),clang) 
KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CFLAGS += $(call cc-disable-warning, format-invalid-specifier)

KBUILD_CFLAGS += $(call cc-disable-warning, gnu)

KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member)

KBUILD_CFLAGS += $(call cc-disable-warning, duplicate-decl-specifier)

# Quiet clang warning: comparison of unsigned expression < 0 is always false

KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare)

arch/arc/Kconfig

+0 −8
Original line number Diff line number Diff line
@@ -278,14 +278,6 @@ config ARC_DCCM_BASE 
	default "0xA0000000"

	depends on ARC_HAS_DCCM



config ARC_HAS_HW_MPY

	bool "Use Hardware Multiplier (Normal or Faster XMAC)"

	default y

	help

	  Influences how gcc generates code for MPY operations.

	  If enabled, MPYxx insns are generated, provided by Standard/XMAC

	  Multipler. Otherwise software multipy lib is used



choice

	prompt "MMU Version"

	default ARC_MMU_V3 if ARC_CPU_770

arch/arc/Makefile

+0 −4
Original line number Diff line number Diff line
@@ -72,10 +72,6 @@ ldflags-$(CONFIG_CPU_BIG_ENDIAN) += -EB 
# --build-id w/o "-marclinux". Default arc-elf32-ld is OK

ldflags-$(upto_gcc44)			+= -marclinux



ifndef CONFIG_ARC_HAS_HW_MPY

	cflags-y	+= -mno-mpy

endif



LIBGCC	:= $(shell $(CC) $(cflags-y) --print-libgcc-file-name)



# Modules with short calls might break for calls into builtin-kernel

arch/arc/include/asm/bug.h

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ void die(const char *str, struct pt_regs *regs, unsigned long address); 


#define BUG()	do {								\

	pr_warn("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \

	dump_stack();								\

	barrier_before_unreachable();						\

	__builtin_trap();							\

} while (0)



#define HAVE_ARCH_BUG

arch/arc/include/asm/elf.h

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ extern int elf_check_arch(const struct elf32_hdr *); 
 * the loader.  We need to make sure that it is out of the way of the program

 * that it will "exec", and that there is sufficient room for the brk.

 */

#define ELF_ET_DYN_BASE		(2 * TASK_SIZE / 3)

#define ELF_ET_DYN_BASE		(2UL * TASK_SIZE / 3)



/*

 * When the program starts, a1 contains a pointer to a function to be