From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1090 invoked by alias); 22 May 2017 21:12:58 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 825 invoked by uid 89); 22 May 2017 21:12:57 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-23.3 required=5.0 tests=AWL,BAYES_00,FREEMAIL_FROM,FROM_LOCAL_NOVOWEL,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,HK_RANDOM_ENVFROM,HK_RANDOM_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS,UNSUBSCRIBE_BODY autolearn=ham version=3.3.2 spammy= X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-lf0-f67.google.com Received: from mail-lf0-f67.google.com (HELO mail-lf0-f67.google.com) (209.85.215.67) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 22 May 2017 21:12:52 +0000 Received: by mail-lf0-f67.google.com with SMTP id h4so6443412lfj.3; Mon, 22 May 2017 14:12:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uP96L2n3HD7ANnyN7/Dg9NCBnqs/OYOnj3XFjjrz2GQ=; b=qM7zjXXwFH6dE6dZe8O6g0/+JSqg0TU4cqpit34rAlPTderHyhsVywr+wU2cZQu80D +Rmdl8DvPfDVw5oFRZauGzXCylLYdc6mHag9NaT68NpN5LwHX1t9Hg9pDfWy2UhVpZj/ txh0nwcrFlTDiOBmRu+YCMi6rlYdOXqN14vRl/CkwNlbcL5V77JOcmykmhzeQ6XSf6Se gcIot4swkmfBokATdsN1YY4Fj04UWN91RBnyzx7qbKKu6QpQlLBUn8rZOzlFQba5u2De 6+Clv6Hn5tY5lNK25DJ/mt9b5iJ0KcoayPN20MYFT2NFhxlnKf0zt83ruNi4rnkFOJGO GV4A== X-Gm-Message-State: AODbwcCOVDD9LrmT0Pn+Wp0rKWWRU1YTz3c1oQwUI+RUrFL9Rw0370Gs jDaccuB3aGiZAK9v X-Received: by 10.25.79.3 with SMTP id d3mr6451772lfb.179.1495487573183; Mon, 22 May 2017 14:12:53 -0700 (PDT) Received: from octofox.metropolis ([5.19.183.212]) by smtp.gmail.com with ESMTPSA id a7sm3335749ljb.44.2017.05.22.14.12.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 May 2017 14:12:52 -0700 (PDT) From: Max Filippov To: binutils@sourceware.org, gdb-patches@sourceware.org Cc: Sterling Augustine , David Weatherford , Maxim Grigoriev , Woody LaRue , Max Filippov Subject: [RFC 2/5] xtensa: make configuration dynamic Date: Mon, 22 May 2017 21:12:00 -0000 Message-Id: <1495487553-19078-3-git-send-email-jcmvbkbc@gmail.com> In-Reply-To: <1495487553-19078-1-git-send-email-jcmvbkbc@gmail.com> References: <1495487553-19078-1-git-send-email-jcmvbkbc@gmail.com> X-SW-Source: 2017-05/txt/msg00501.txt.bz2 Now that XCHAL_* macros don't have to be preprocessor constants add include/xtensa-dynconfig.h that defines them as fields of a structure returned from the xtensa_get_config function. Define that structure and fill it with default parameter values specified in the include/xtensa-config.h. Define reusable function xtensa_load_config that tries to load configuration and return an address of an exported object from it. Define the function xtensa_get_config that uses xtensa_load_config to get structure xtensa_config, either dynamically configured or the default. 2017-05-22 Max Filippov bfd/ * Makefile.am (BFD32_BACKENDS, BFD32_BACKENDS_CFILES): Append xtensa-config.c. * Makefile.in: Regenerate. * configure: Regenerate. * configure.ac (xtensa_elf32_be_vec, xtensa_elf32_le_vec): Add xtensa-config.lo to the tb. * elf32-xtensa.c (xtensa-config.h): Replace #include with xtensa-dynconfig.h. * xtensa-config.c: New file. gas/ * config/tc-xtensa.c (xtensa-config.h): Replace #include with xtensa-dynconfig.h. * config/tc-xtensa.h: Likewise. * config/xtensa-relax.c: Likewise. include/ * xtensa-dynconfig.h: New file. ld/ * Makefile.am (eelf32xtensa.c): Add $(INCDIR)/xtensa-dynconfig.h to the list of dependencies. * Makefile.in: Regenerate. * emultempl/xtensaelf.em (xtensa-config.h): Replace #include with xtensa-dynconfig.h. --- bfd/Makefile.am | 2 + bfd/Makefile.in | 3 + bfd/configure | 4 +- bfd/configure.ac | 4 +- bfd/elf32-xtensa.c | 2 +- bfd/xtensa-config.c | 84 ++++++++++ gas/config/tc-xtensa.c | 2 +- gas/config/tc-xtensa.h | 2 +- gas/config/xtensa-relax.c | 2 +- include/xtensa-dynconfig.h | 373 +++++++++++++++++++++++++++++++++++++++++++++ ld/Makefile.am | 1 + ld/Makefile.in | 1 + ld/emultempl/xtensaelf.em | 2 +- 13 files changed, 473 insertions(+), 9 deletions(-) create mode 100644 bfd/xtensa-config.c create mode 100644 include/xtensa-dynconfig.h diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 55e6aaf..f6daff4 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -455,6 +455,7 @@ BFD32_BACKENDS = \ vms-misc.lo \ xcofflink.lo \ xsym.lo \ + xtensa-config.lo \ xtensa-isa.lo \ xtensa-modules.lo @@ -646,6 +647,7 @@ BFD32_BACKENDS_CFILES = \ vms-misc.c \ xcofflink.c \ xsym.c \ + xtensa-config.c \ xtensa-isa.c \ xtensa-modules.c diff --git a/bfd/Makefile.in b/bfd/Makefile.in index 43d8b62..4f6d593 100644 --- a/bfd/Makefile.in +++ b/bfd/Makefile.in @@ -789,6 +789,7 @@ BFD32_BACKENDS = \ vms-misc.lo \ xcofflink.lo \ xsym.lo \ + xtensa-config.lo \ xtensa-isa.lo \ xtensa-modules.lo @@ -980,6 +981,7 @@ BFD32_BACKENDS_CFILES = \ vms-misc.c \ xcofflink.c \ xsym.c \ + xtensa-config.c \ xtensa-isa.c \ xtensa-modules.c @@ -1661,6 +1663,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vms-misc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcofflink.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsym.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtensa-config.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtensa-isa.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtensa-modules.Plo@am__quote@ diff --git a/bfd/configure b/bfd/configure index 9769387..e8fd5a9 100755 --- a/bfd/configure +++ b/bfd/configure @@ -14584,8 +14584,8 @@ do xc16x_elf32_vec) tb="$tb elf32-xc16x.lo elf32.lo $elf" ;; xgate_elf32_vec) tb="$tb elf32-xgate.lo elf32.lo $elf" ;; xstormy16_elf32_vec) tb="$tb elf32-xstormy16.lo elf32.lo $elf" ;; - xtensa_elf32_be_vec) tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;; - xtensa_elf32_le_vec) tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;; + xtensa_elf32_be_vec) tb="$tb xtensa-config.lo xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;; + xtensa_elf32_le_vec) tb="$tb xtensa-config.lo xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;; z80_coff_vec) tb="$tb coff-z80.lo reloc16.lo $coffgen" ;; z8k_coff_vec) tb="$tb coff-z8k.lo reloc16.lo $coff" ;; diff --git a/bfd/configure.ac b/bfd/configure.ac index 9a183c1..ebf6a0e 100644 --- a/bfd/configure.ac +++ b/bfd/configure.ac @@ -715,8 +715,8 @@ do xc16x_elf32_vec) tb="$tb elf32-xc16x.lo elf32.lo $elf" ;; xgate_elf32_vec) tb="$tb elf32-xgate.lo elf32.lo $elf" ;; xstormy16_elf32_vec) tb="$tb elf32-xstormy16.lo elf32.lo $elf" ;; - xtensa_elf32_be_vec) tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;; - xtensa_elf32_le_vec) tb="$tb xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;; + xtensa_elf32_be_vec) tb="$tb xtensa-config.lo xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;; + xtensa_elf32_le_vec) tb="$tb xtensa-config.lo xtensa-isa.lo xtensa-modules.lo elf32-xtensa.lo elf32.lo $elf" ;; z80_coff_vec) tb="$tb coff-z80.lo reloc16.lo $coffgen" ;; z8k_coff_vec) tb="$tb coff-z8k.lo reloc16.lo $coff" ;; diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c index 078918f..c67e340 100644 --- a/bfd/elf32-xtensa.c +++ b/bfd/elf32-xtensa.c @@ -30,7 +30,7 @@ #include "elf/xtensa.h" #include "splay-tree.h" #include "xtensa-isa.h" -#include "xtensa-config.h" +#include "xtensa-dynconfig.h" #define XTENSA_NO_NOP_REMOVAL 0 diff --git a/bfd/xtensa-config.c b/bfd/xtensa-config.c new file mode 100644 index 0000000..fdbcca4 --- /dev/null +++ b/bfd/xtensa-config.c @@ -0,0 +1,84 @@ +#include "sysdep.h" +#include "bfd.h" + +#if defined (HAVE_DLFCN_H) +#include +#endif +#include +#include +#define XTENSA_CONFIG_DEFINITION +#include "xtensa-config.h" +#include "xtensa-dynconfig.h" + +static struct xtensa_config xtensa_defconfig = XTENSA_CONFIG_INITIALIZER; + +void *xtensa_load_config (const char *name ATTRIBUTE_UNUSED, void *def) +{ + static int init; +#if BFD_SUPPORTS_PLUGINS + static void *handle; + void *p; + + if (!init) + { + char *path = getenv ("XTENSA_GNU_CONFIG"); + + init = 1; + if (!path) + return def; + handle = dlopen (path, RTLD_LAZY); + if (!handle) + { + fprintf (stderr, + "XTENSA_GNU_CONFIG is defined but could not be loaded: %s\n", + dlerror ()); + abort (); + } + } + else if (!handle) + { + return def; + } + + p = dlsym (handle, name); + if (!p) + { + fprintf (stderr, + "XTENSA_GNU_CONFIG is loaded but symbol \"%s\" is not found: %s\n", + name, dlerror ()); + abort (); + } + return p; +#else + if (!init) + { + char *path = getenv ("XTENSA_GNU_CONFIG"); + + init = 1; + if (path) + { + fprintf (stderr, + "XTENSA_GNU_CONFIG is defined but plugin support is disabled\n"); + abort (); + } + } + return def; +#endif +} + +struct xtensa_config *xtensa_get_config (void) +{ + static struct xtensa_config *config; + + if (!config) + config = xtensa_load_config ("xtensa_config", &xtensa_defconfig); + + if (config->config_size < sizeof(struct xtensa_config)) + { + fprintf (stderr, + "old or incompatible configuration is loaded: config_size = %ld, expected: %ld\n", + config->config_size, sizeof (struct xtensa_config)); + abort (); + } + return config; +} diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c index ed7ba0a..0a491c3 100644 --- a/gas/config/tc-xtensa.c +++ b/gas/config/tc-xtensa.c @@ -28,7 +28,7 @@ #include "dwarf2dbg.h" #include "xtensa-istack.h" #include "struc-symbol.h" -#include "xtensa-config.h" +#include "xtensa-dynconfig.h" #include "elf/xtensa.h" /* Provide default values for new configuration settings. */ diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h index 69a5c8a..7dd225d 100644 --- a/gas/config/tc-xtensa.h +++ b/gas/config/tc-xtensa.h @@ -28,7 +28,7 @@ struct fix; #endif #include "xtensa-isa.h" -#include "xtensa-config.h" +#include "xtensa-dynconfig.h" #define TARGET_BYTES_BIG_ENDIAN 0 diff --git a/gas/config/xtensa-relax.c b/gas/config/xtensa-relax.c index f54cf79..2914857 100644 --- a/gas/config/xtensa-relax.c +++ b/gas/config/xtensa-relax.c @@ -99,7 +99,7 @@ #include "xtensa-isa.h" #include "xtensa-relax.h" #include -#include "xtensa-config.h" +#include "xtensa-dynconfig.h" #ifndef XCHAL_HAVE_WIDE_BRANCHES #define XCHAL_HAVE_WIDE_BRANCHES 0 diff --git a/include/xtensa-dynconfig.h b/include/xtensa-dynconfig.h new file mode 100644 index 0000000..12181be --- /dev/null +++ b/include/xtensa-dynconfig.h @@ -0,0 +1,373 @@ +/* Xtensa configuration settings. + Copyright (C) 2017 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ + +#ifndef XTENSA_DYNAMIC_CONFIG_H +#define XTENSA_DYNAMIC_CONFIG_H + +#ifdef __cplusplus +extern "C" { +#endif + +struct xtensa_config { + unsigned long config_size; + unsigned int xchal_have_be; + unsigned int xchal_have_density; + unsigned int xchal_have_const16; + unsigned int xchal_have_abs; + unsigned int xchal_have_addx; + unsigned int xchal_have_l32r; + unsigned int xshal_use_absolute_literals; + unsigned int xshal_have_text_section_literals; + unsigned int xchal_have_mac16; + unsigned int xchal_have_mul16; + unsigned int xchal_have_mul32; + unsigned int xchal_have_mul32_high; + unsigned int xchal_have_div32; + unsigned int xchal_have_nsa; + unsigned int xchal_have_minmax; + unsigned int xchal_have_sext; + unsigned int xchal_have_loops; + unsigned int xchal_have_threadptr; + unsigned int xchal_have_release_sync; + unsigned int xchal_have_s32c1i; + unsigned int xchal_have_booleans; + unsigned int xchal_have_fp; + unsigned int xchal_have_fp_div; + unsigned int xchal_have_fp_recip; + unsigned int xchal_have_fp_sqrt; + unsigned int xchal_have_fp_rsqrt; + unsigned int xchal_have_fp_postinc; + unsigned int xchal_have_dfp; + unsigned int xchal_have_dfp_div; + unsigned int xchal_have_dfp_recip; + unsigned int xchal_have_dfp_sqrt; + unsigned int xchal_have_dfp_rsqrt; + unsigned int xchal_have_windowed; + unsigned int xchal_num_aregs; + unsigned int xchal_have_wide_branches; + unsigned int xchal_have_predicted_branches; + unsigned int xchal_icache_size; + unsigned int xchal_dcache_size; + unsigned int xchal_icache_linesize; + unsigned int xchal_dcache_linesize; + unsigned int xchal_icache_linewidth; + unsigned int xchal_dcache_linewidth; + unsigned int xchal_dcache_is_writeback; + unsigned int xchal_have_mmu; + unsigned int xchal_mmu_min_pte_page_size; + unsigned int xchal_have_debug; + unsigned int xchal_num_ibreak; + unsigned int xchal_num_dbreak; + unsigned int xchal_debuglevel; + unsigned int xchal_max_instruction_size; + unsigned int xchal_inst_fetch_width; + unsigned int xshal_abi; + unsigned int xthal_abi_windowed; + unsigned int xthal_abi_call0; +}; + +typedef struct xtensa_isa_internal_struct xtensa_isa_internal; + +extern void *xtensa_load_config (const char *name, void *def); +extern struct xtensa_config *xtensa_get_config (void); + +#ifdef XTENSA_CONFIG_DEFINITION + +#ifndef XCHAL_HAVE_MUL32_HIGH +#define XCHAL_HAVE_MUL32_HIGH 0 +#endif + +#ifndef XCHAL_HAVE_RELEASE_SYNC +#define XCHAL_HAVE_RELEASE_SYNC 0 +#endif + +#ifndef XCHAL_HAVE_S32C1I +#define XCHAL_HAVE_S32C1I 0 +#endif + +#ifndef XCHAL_HAVE_THREADPTR +#define XCHAL_HAVE_THREADPTR 0 +#endif + +#ifndef XCHAL_HAVE_FP_POSTINC +#define XCHAL_HAVE_FP_POSTINC 0 +#endif + +#ifndef XCHAL_HAVE_DFP +#define XCHAL_HAVE_DFP 0 +#endif + +#ifndef XCHAL_HAVE_DFP_DIV +#define XCHAL_HAVE_DFP_DIV 0 +#endif + +#ifndef XCHAL_HAVE_DFP_RECIP +#define XCHAL_HAVE_DFP_RECIP 0 +#endif + +#ifndef XCHAL_HAVE_DFP_SQRT +#define XCHAL_HAVE_DFP_SQRT 0 +#endif + +#ifndef XCHAL_HAVE_DFP_RSQRT +#define XCHAL_HAVE_DFP_RSQRT 0 +#endif + +#ifndef XSHAL_HAVE_TEXT_SECTION_LITERALS +#define XSHAL_HAVE_TEXT_SECTION_LITERALS 0 +#endif + +#ifndef XCHAL_MMU_MIN_PTE_PAGE_SIZE +#define XCHAL_MMU_MIN_PTE_PAGE_SIZE 1 +#endif + +#define XTENSA_CONFIG_ENTRY(a) a + +#define XTENSA_CONFIG_ENTRY_LIST \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_BE), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_DENSITY), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_CONST16), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_ABS), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_ADDX), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_L32R), \ + XTENSA_CONFIG_ENTRY(XSHAL_USE_ABSOLUTE_LITERALS), \ + XTENSA_CONFIG_ENTRY(XSHAL_HAVE_TEXT_SECTION_LITERALS), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_MAC16), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_MUL16), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_MUL32), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_MUL32_HIGH), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_DIV32), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_NSA), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_MINMAX), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_SEXT), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_LOOPS), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_THREADPTR), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_RELEASE_SYNC), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_S32C1I), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_BOOLEANS), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_FP), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_FP_DIV), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_FP_RECIP), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_FP_SQRT), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_FP_RSQRT), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_FP_POSTINC), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_DFP), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_DFP_DIV), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_DFP_RECIP), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_DFP_SQRT), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_DFP_RSQRT), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_WINDOWED), \ + XTENSA_CONFIG_ENTRY(XCHAL_NUM_AREGS), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_WIDE_BRANCHES), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_PREDICTED_BRANCHES), \ + XTENSA_CONFIG_ENTRY(XCHAL_ICACHE_SIZE), \ + XTENSA_CONFIG_ENTRY(XCHAL_DCACHE_SIZE), \ + XTENSA_CONFIG_ENTRY(XCHAL_ICACHE_LINESIZE), \ + XTENSA_CONFIG_ENTRY(XCHAL_DCACHE_LINESIZE), \ + XTENSA_CONFIG_ENTRY(XCHAL_ICACHE_LINEWIDTH), \ + XTENSA_CONFIG_ENTRY(XCHAL_DCACHE_LINEWIDTH), \ + XTENSA_CONFIG_ENTRY(XCHAL_DCACHE_IS_WRITEBACK), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_MMU), \ + XTENSA_CONFIG_ENTRY(XCHAL_MMU_MIN_PTE_PAGE_SIZE), \ + XTENSA_CONFIG_ENTRY(XCHAL_HAVE_DEBUG), \ + XTENSA_CONFIG_ENTRY(XCHAL_NUM_IBREAK), \ + XTENSA_CONFIG_ENTRY(XCHAL_NUM_DBREAK), \ + XTENSA_CONFIG_ENTRY(XCHAL_DEBUGLEVEL), \ + XTENSA_CONFIG_ENTRY(XCHAL_MAX_INSTRUCTION_SIZE), \ + XTENSA_CONFIG_ENTRY(XCHAL_INST_FETCH_WIDTH), \ + XTENSA_CONFIG_ENTRY(XSHAL_ABI), \ + XTENSA_CONFIG_ENTRY(XTHAL_ABI_WINDOWED), \ + XTENSA_CONFIG_ENTRY(XTHAL_ABI_CALL0) + +#define XTENSA_CONFIG_INITIALIZER { \ + sizeof (struct xtensa_config), \ + XTENSA_CONFIG_ENTRY_LIST, \ +} + +#else /* XTENSA_CONFIG_DEFINITION */ + +#undef XCHAL_HAVE_BE +#define XCHAL_HAVE_BE (xtensa_get_config ()->xchal_have_be) + +#undef XCHAL_HAVE_DENSITY +#define XCHAL_HAVE_DENSITY (xtensa_get_config ()->xchal_have_density) + +#undef XCHAL_HAVE_CONST16 +#define XCHAL_HAVE_CONST16 (xtensa_get_config ()->xchal_have_const16) + +#undef XCHAL_HAVE_ABS +#define XCHAL_HAVE_ABS (xtensa_get_config ()->xchal_have_abs) + +#undef XCHAL_HAVE_ADDX +#define XCHAL_HAVE_ADDX (xtensa_get_config ()->xchal_have_addx) + +#undef XCHAL_HAVE_L32R +#define XCHAL_HAVE_L32R (xtensa_get_config ()->xchal_have_l32r) + +#undef XSHAL_USE_ABSOLUTE_LITERALS +#define XSHAL_USE_ABSOLUTE_LITERALS (xtensa_get_config ()->xshal_use_absolute_literals) + +#undef XSHAL_HAVE_TEXT_SECTION_LITERALS +#define XSHAL_HAVE_TEXT_SECTION_LITERALS (xtensa_get_config ()->xshal_have_text_section_literals) + +#undef XCHAL_HAVE_MAC16 +#define XCHAL_HAVE_MAC16 (xtensa_get_config ()->xchal_have_mac16) + +#undef XCHAL_HAVE_MUL16 +#define XCHAL_HAVE_MUL16 (xtensa_get_config ()->xchal_have_mul16) + +#undef XCHAL_HAVE_MUL32 +#define XCHAL_HAVE_MUL32 (xtensa_get_config ()->xchal_have_mul32) + +#undef XCHAL_HAVE_MUL32_HIGH +#define XCHAL_HAVE_MUL32_HIGH (xtensa_get_config ()->xchal_have_mul32_high) + +#undef XCHAL_HAVE_DIV32 +#define XCHAL_HAVE_DIV32 (xtensa_get_config ()->xchal_have_div32) + +#undef XCHAL_HAVE_NSA +#define XCHAL_HAVE_NSA (xtensa_get_config ()->xchal_have_nsa) + +#undef XCHAL_HAVE_MINMAX +#define XCHAL_HAVE_MINMAX (xtensa_get_config ()->xchal_have_minmax) + +#undef XCHAL_HAVE_SEXT +#define XCHAL_HAVE_SEXT (xtensa_get_config ()->xchal_have_sext) + +#undef XCHAL_HAVE_LOOPS +#define XCHAL_HAVE_LOOPS (xtensa_get_config ()->xchal_have_loops) + +#undef XCHAL_HAVE_THREADPTR +#define XCHAL_HAVE_THREADPTR (xtensa_get_config ()->xchal_have_threadptr) + +#undef XCHAL_HAVE_RELEASE_SYNC +#define XCHAL_HAVE_RELEASE_SYNC (xtensa_get_config ()->xchal_have_release_sync) + +#undef XCHAL_HAVE_S32C1I +#define XCHAL_HAVE_S32C1I (xtensa_get_config ()->xchal_have_s32c1i) + +#undef XCHAL_HAVE_BOOLEANS +#define XCHAL_HAVE_BOOLEANS (xtensa_get_config ()->xchal_have_booleans) + +#undef XCHAL_HAVE_FP +#define XCHAL_HAVE_FP (xtensa_get_config ()->xchal_have_fp) + +#undef XCHAL_HAVE_FP_DIV +#define XCHAL_HAVE_FP_DIV (xtensa_get_config ()->xchal_have_fp_div) + +#undef XCHAL_HAVE_FP_RECIP +#define XCHAL_HAVE_FP_RECIP (xtensa_get_config ()->xchal_have_fp_recip) + +#undef XCHAL_HAVE_FP_SQRT +#define XCHAL_HAVE_FP_SQRT (xtensa_get_config ()->xchal_have_fp_sqrt) + +#undef XCHAL_HAVE_FP_RSQRT +#define XCHAL_HAVE_FP_RSQRT (xtensa_get_config ()->xchal_have_fp_rsqrt) + +#undef XCHAL_HAVE_FP_POSTINC +#define XCHAL_HAVE_FP_POSTINC (xtensa_get_config ()->xchal_have_fp_postinc) + +#undef XCHAL_HAVE_DFP +#define XCHAL_HAVE_DFP (xtensa_get_config ()->xchal_have_dfp) + +#undef XCHAL_HAVE_DFP_DIV +#define XCHAL_HAVE_DFP_DIV (xtensa_get_config ()->xchal_have_dfp_div) + +#undef XCHAL_HAVE_DFP_RECIP +#define XCHAL_HAVE_DFP_RECIP (xtensa_get_config ()->xchal_have_dfp_recip) + +#undef XCHAL_HAVE_DFP_SQRT +#define XCHAL_HAVE_DFP_SQRT (xtensa_get_config ()->xchal_have_dfp_sqrt) + +#undef XCHAL_HAVE_DFP_RSQRT +#define XCHAL_HAVE_DFP_RSQRT (xtensa_get_config ()->xchal_have_dfp_rsqrt) + +#undef XCHAL_HAVE_WINDOWED +#define XCHAL_HAVE_WINDOWED (xtensa_get_config ()->xchal_have_windowed) + +#undef XCHAL_NUM_AREGS +#define XCHAL_NUM_AREGS (xtensa_get_config ()->xchal_num_aregs) + +#undef XCHAL_HAVE_WIDE_BRANCHES +#define XCHAL_HAVE_WIDE_BRANCHES (xtensa_get_config ()->xchal_have_wide_branches) + +#undef XCHAL_HAVE_PREDICTED_BRANCHES +#define XCHAL_HAVE_PREDICTED_BRANCHES (xtensa_get_config ()->xchal_have_predicted_branches) + + +#undef XCHAL_ICACHE_SIZE +#define XCHAL_ICACHE_SIZE (xtensa_get_config ()->xchal_icache_size) + +#undef XCHAL_DCACHE_SIZE +#define XCHAL_DCACHE_SIZE (xtensa_get_config ()->xchal_dcache_size) + +#undef XCHAL_ICACHE_LINESIZE +#define XCHAL_ICACHE_LINESIZE (xtensa_get_config ()->xchal_icache_linesize) + +#undef XCHAL_DCACHE_LINESIZE +#define XCHAL_DCACHE_LINESIZE (xtensa_get_config ()->xchal_dcache_linesize) + +#undef XCHAL_ICACHE_LINEWIDTH +#define XCHAL_ICACHE_LINEWIDTH (xtensa_get_config ()->xchal_icache_linewidth) + +#undef XCHAL_DCACHE_LINEWIDTH +#define XCHAL_DCACHE_LINEWIDTH (xtensa_get_config ()->xchal_dcache_linewidth) + +#undef XCHAL_DCACHE_IS_WRITEBACK +#define XCHAL_DCACHE_IS_WRITEBACK (xtensa_get_config ()->xchal_dcache_is_writeback) + + +#undef XCHAL_HAVE_MMU +#define XCHAL_HAVE_MMU (xtensa_get_config ()->xchal_have_mmu) + +#undef XCHAL_MMU_MIN_PTE_PAGE_SIZE +#define XCHAL_MMU_MIN_PTE_PAGE_SIZE (xtensa_get_config ()->xchal_mmu_min_pte_page_size) + + +#undef XCHAL_HAVE_DEBUG +#define XCHAL_HAVE_DEBUG (xtensa_get_config ()->xchal_have_debug) + +#undef XCHAL_NUM_IBREAK +#define XCHAL_NUM_IBREAK (xtensa_get_config ()->xchal_num_ibreak) + +#undef XCHAL_NUM_DBREAK +#define XCHAL_NUM_DBREAK (xtensa_get_config ()->xchal_num_dbreak) + +#undef XCHAL_DEBUGLEVEL +#define XCHAL_DEBUGLEVEL (xtensa_get_config ()->xchal_debuglevel) + + +#undef XCHAL_MAX_INSTRUCTION_SIZE +#define XCHAL_MAX_INSTRUCTION_SIZE (xtensa_get_config ()->xchal_max_instruction_size) + +#undef XCHAL_INST_FETCH_WIDTH +#define XCHAL_INST_FETCH_WIDTH (xtensa_get_config ()->xchal_inst_fetch_width) + + +#undef XSHAL_ABI +#undef XTHAL_ABI_WINDOWED +#undef XTHAL_ABI_CALL0 +#define XSHAL_ABI (xtensa_get_config ()->xshal_abi) +#define XTHAL_ABI_WINDOWED (xtensa_get_config ()->xthal_abi_windowed) +#define XTHAL_ABI_CALL0 (xtensa_get_config ()->xthal_abi_call0) + +#endif /* XTENSA_CONFIG_DEFINITION */ + +#ifdef __cplusplus +} +#endif +#endif /* !XTENSA_DYNAMIC_CONFIG_H */ diff --git a/ld/Makefile.am b/ld/Makefile.am index 15beaa7..40ebcae 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -1327,6 +1327,7 @@ eelf32xstormy16.c: $(srcdir)/emulparams/elf32xstormy16.sh \ eelf32xtensa.c: $(srcdir)/emulparams/elf32xtensa.sh $(ELF_DEPS) \ $(srcdir)/emultempl/xtensaelf.em $(INCDIR)/xtensa-config.h \ + $(INCDIR)/xtensa-dynconfig.h \ $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/xtensa.h \ $(srcdir)/scripttempl/elfxtensa.sc ${GEN_DEPENDS} diff --git a/ld/Makefile.in b/ld/Makefile.in index 042b690..726f14d 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -2920,6 +2920,7 @@ eelf32xstormy16.c: $(srcdir)/emulparams/elf32xstormy16.sh \ eelf32xtensa.c: $(srcdir)/emulparams/elf32xtensa.sh $(ELF_DEPS) \ $(srcdir)/emultempl/xtensaelf.em $(INCDIR)/xtensa-config.h \ + $(INCDIR)/xtensa-dynconfig.h \ $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/xtensa.h \ $(srcdir)/scripttempl/elfxtensa.sc ${GEN_DEPENDS} diff --git a/ld/emultempl/xtensaelf.em b/ld/emultempl/xtensaelf.em index 080b66d..1199399 100644 --- a/ld/emultempl/xtensaelf.em +++ b/ld/emultempl/xtensaelf.em @@ -24,7 +24,7 @@ # fragment < +#include #include "../bfd/elf-bfd.h" #include "elf/xtensa.h" #include "bfd.h" -- 2.1.4