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

Commit e1648a81 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by David S. Miller
Browse files

sparc: unify module.h 



Use some preprocessor magic in combination with the
newly introduced CONFIG_BITS to unify module.h.

A few additional symbols are added as they are needed in a follow-up patch

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fe6875ec

arch/sparc/include/asm/module.h

+24 −8
Original line number Diff line number Diff line 
#ifndef ___ASM_SPARC_MODULE_H

#define ___ASM_SPARC_MODULE_H

#if defined(__sparc__) && defined(__arch64__)

#include <asm/module_64.h>

#else

#include <asm/module_32.h>

#endif

#endif
 
#ifndef __SPARC_MODULE_H

#define __SPARC_MODULE_H

struct mod_arch_specific { };



/*

 * Use some preprocessor magic to define the correct symbol

 * for sparc32 and sparc64.

 * Elf_Addr becomes Elf32_Addr for sparc32 and Elf64_Addr for sparc64

 */

#define ___ELF(a, b, c) a##b##c

#define __ELF(a, b, c)  ___ELF(a, b, c)

#define  _Elf(t)        __ELF(Elf, CONFIG_BITS, t)

#define  _ELF(t)        __ELF(ELF, CONFIG_BITS, t)



#define Elf_Shdr     _Elf(_Shdr)

#define Elf_Sym      _Elf(_Sym)

#define Elf_Ehdr     _Elf(_Ehdr)

#define Elf_Rela     _Elf(_Rela)

#define Elf_Addr     _Elf(_Addr)



#define ELF_R_SYM    _ELF(_R_SYM)

#define ELF_R_TYPE   _ELF(_R_TYPE)



#endif /* __SPARC_MODULE_H */

arch/sparc/include/asm/module_32.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef _ASM_SPARC_MODULE_H

#define _ASM_SPARC_MODULE_H

struct mod_arch_specific { };

#define Elf_Shdr Elf32_Shdr

#define Elf_Sym Elf32_Sym

#define Elf_Ehdr Elf32_Ehdr

#endif /* _ASM_SPARC_MODULE_H */

arch/sparc/include/asm/module_64.h

deleted100644 → 0
+0 −7
Original line number Diff line number Diff line 
#ifndef _ASM_SPARC64_MODULE_H

#define _ASM_SPARC64_MODULE_H

struct mod_arch_specific { };

#define Elf_Shdr Elf64_Shdr

#define Elf_Sym Elf64_Sym

#define Elf_Ehdr Elf64_Ehdr

#endif /* _ASM_SPARC64_MODULE_H */