--- zzzz-none-000/linux-3.10.107/arch/h8300/include/asm/elf.h	2017-06-27 09:49:32.000000000 +0000
+++ scorpion-7490-727/linux-3.10.107/arch/h8300/include/asm/elf.h	2021-02-04 17:41:59.000000000 +0000
@@ -1,5 +1,5 @@
-#ifndef __ASMH8300_ELF_H
-#define __ASMH8300_ELF_H
+#ifndef __ASM_H8300_ELF_H
+#define __ASM_H8300_ELF_H
 
 /*
  * ELF register definitions..
@@ -25,14 +25,14 @@
 #define ELF_CLASS	ELFCLASS32
 #define ELF_DATA	ELFDATA2MSB
 #define ELF_ARCH	EM_H8_300
-#if defined(__H8300H__)
+#if defined(CONFIG_CPU_H8300H)
 #define ELF_CORE_EFLAGS 0x810000
 #endif
-#if defined(__H8300S__)
+#if defined(CONFIG_CPU_H8S)
 #define ELF_CORE_EFLAGS 0x820000
 #endif
 
-#define ELF_PLAT_INIT(_r)	_r->er1 = 0
+#define ELF_PLAT_INIT(_r) do { (_r)->er1 = 0; } while (0)
 
 #define ELF_EXEC_PAGESIZE	4096