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

Commit 2a6e9df1 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

elfcore: fix building with clang 

commit 6e7b64b9dd6d96537d816ea07ec26b7dedd397b9 upstream.

kernel/elfcore.c only contains weak symbols, which triggers a bug with
clang in combination with recordmcount:

  Cannot find symbol for section 2: .text.
  kernel/elfcore.o: failed

Move the empty stubs into linux/elfcore.h as inline functions.  As only
two architectures use these, just use the architecture specific Kconfig
symbols to key off the declaration.

Link: https://lkml.kernel.org/r/20201204165742.3815221-2-arnd@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Nathan Chancellor <natechancellor@gmail.com>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Barret Rhoden <brho@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae9aff4a

include/linux/elfcore.h

+22 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ static inline int elf_core_copy_task_xfpregs(struct task_struct *t, elf_fpxregse 
}

#endif



#if defined(CONFIG_UM) || defined(CONFIG_IA64)

/*

 * These functions parameterize elf_core_dump in fs/binfmt_elf.c to write out

 * extra segments containing the gate DSO contents.  Dumping its
@@ -72,5 +73,26 @@ elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset); 
extern int

elf_core_write_extra_data(struct coredump_params *cprm);

extern size_t elf_core_extra_data_size(void);

#else

static inline Elf_Half elf_core_extra_phdrs(void)

{

	return 0;

}



static inline int elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset)

{

	return 1;

}



static inline int elf_core_write_extra_data(struct coredump_params *cprm)

{

	return 1;

}



static inline size_t elf_core_extra_data_size(void)

{

	return 0;

}

#endif



#endif /* _LINUX_ELFCORE_H */

kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -92,7 +92,6 @@ obj-$(CONFIG_TASK_DELAY_ACCT) += delayacct.o 
obj-$(CONFIG_TASKSTATS) += taskstats.o tsacct.o

obj-$(CONFIG_TRACEPOINTS) += tracepoint.o

obj-$(CONFIG_LATENCYTOP) += latencytop.o

obj-$(CONFIG_ELFCORE) += elfcore.o

obj-$(CONFIG_FUNCTION_TRACER) += trace/

obj-$(CONFIG_TRACING) += trace/

obj-$(CONFIG_TRACE_CLOCK) += trace/

kernel/elfcore.c

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/elf.h>

#include <linux/fs.h>

#include <linux/mm.h>

#include <linux/binfmts.h>

#include <linux/elfcore.h>



Elf_Half __weak elf_core_extra_phdrs(void)

{

	return 0;

}



int __weak elf_core_write_extra_phdrs(struct coredump_params *cprm, loff_t offset)

{

	return 1;

}



int __weak elf_core_write_extra_data(struct coredump_params *cprm)

{

	return 1;

}



size_t __weak elf_core_extra_data_size(void)

{

	return 0;

}