Files
binutils-gdb/gdb/arch/arc.c
Shahab Vahedi 15e1376fea arc: Fix gcc-4.8 compilation failure for arc.c
Building an arc target:

$ configulre --target=arc-elf32                \
             --enable-targets=arc-linux-uclibc \
	     ...

On a system with gcc-4.8 (CentOS 7.x), fails with:
--------8<---------
../../gdb/arch/arc.c:117:43:   required from here
/usr/include/c++/4.8.2/bits/hashtable_policy.h:195:39: error: no matching
function for call to 'std::pair<const arc_arch_features, const
std::unique_ptr<target_desc, target_desc_deleter> >::pair(const
arc_arch_features&, target_desc*&)'
  : _M_v(std::forward<_Args>(__args)...) { }
                                       ^
/usr/include/c++/4.8.2/bits/hashtable_policy.h:195:39: note: candidates are:
In file included from /usr/include/c++/4.8.2/utility:70:0,
                 from /usr/include/c++/4.8.2/tuple:38,
                 from /usr/include/c++/4.8.2/functional:55,
                 from ../../gdb/../gdbsupport/ptid.h:35,
                 from ../../gdb/../gdbsupport/common-defs.h:123,
                 from ../../gdb/arch/arc.c:19:
/usr/include/c++/4.8.2/bits/stl_pair.h:206:9: note: template<class ...
_Args1, long unsigned int ..._Indexes1, class ... _Args2, long unsigned int
..._Indexes2> std::pair<_T1, _T2>::pair(std::tuple<_Args1 ...>&,
std::tuple<_Args2 ...>&, std::_Index_tuple<_Indexes1 ...>,
std::_Index_tuple<_Indexes2 ...>)
         pair(tuple<_Args1...>&, tuple<_Args2...>&,
         ^
-------->8---------

The corresponding line in arc.c must use an explicit ctor:
--------8<---------
 arc_lookup_target_description (...)
 {

   /* Add the newly created target description to the repertoire.  */
-  arc_tdesc_cache.emplace (features, tdesc);
+  arc_tdesc_cache.emplace (features, target_desc_up (tdesc));

   return tdesc;
 }
-------->8---------
See "PR gcc/96537" for more details.

Last but not least, this problem has originally been investigated
by Tom de Vries for RISCV targets (see 38f8aa06d9).

gdb/ChangeLog:

	PR build/27385
	* arch/arc.c (arc_lookup_target_description): Use
	target_desc_up() ctor explicitly.
2021-02-09 18:38:35 +01:00

124 lines
3.6 KiB
C

/* Copyright (C) 2017-2021 Free Software Foundation, Inc.
This file is part of GDB.
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 3 of the License, 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, see <http://www.gnu.org/licenses/>. */
#include "gdbsupport/common-defs.h"
#include "arc.h"
#include <stdlib.h>
#include <unordered_map>
#include <string>
/* Target description features. */
#include "features/arc/v1-core.c"
#include "features/arc/v1-aux.c"
#include "features/arc/v2-core.c"
#include "features/arc/v2-aux.c"
#ifndef GDBSERVER
#define STATIC_IN_GDB static
#else
#define STATIC_IN_GDB
#endif
STATIC_IN_GDB target_desc *
arc_create_target_description (const struct arc_arch_features &features)
{
/* Create a new target description. */
target_desc *tdesc = allocate_target_description ();
#ifndef IN_PROCESS_AGENT
std::string arch_name;
/* Architecture names here must match the ones in
ARCH_INFO_STRUCT in bfd/cpu-arc.c. */
if (features.isa == ARC_ISA_ARCV1 && features.reg_size == 4)
arch_name = "arc:ARC700";
else if (features.isa == ARC_ISA_ARCV2 && features.reg_size == 4)
arch_name = "arc:ARCv2";
else
{
std::string msg = string_printf
("Cannot determine architecture: ISA=%d; bitness=%d",
features.isa, 8 * features.reg_size);
gdb_assert_not_reached (msg.c_str ());
}
set_tdesc_architecture (tdesc, arch_name.c_str ());
#endif
long regnum = 0;
switch (features.isa)
{
case ARC_ISA_ARCV1:
regnum = create_feature_arc_v1_core (tdesc, regnum);
regnum = create_feature_arc_v1_aux (tdesc, regnum);
break;
case ARC_ISA_ARCV2:
regnum = create_feature_arc_v2_core (tdesc, regnum);
regnum = create_feature_arc_v2_aux (tdesc, regnum);
break;
default:
std::string msg = string_printf
("Cannot choose target description XML: %d", features.isa);
gdb_assert_not_reached (msg.c_str ());
}
return tdesc;
}
#ifndef GDBSERVER
/* Wrapper used by std::unordered_map to generate hash for features set. */
struct arc_arch_features_hasher
{
std::size_t
operator() (const arc_arch_features &features) const noexcept
{
return features.hash ();
}
};
/* Cache of previously created target descriptions, indexed by the hash
of the features set used to create them. */
static std::unordered_map<arc_arch_features,
const target_desc_up,
arc_arch_features_hasher> arc_tdesc_cache;
/* See arch/arc.h. */
const target_desc *
arc_lookup_target_description (const struct arc_arch_features &features)
{
/* Lookup in the cache first. If found, return the pointer from the
"target_desc_up" type which is a "unique_ptr". This should be fine
as the "arc_tdesc_cache" will persist until GDB terminates. */
const auto it = arc_tdesc_cache.find (features);
if (it != arc_tdesc_cache.end ())
return it->second.get ();
target_desc *tdesc = arc_create_target_description (features);
/* Add the newly created target description to the repertoire.
PR build/27385: Use "target_desc_up ()" ctor explicitly. */
arc_tdesc_cache.emplace (features, target_desc_up (tdesc));
return tdesc;
}
#endif /* !GDBSERVER */