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

Commit 02049f88 authored by Greg Hackmann's avatar Greg Hackmann
Browse files

Merge branch 'android-4.4-llvm' into android-4.4 



Change-Id: Ieb23e9018ae152706f1980fcd5cbd1dffb4d8be6
Signed-off-by: default avatarGreg Hackmann <ghackmann@google.com>
parents ec888d46 20ea9516

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
*.lzo

*.patch

*.gcno

*.ll

modules.builtin

Module.symvers

*.dwo

Kbuild

+0 −25
Original line number Diff line number Diff line
@@ -6,31 +6,6 @@ 
# 3) Generate asm-offsets.h (may need bounds.h and timeconst.h)

# 4) Check for missing system calls



# Default sed regexp - multiline due to syntax constraints

define sed-y

	"/^->/{s:->#\(.*\):/* \1 */:; \

	s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \

	s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \

	s:->::; p;}"

endef



# Use filechk to avoid rebuilds when a header changes, but the resulting file

# does not

define filechk_offsets

	(set -e; \

	 echo "#ifndef $2"; \

	 echo "#define $2"; \

	 echo "/*"; \

	 echo " * DO NOT MODIFY."; \

	 echo " *"; \

	 echo " * This file was generated by Kbuild"; \

	 echo " */"; \

	 echo ""; \

	 sed -ne $(sed-y); \

	 echo ""; \

	 echo "#endif" )

endef



#####

# 1) Generate bounds.h

Makefile

+21 −3
Original line number Diff line number Diff line
@@ -301,7 +301,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ 


HOSTCC       = gcc

HOSTCXX      = g++

HOSTCFLAGS   = -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89

HOSTCFLAGS   := -Wall -Wmissing-prototypes -Wstrict-prototypes -O2 -fomit-frame-pointer -std=gnu89

HOSTCXXFLAGS = -O2



ifeq ($(shell $(HOSTCC) -v 2>&1 | grep -c "clang version"), 1)
@@ -624,7 +624,7 @@ KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) 
KBUILD_CFLAGS	+= $(call cc-disable-warning, int-in-bool-context)



ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE

KBUILD_CFLAGS	+= -Os

KBUILD_CFLAGS	+= $(call cc-option,-Oz,-Os)

else

ifdef CONFIG_PROFILE_ALL_BRANCHES

KBUILD_CFLAGS	+= -O2
@@ -694,11 +694,22 @@ endif 
KBUILD_CFLAGS += $(stackp-flag)



ifeq ($(cc-name),clang)

ifneq ($(CROSS_COMPILE),)

CLANG_TRIPLE    ?= $(CROSS_COMPILE)

CLANG_TARGET	:= -target $(notdir $(CLANG_TRIPLE:%-=%))

GCC_TOOLCHAIN	:= $(realpath $(dir $(shell which $(LD)))/..)

endif

ifneq ($(GCC_TOOLCHAIN),)

CLANG_GCC_TC	:= -gcc-toolchain $(GCC_TOOLCHAIN)

endif

KBUILD_CFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_AFLAGS += $(CLANG_TARGET) $(CLANG_GCC_TC)

KBUILD_CPPFLAGS += $(call cc-option,-Qunused-arguments,)

KBUILD_CPPFLAGS += $(call cc-option,-Wno-unknown-warning-option,)

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

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)

# CLANG uses a _MergedGlobals as optimization, but this breaks modpost, as the
@@ -706,6 +717,8 @@ KBUILD_CFLAGS += $(call cc-disable-warning, tautological-compare) 
# See modpost pattern 2

KBUILD_CFLAGS += $(call cc-option, -mno-global-merge,)

KBUILD_CFLAGS += $(call cc-option, -fcatch-undefined-behavior)

KBUILD_CFLAGS += $(call cc-option, -no-integrated-as)

KBUILD_AFLAGS += $(call cc-option, -no-integrated-as)

else



# These warnings generated too much noise in a regular build.
@@ -1281,6 +1294,8 @@ help: 
	@echo  '                    (default: $$(INSTALL_MOD_PATH)/lib/firmware)'

	@echo  '  dir/            - Build all files in dir and below'

	@echo  '  dir/file.[ois]  - Build specified target only'

	@echo  '  dir/file.ll     - Build the LLVM assembly file'

	@echo  '                    (requires compiler support for LLVM assembly generation)'

	@echo  '  dir/file.lst    - Build specified mixed source/assembly target only'

	@echo  '                    (requires a recent binutils and recent build (System.map))'

	@echo  '  dir/file.ko     - Build module including final link'
@@ -1456,6 +1471,7 @@ clean: $(clean-dirs) 
		-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \

		-o -name '*.symtypes' -o -name 'modules.order' \

		-o -name modules.builtin -o -name '.tmp_*.o.*' \

		-o -name '*.ll' \

		-o -name '*.gcno' \) -type f -print | xargs rm -f



# Generate tags for editors
@@ -1559,6 +1575,8 @@ endif 
	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

%.symtypes: %.c prepare scripts FORCE

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)

%.ll: %.c prepare scripts FORCE

	$(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)



# Modules

/: prepare scripts FORCE

arch/arm64/Makefile

+12 −1
Original line number Diff line number Diff line
@@ -30,7 +30,14 @@ $(warning LSE atomics not supported by binutils) 
  endif

endif



KBUILD_CFLAGS	+= -mgeneral-regs-only $(lseinstr)

ifeq ($(cc-name),clang)

# This is a workaround for https://bugs.llvm.org/show_bug.cgi?id=30792.

# TODO: revert when this is fixed in LLVM.

KBUILD_CFLAGS	+= -mno-implicit-float

else

KBUILD_CFLAGS	+= -mgeneral-regs-only

endif

KBUILD_CFLAGS	+= $(lseinstr)

KBUILD_CFLAGS	+= -fno-pic

KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables

KBUILD_CFLAGS	+= $(call cc-option, -mpc-relative-literal-loads)
@@ -66,6 +73,10 @@ else 
TEXT_OFFSET := 0x00080000

endif



ifeq ($(cc-name),clang)

KBUILD_CFLAGS += $(call cc-disable-warning, asm-operand-widths)

endif



# KASAN_SHADOW_OFFSET = VA_START + (1 << (VA_BITS - 3)) - (1 << 61)

# in 32-bit arithmetic

KASAN_SHADOW_OFFSET := $(shell printf "0x%08x00000000\n" $$(( \

arch/arm64/crypto/sha1-ce-core.S

+4 −2
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ ENTRY(sha1_ce_transform) 
	ldr		dgb, [x0, #16]



	/* load sha1_ce_state::finalize */

	ldr		w4, [x0, #:lo12:sha1_ce_offsetof_finalize]

	ldr_l		w4, sha1_ce_offsetof_finalize, x4

	ldr		w4, [x0, x4]



	/* load input */

0:	ld1		{v8.4s-v11.4s}, [x1], #64
@@ -132,7 +133,8 @@ CPU_LE( rev32 v11.16b, v11.16b ) 
	 * the padding is handled by the C code in that case.

	 */

	cbz		x4, 3f

	ldr		x4, [x0, #:lo12:sha1_ce_offsetof_count]

	ldr_l		w4, sha1_ce_offsetof_count, x4

	ldr		x4, [x0, x4]

	movi		v9.2d, #0

	mov		x8, #0x80000000

	movi		v10.2d, #0