header_gen: Correct multiple definition errors

This commit is contained in:
Lioncash 2019-02-27 16:35:09 -05:00
parent f2ff870171
commit b9da32241b
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
14 changed files with 92 additions and 0 deletions

View file

@ -1106,6 +1106,11 @@
#define helper_exception_return helper_exception_return_aarch64
#define helper_exception_with_syndrome helper_exception_with_syndrome_aarch64
#define helper_exit_atomic helper_exit_atomic_aarch64
#define helper_fcos helper_fcos_aarch64
#define helper_fscale helper_fscale_aarch64
#define helper_fsincos helper_fsincos_aarch64
#define helper_fsin helper_fsin_aarch64
#define helper_fsqrt helper_fsqrt_aarch64
#define helper_get_cp_reg helper_get_cp_reg_aarch64
#define helper_get_cp_reg64 helper_get_cp_reg64_aarch64
#define helper_get_r13_banked helper_get_r13_banked_aarch64

View file

@ -1106,6 +1106,11 @@
#define helper_exception_return helper_exception_return_aarch64eb
#define helper_exception_with_syndrome helper_exception_with_syndrome_aarch64eb
#define helper_exit_atomic helper_exit_atomic_aarch64eb
#define helper_fcos helper_fcos_aarch64eb
#define helper_fscale helper_fscale_aarch64eb
#define helper_fsincos helper_fsincos_aarch64eb
#define helper_fsin helper_fsin_aarch64eb
#define helper_fsqrt helper_fsqrt_aarch64eb
#define helper_get_cp_reg helper_get_cp_reg_aarch64eb
#define helper_get_cp_reg64 helper_get_cp_reg64_aarch64eb
#define helper_get_r13_banked helper_get_r13_banked_aarch64eb

View file

@ -1106,6 +1106,11 @@
#define helper_exception_return helper_exception_return_arm
#define helper_exception_with_syndrome helper_exception_with_syndrome_arm
#define helper_exit_atomic helper_exit_atomic_arm
#define helper_fcos helper_fcos_arm
#define helper_fscale helper_fscale_arm
#define helper_fsincos helper_fsincos_arm
#define helper_fsin helper_fsin_arm
#define helper_fsqrt helper_fsqrt_arm
#define helper_get_cp_reg helper_get_cp_reg_arm
#define helper_get_cp_reg64 helper_get_cp_reg64_arm
#define helper_get_r13_banked helper_get_r13_banked_arm

View file

@ -1106,6 +1106,11 @@
#define helper_exception_return helper_exception_return_armeb
#define helper_exception_with_syndrome helper_exception_with_syndrome_armeb
#define helper_exit_atomic helper_exit_atomic_armeb
#define helper_fcos helper_fcos_armeb
#define helper_fscale helper_fscale_armeb
#define helper_fsincos helper_fsincos_armeb
#define helper_fsin helper_fsin_armeb
#define helper_fsqrt helper_fsqrt_armeb
#define helper_get_cp_reg helper_get_cp_reg_armeb
#define helper_get_cp_reg64 helper_get_cp_reg64_armeb
#define helper_get_r13_banked helper_get_r13_banked_armeb

View file

@ -1112,6 +1112,11 @@ symbols = (
'helper_exception_return',
'helper_exception_with_syndrome',
'helper_exit_atomic',
'helper_fcos',
'helper_fscale',
'helper_fsincos',
'helper_fsin',
'helper_fsqrt',
'helper_get_cp_reg',
'helper_get_cp_reg64',
'helper_get_r13_banked',
@ -4416,6 +4421,11 @@ aarch64_symbols = (
'write_fp_dreg',
)
m68k_symbols = (
'gen_helper_raise_exception',
'raise_exception',
)
mips_symbols = (
'MIPS64_REGS_STORAGE_SIZE',
'MIPS_REGS_STORAGE_SIZE',
@ -5460,6 +5470,11 @@ sparc_symbols = (
'sparc_tcg_init',
)
x86_64_symbols = (
'gen_helper_raise_exception',
'raise_exception',
)
if __name__ == '__main__':
arch = sys.argv[1]
@ -5479,6 +5494,10 @@ if __name__ == '__main__':
for s in aarch64_symbols:
print("#define %s %s_%s" %(s, s, arch))
if 'm68k' in arch:
for s in m68k_symbols:
print("#define %s %s_%s" %(s, s, arch))
if 'mips' in arch:
for s in mips_symbols:
print("#define %s %s_%s" %(s, s, arch))
@ -5487,5 +5506,9 @@ if __name__ == '__main__':
for s in sparc_symbols:
print("#define %s %s_%s" %(s, s, arch))
if 'x86_64' in arch:
for s in x86_64_symbols:
print("#define %s %s_%s" %(s, s, arch))
print("#endif")

View file

@ -1106,6 +1106,11 @@
#define helper_exception_return helper_exception_return_m68k
#define helper_exception_with_syndrome helper_exception_with_syndrome_m68k
#define helper_exit_atomic helper_exit_atomic_m68k
#define helper_fcos helper_fcos_m68k
#define helper_fscale helper_fscale_m68k
#define helper_fsincos helper_fsincos_m68k
#define helper_fsin helper_fsin_m68k
#define helper_fsqrt helper_fsqrt_m68k
#define helper_get_cp_reg helper_get_cp_reg_m68k
#define helper_get_cp_reg64 helper_get_cp_reg64_m68k
#define helper_get_r13_banked helper_get_r13_banked_m68k
@ -3320,4 +3325,6 @@
#define xpsr_write xpsr_write_m68k
#define xscale_cp_reginfo xscale_cp_reginfo_m68k
#define xscale_cpar_write xscale_cpar_write_m68k
#define gen_helper_raise_exception gen_helper_raise_exception_m68k
#define raise_exception raise_exception_m68k
#endif

View file

@ -1106,6 +1106,11 @@
#define helper_exception_return helper_exception_return_mips
#define helper_exception_with_syndrome helper_exception_with_syndrome_mips
#define helper_exit_atomic helper_exit_atomic_mips
#define helper_fcos helper_fcos_mips
#define helper_fscale helper_fscale_mips
#define helper_fsincos helper_fsincos_mips
#define helper_fsin helper_fsin_mips
#define helper_fsqrt helper_fsqrt_mips
#define helper_get_cp_reg helper_get_cp_reg_mips
#define helper_get_cp_reg64 helper_get_cp_reg64_mips
#define helper_get_r13_banked helper_get_r13_banked_mips

View file

@ -1106,6 +1106,11 @@
#define helper_exception_return helper_exception_return_mips64
#define helper_exception_with_syndrome helper_exception_with_syndrome_mips64
#define helper_exit_atomic helper_exit_atomic_mips64
#define helper_fcos helper_fcos_mips64
#define helper_fscale helper_fscale_mips64
#define helper_fsincos helper_fsincos_mips64
#define helper_fsin helper_fsin_mips64
#define helper_fsqrt helper_fsqrt_mips64
#define helper_get_cp_reg helper_get_cp_reg_mips64
#define helper_get_cp_reg64 helper_get_cp_reg64_mips64
#define helper_get_r13_banked helper_get_r13_banked_mips64

View file

@ -1106,6 +1106,11 @@
#define helper_exception_return helper_exception_return_mips64el
#define helper_exception_with_syndrome helper_exception_with_syndrome_mips64el
#define helper_exit_atomic helper_exit_atomic_mips64el
#define helper_fcos helper_fcos_mips64el
#define helper_fscale helper_fscale_mips64el
#define helper_fsincos helper_fsincos_mips64el
#define helper_fsin helper_fsin_mips64el
#define helper_fsqrt helper_fsqrt_mips64el
#define helper_get_cp_reg helper_get_cp_reg_mips64el
#define helper_get_cp_reg64 helper_get_cp_reg64_mips64el
#define helper_get_r13_banked helper_get_r13_banked_mips64el

View file

@ -1106,6 +1106,11 @@
#define helper_exception_return helper_exception_return_mipsel
#define helper_exception_with_syndrome helper_exception_with_syndrome_mipsel
#define helper_exit_atomic helper_exit_atomic_mipsel
#define helper_fcos helper_fcos_mipsel
#define helper_fscale helper_fscale_mipsel
#define helper_fsincos helper_fsincos_mipsel
#define helper_fsin helper_fsin_mipsel
#define helper_fsqrt helper_fsqrt_mipsel
#define helper_get_cp_reg helper_get_cp_reg_mipsel
#define helper_get_cp_reg64 helper_get_cp_reg64_mipsel
#define helper_get_r13_banked helper_get_r13_banked_mipsel

View file

@ -1106,6 +1106,11 @@
#define helper_exception_return helper_exception_return_powerpc
#define helper_exception_with_syndrome helper_exception_with_syndrome_powerpc
#define helper_exit_atomic helper_exit_atomic_powerpc
#define helper_fcos helper_fcos_powerpc
#define helper_fscale helper_fscale_powerpc
#define helper_fsincos helper_fsincos_powerpc
#define helper_fsin helper_fsin_powerpc
#define helper_fsqrt helper_fsqrt_powerpc
#define helper_get_cp_reg helper_get_cp_reg_powerpc
#define helper_get_cp_reg64 helper_get_cp_reg64_powerpc
#define helper_get_r13_banked helper_get_r13_banked_powerpc

View file

@ -1106,6 +1106,11 @@
#define helper_exception_return helper_exception_return_sparc
#define helper_exception_with_syndrome helper_exception_with_syndrome_sparc
#define helper_exit_atomic helper_exit_atomic_sparc
#define helper_fcos helper_fcos_sparc
#define helper_fscale helper_fscale_sparc
#define helper_fsincos helper_fsincos_sparc
#define helper_fsin helper_fsin_sparc
#define helper_fsqrt helper_fsqrt_sparc
#define helper_get_cp_reg helper_get_cp_reg_sparc
#define helper_get_cp_reg64 helper_get_cp_reg64_sparc
#define helper_get_r13_banked helper_get_r13_banked_sparc

View file

@ -1106,6 +1106,11 @@
#define helper_exception_return helper_exception_return_sparc64
#define helper_exception_with_syndrome helper_exception_with_syndrome_sparc64
#define helper_exit_atomic helper_exit_atomic_sparc64
#define helper_fcos helper_fcos_sparc64
#define helper_fscale helper_fscale_sparc64
#define helper_fsincos helper_fsincos_sparc64
#define helper_fsin helper_fsin_sparc64
#define helper_fsqrt helper_fsqrt_sparc64
#define helper_get_cp_reg helper_get_cp_reg_sparc64
#define helper_get_cp_reg64 helper_get_cp_reg64_sparc64
#define helper_get_r13_banked helper_get_r13_banked_sparc64

View file

@ -1106,6 +1106,11 @@
#define helper_exception_return helper_exception_return_x86_64
#define helper_exception_with_syndrome helper_exception_with_syndrome_x86_64
#define helper_exit_atomic helper_exit_atomic_x86_64
#define helper_fcos helper_fcos_x86_64
#define helper_fscale helper_fscale_x86_64
#define helper_fsincos helper_fsincos_x86_64
#define helper_fsin helper_fsin_x86_64
#define helper_fsqrt helper_fsqrt_x86_64
#define helper_get_cp_reg helper_get_cp_reg_x86_64
#define helper_get_cp_reg64 helper_get_cp_reg64_x86_64
#define helper_get_r13_banked helper_get_r13_banked_x86_64
@ -3320,4 +3325,6 @@
#define xpsr_write xpsr_write_x86_64
#define xscale_cp_reginfo xscale_cp_reginfo_x86_64
#define xscale_cpar_write xscale_cpar_write_x86_64
#define gen_helper_raise_exception gen_helper_raise_exception_x86_64
#define raise_exception raise_exception_x86_64
#endif