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

Commit 7167af7c authored by Anton Blanchard's avatar Anton Blanchard
Browse files

powerpc: Remove function descriptors and dot symbols on new ABI 



ABIv2 doesn't have function descriptors or dot symbols. One
new thing it does add is a function global and a local entry
point, so add that to our _GLOBAL macro.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
parent c1fb0194

arch/powerpc/include/asm/ftrace.h

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ struct dyn_arch_ftrace { 
#endif



#if defined(CONFIG_FTRACE_SYSCALLS) && defined(CONFIG_PPC64) && !defined(__ASSEMBLY__)

#if !defined(_CALL_ELF) || _CALL_ELF != 2

#define ARCH_HAS_SYSCALL_MATCH_SYM_NAME

static inline bool arch_syscall_match_sym_name(const char *sym, const char *name)

{
@@ -72,6 +73,7 @@ static inline bool arch_syscall_match_sym_name(const char *sym, const char *name 
	 */

	return !strcmp(sym + 4, name + 3);

}

#endif

#endif /* CONFIG_FTRACE_SYSCALLS && CONFIG_PPC64 && !__ASSEMBLY__ */



#endif /* _ASM_POWERPC_FTRACE */

arch/powerpc/include/asm/linkage.h

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#define _ASM_POWERPC_LINKAGE_H



#ifdef CONFIG_PPC64

#if !defined(_CALL_ELF) || _CALL_ELF != 2

#define cond_syscall(x) \

	asm ("\t.weak " #x "\n\t.set " #x ", sys_ni_syscall\n"		\

	     "\t.weak ." #x "\n\t.set ." #x ", .sys_ni_syscall\n")
@@ -9,5 +10,6 @@ 
	asm ("\t.globl " #alias "\n\t.set " #alias ", " #name "\n"	\

	     "\t.globl ." #alias "\n\t.set ." #alias ", ." #name)

#endif

#endif



#endif	/* _ASM_POWERPC_LINKAGE_H */

arch/powerpc/include/asm/ppc_asm.h

+22 −0
Original line number Diff line number Diff line
@@ -192,6 +192,26 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR) 
#define __STK_PARAM(i)	(48 + ((i)-3)*8)

#define STK_PARAM(i)	__STK_PARAM(__REG_##i)



#if defined(_CALL_ELF) && _CALL_ELF == 2



#define _GLOBAL(name) \

	.section ".text"; \

	.align 2 ; \

	.type name,@function; \

	.globl name; \

name:



#define _KPROBE(name) \

	.section ".kprobes.text","a"; \

	.align 2 ; \

	.type name,@function; \

	.globl name; \

name:



#define DOTSYM(a)	a



#else



#define XGLUE(a,b) a##b

#define GLUE(a,b) XGLUE(a,b)
@@ -225,6 +245,8 @@ GLUE(.,name): 


#define DOTSYM(a)	GLUE(.,a)



#endif



#else /* 32-bit */



#define _ENTRY(n)	\