netbsd-eabi.h was never merged from the now present upstream version.

reduce diffs to upstream here and in other files in this subdir.

remove unused ARM_EABI_UNWIND_TABLES and __UNWIND_TABLES__.

clang defines __UNWIND_TABLES__, but doing this in GCC triggers the
need for more libgcc / libc unwind functionality to be added, and this
code has never been enabled for netbsd/earm.  (could potentially clean
up unused code in libc now, or, revive this once the full support has
been implemented..)
This commit is contained in:
mrg 2021-04-29 01:51:39 +00:00
parent eda596189c
commit d946536fcb
4 changed files with 41 additions and 36 deletions

View File

@ -963,8 +963,8 @@ extern const int arm_arch_cde_coproc_bits[];
/* ttype entries (the only interesting data references used) /* ttype entries (the only interesting data references used)
use TARGET2 relocations. */ use TARGET2 relocations. */
#define ASM_PREFERRED_EH_DATA_FORMAT(code, data) \ #define ASM_PREFERRED_EH_DATA_FORMAT(code, data) \
(((code) == 0 && (data) == 1 && ARM_UNWIND_INFO) ? ARM_TARGET2_DWARF_FORMAT \ (((code) == 0 && (data) == 1 && ARM_UNWIND_INFO) ? ARM_TARGET2_DWARF_FORMAT \
: DW_EH_PE_absptr) : DW_EH_PE_absptr)
#endif #endif
/* The native (Norcroft) Pascal compiler for the ARM passes the static chain /* The native (Norcroft) Pascal compiler for the ARM passes the static chain

View File

@ -28,12 +28,9 @@
#define ARM_DEFAULT_ABI ARM_ABI_AAPCS #define ARM_DEFAULT_ABI ARM_ABI_AAPCS
/* Assume that AAPCS ABIs should adhere to the full BPABI. */ /* Assume that AAPCS ABIs should adhere to the full BPABI. */
//#undef TARGET_BPABI
#define TARGET_BPABI (TARGET_AAPCS_BASED) #define TARGET_BPABI (TARGET_AAPCS_BASED)
/* BPABI targets use EABI frame unwinding tables. */ /* BPABI targets use EABI frame unwinding tables. */
#undef ARM_EABI_UNWIND_TABLES
#define ARM_EABI_UNWIND_TABLES 1
#undef ARM_UNWIND_INFO #undef ARM_UNWIND_INFO
#define ARM_UNWIND_INFO 1 #define ARM_UNWIND_INFO 1

View File

@ -1,5 +1,5 @@
/* Definitions of target machine for GNU compiler, NetBSD/arm ELF version. /* Definitions of target machine for GNU compiler, NetBSD/arm ELF version.
Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation, Inc. Copyright (C) 2002-2020 Free Software Foundation, Inc.
Contributed by Wasabi Systems, Inc. Contributed by Wasabi Systems, Inc.
This file is part of GCC. This file is part of GCC.
@ -22,10 +22,16 @@
#undef MULTILIB_DEFAULTS #undef MULTILIB_DEFAULTS
#define MULTILIB_DEFAULTS { "mabi=aapcs-linux" } #define MULTILIB_DEFAULTS { "mabi=aapcs-linux" }
#define TARGET_LINKER_EABI_SUFFIX \ #define TARGET_LINKER_EABI_SUFFIX_SOFT \
(TARGET_DEFAULT_FLOAT_ABI == ARM_FLOAT_ABI_SOFT \ "%{!mabi=apcs-gnu:%{!mabi=atpcs:%{mfloat-abi=hard:_eabihf;:_eabi}}}"
? "%{!mabi=apcs-gnu:%{!mabi=atpcs:%{mfloat-abi=hard:_eabihf;:_eabi}}}" \ #define TARGET_LINKER_EABI_SUFFIX_HARD \
: "%{!mabi=apcs-gnu:%{!mabi=atpcs:%{mfloat-abi=soft:_eabi;:_eabihf}}}") "%{!mabi=apcs-gnu:%{!mabi=atpcs:%{mfloat-abi=soft:_eabi;:_eabihf}}}"
#define TARGET_LINKER_EABI_SUFFIX \
(TARGET_DEFAULT_FLOAT_ABI == ARM_FLOAT_ABI_SOFT \
? TARGET_LINKER_EABI_SUFFIX_SOFT \
: TARGET_LINKER_EABI_SUFFIX_HARD)
#define TARGET_LINKER_BIG_EMULATION "armelfb_nbsd%(linker_eabi_suffix)" #define TARGET_LINKER_BIG_EMULATION "armelfb_nbsd%(linker_eabi_suffix)"
#define TARGET_LINKER_LITTLE_EMULATION "armelf_nbsd%(linker_eabi_suffix)" #define TARGET_LINKER_LITTLE_EMULATION "armelf_nbsd%(linker_eabi_suffix)"
@ -41,8 +47,6 @@
#undef ARM_DEFAULT_ABI #undef ARM_DEFAULT_ABI
#define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX #define ARM_DEFAULT_ABI ARM_ABI_AAPCS_LINUX
#undef ARM_EABI_UNWIND_TABLES
#define ARM_EABI_UNWIND_TABLES 0
#undef ARM_UNWIND_INFO #undef ARM_UNWIND_INFO
#define ARM_UNWIND_INFO 0 #define ARM_UNWIND_INFO 0
#undef ARM_DWARF_UNWIND_TABLES #undef ARM_DWARF_UNWIND_TABLES
@ -57,8 +61,6 @@
NETBSD_OS_CPP_BUILTINS_ELF(); \ NETBSD_OS_CPP_BUILTINS_ELF(); \
if (ARM_DWARF_UNWIND_TABLES) \ if (ARM_DWARF_UNWIND_TABLES) \
builtin_define ("__ARM_DWARF_EH__"); \ builtin_define ("__ARM_DWARF_EH__"); \
if (ARM_EABI_UNWIND_TABLES) \
builtin_define ("__UNWIND_TABLES__"); \
} \ } \
while (0) while (0)
@ -73,13 +75,15 @@
#undef SIZE_TYPE #undef SIZE_TYPE
#define SIZE_TYPE "long unsigned int" #define SIZE_TYPE "long unsigned int"
#undef PTRDIFF_TYPE #undef PTRDIFF_TYPE
#define PTRDIFF_TYPE "long int" #define PTRDIFF_TYPE "long int"
#undef SUBTARGET_EXTRA_ASM_SPEC #undef SUBTARGET_EXTRA_ASM_SPEC
#define SUBTARGET_EXTRA_ASM_SPEC \ #define SUBTARGET_EXTRA_ASM_SPEC \
"-matpcs %{mabi=apcs-gnu|mabi=atpcs:-meabi=gnu} %{fpic|fpie:-k} %{fPIC|fPIE:-k}" "-matpcs %{mabi=apcs-gnu|mabi=atpcs:-meabi=gnu} " \
"%{fpic|fpie:-k} " \
"%{fPIC|fPIE:-k}"
/* Default to full VFP if -mhard-float is specified. */ /* Default to full VFP if -mhard-float is specified. */
#undef SUBTARGET_ASM_FLOAT_SPEC #undef SUBTARGET_ASM_FLOAT_SPEC
@ -88,23 +92,23 @@
%{mfloat-abi=hard:%{!mfpu=*:-mfpu=vfp}}" %{mfloat-abi=hard:%{!mfpu=*:-mfpu=vfp}}"
#undef SUBTARGET_EXTRA_SPECS #undef SUBTARGET_EXTRA_SPECS
#define SUBTARGET_EXTRA_SPECS \ #define SUBTARGET_EXTRA_SPECS \
{ "subtarget_extra_asm_spec", SUBTARGET_EXTRA_ASM_SPEC }, \ { "subtarget_extra_asm_spec", SUBTARGET_EXTRA_ASM_SPEC }, \
{ "subtarget_asm_float_spec", SUBTARGET_ASM_FLOAT_SPEC }, \ { "subtarget_asm_float_spec", SUBTARGET_ASM_FLOAT_SPEC }, \
{ "linker_eabi_suffix", TARGET_LINKER_EABI_SUFFIX }, \ { "linker_eabi_suffix", TARGET_LINKER_EABI_SUFFIX }, \
{ "linker_emulation", TARGET_LINKER_EMULATION }, \ { "linker_emulation", TARGET_LINKER_EMULATION }, \
{ "linker_big_emulation", TARGET_LINKER_BIG_EMULATION }, \ { "linker_big_emulation", TARGET_LINKER_BIG_EMULATION }, \
{ "linker_little_emulation", TARGET_LINKER_LITTLE_EMULATION }, \ { "linker_little_emulation", TARGET_LINKER_LITTLE_EMULATION }, \
{ "be8_link_spec", BE8_LINK_SPEC }, \ { "be8_link_spec", BE8_LINK_SPEC }, \
{ "target_fix_v4bx_spec", TARGET_FIX_V4BX_SPEC }, \ { "target_fix_v4bx_spec", TARGET_FIX_V4BX_SPEC }, \
NETBSD_SUBTARGET_EXTRA_SPECS NETBSD_SUBTARGET_EXTRA_SPECS
#define NETBSD_ENTRY_POINT "__start" #define NETBSD_ENTRY_POINT "__start"
#undef LINK_SPEC #undef LINK_SPEC
#define LINK_SPEC \ #define LINK_SPEC \
"-X %{mbig-endian:-EB -m %(linker_big_emulation)} \ "-X %{mbig-endian:-EB -m %(linker_big_emulation)} " \
%{mlittle-endian:-EL -m %(linker_liitle_emulation)} \ "%{mlittle-endian:-EL -m %(linker_liitle_emulation)} " \
%{!mbig-endian:%{!mlittle-endian:-m %(linker_emulation)}} \ "%{!mbig-endian:%{!mlittle-endian:-m %(linker_emulation)}} " \
%(be8_link_spec) %(target_fix_v4bx_spec) \ "%(be8_link_spec) " \
%(netbsd_link_spec)" "%(target_fix_v4bx_spec) %(netbsd_link_spec)"

View File

@ -70,10 +70,16 @@
"-matpcs %{mabi=aapcs*:-meabi=5} " \ "-matpcs %{mabi=aapcs*:-meabi=5} " \
"%{" FPIE_OR_FPIC_SPEC ":-k}" "%{" FPIE_OR_FPIC_SPEC ":-k}"
#undef SUBTARGET_EXTRA_SPECS
#define SUBTARGET_EXTRA_SPECS \
{ "subtarget_extra_asm_spec", SUBTARGET_EXTRA_ASM_SPEC }, \
{ "subtarget_asm_float_spec", SUBTARGET_ASM_FLOAT_SPEC }, \
NETBSD_SUBTARGET_EXTRA_SPECS
/* Default to full VFP if -mfloat-abi=hard is specified. */ /* Default to full VFP if -mfloat-abi=hard is specified. */
#undef SUBTARGET_ASM_FLOAT_SPEC #undef SUBTARGET_ASM_FLOAT_SPEC
#define SUBTARGET_ASM_FLOAT_SPEC \ #define SUBTARGET_ASM_FLOAT_SPEC \
"%{mhard-float:%{!mfpu=*:-mfpu=vfp}} \ "%{mhard-float:%{!mfpu=*:-mfpu=vfp}} \
%{mfloat-abi=hard:%{!mfpu=*:-mfpu=vfp}}" %{mfloat-abi=hard:%{!mfpu=*:-mfpu=vfp}}"
#define NETBSD_ENTRY_POINT "__start" #define NETBSD_ENTRY_POINT "__start"
@ -170,5 +176,3 @@ do \
(void) sysarch (SYSARCH_ARM_SYNC_ICACHE, &s); \ (void) sysarch (SYSARCH_ARM_SYNC_ICACHE, &s); \
} \ } \
while (0) while (0)
//#undef FPUTYPE_DEFAULT
//#define FPUTYPE_DEFAULT "vfp"