diff options
| author | Riku Voipio <riku.voipio@linaro.org> | 2014-09-08 10:03:50 +0300 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2014-09-08 10:03:50 +0300 |
| commit | b32f01038bb19215970e2dce92f706ff599f27ed (patch) | |
| tree | 9760e82003aec1b499a5bb3346a5428ec1abf06d | |
| parent | 809a5b87a4fcf3e26ce02812892e14f9a545b0d2 (diff) | |
update patch
| -rw-r--r-- | configs/gcov-enable.patch | 41 |
1 files changed, 8 insertions, 33 deletions
diff --git a/configs/gcov-enable.patch b/configs/gcov-enable.patch index 671dd87..8a98ee9 100644 --- a/configs/gcov-enable.patch +++ b/configs/gcov-enable.patch @@ -1,32 +1,31 @@ -From 1079654d8c41f021f15710cc6e29a0c161b4ef85 Mon Sep 17 00:00:00 2001 -From: Vincent Sanders <vince@collabora.co.uk> -Date: Mon, 18 Aug 2014 15:47:32 +0300 -Subject: [PATCH 1/2] Enable gcov support on the ARM architecture +From 91400650d1873b6123871d3e8adea404afc4835e Mon Sep 17 00:00:00 2001 +From: Riku Voipio <riku.voipio@linaro.org> +Date: Mon, 8 Sep 2014 09:58:25 +0300 +Subject: [PATCH] Enable gcov support on the ARM architecture Enable gcov support for ARM based on original patches by David Singleton and George G. Davis Riku - updated to patch to current mainline kernel. The patch -has beeb submitted in 2010, 2012 - and now in 2014. +has been submitted in 2010, 2012 - for symmetry, now in 2014 too. https://lwn.net/Articles/390419/ http://marc.info/?l=linux-arm-kernel&m=133823081813044 +From: Vincent Sanders <vincent.sanders@collabora.co.uk> +Cc: Andrey Ryabinin <a.ryabinin@samsung.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Russell King <linux@arm.linux.org.uk> Cc: Naresh Kamboju <naresh.kamboju@linaro.org> -Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Riku Voipio <riku.voipio@linaro.org> Signed-off-by: Vincent Sanders <vincent.sanders@collabora.co.uk> --- arch/arm/boot/bootp/Makefile | 2 ++ arch/arm/boot/compressed/Makefile | 2 ++ - arch/arm/include/asm/elf.h | 1 + arch/arm/kernel/Makefile | 2 ++ - arch/arm/kernel/module.c | 1 + kernel/gcov/Kconfig | 2 +- lib/Makefile | 2 ++ - 7 files changed, 11 insertions(+), 1 deletion(-) + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/bootp/Makefile b/arch/arm/boot/bootp/Makefile index c394e30..5761f00 100644 @@ -54,18 +53,6 @@ index 0f1e6c7..b7a39fb 100644 # # Architecture dependencies # -diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h -index f4b46d3..afb9caf 100644 ---- a/arch/arm/include/asm/elf.h -+++ b/arch/arm/include/asm/elf.h -@@ -50,6 +50,7 @@ typedef struct user_fp elf_fpregset_t; - #define R_ARM_ABS32 2 - #define R_ARM_CALL 28 - #define R_ARM_JUMP24 29 -+#define R_ARM_TARGET1 38 - #define R_ARM_V4BX 40 - #define R_ARM_PREL31 42 - #define R_ARM_MOVW_ABS_NC 43 diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 38ddd9f..979c4e9 100644 --- a/arch/arm/kernel/Makefile @@ -79,18 +66,6 @@ index 38ddd9f..979c4e9 100644 ifdef CONFIG_FUNCTION_TRACER CFLAGS_REMOVE_ftrace.o = -pg CFLAGS_REMOVE_insn.o = -pg -diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c -index 45e4781..6a4dffe 100644 ---- a/arch/arm/kernel/module.c -+++ b/arch/arm/kernel/module.c -@@ -91,6 +91,7 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, - break; - - case R_ARM_ABS32: -+ case R_ARM_TARGET1: - *(u32 *)loc += sym->st_value; - break; - diff --git a/kernel/gcov/Kconfig b/kernel/gcov/Kconfig index d04ce8a..cf66c5c 100644 --- a/kernel/gcov/Kconfig |