(config_h): Define.
(osabi.o): Update dependencies.
* configure.tgt: Set gdb_osabi based on target triplet.
* configure.in: Define GDB_OSABI_DEFAULT based on gdb_osabi.
* configure: Regenerated.
* config.in: Regenerated.
* osabi.c: Include "arch-utils.h", "gdbcmd.h", and "command.h".
(GDB_OSABI_DEFAULT): Define if not already defined.
(user_osabi_state, user_selected_osabi, gdb_osabi_available_names)
(set_osabi_string): New variables.
(gdbarch_register_osabi): Add new OS ABI to
gdb_osabi_available_names.
(gdbarch_lookup_osabi): Honor specified and default OS ABIs.
(set_osabi, show_osabi): New functions.
(_initialize_gdb_osabi): Add "set osabi" and "show osabi" commands.
+2002-01-04 Daniel Jacobowitz <drow@mvista.com>
+
+ * Makefile.in (acconfig_h): Remove incorrect macro.
+ (config_h): Define.
+ (osabi.o): Update dependencies.
+ * configure.tgt: Set gdb_osabi based on target triplet.
+ * configure.in: Define GDB_OSABI_DEFAULT based on gdb_osabi.
+ * configure: Regenerated.
+ * config.in: Regenerated.
+ * osabi.c: Include "arch-utils.h", "gdbcmd.h", and "command.h".
+ (GDB_OSABI_DEFAULT): Define if not already defined.
+ (user_osabi_state, user_selected_osabi, gdb_osabi_available_names)
+ (set_osabi_string): New variables.
+ (gdbarch_register_osabi): Add new OS ABI to
+ gdb_osabi_available_names.
+ (gdbarch_lookup_osabi): Honor specified and default OS ABIs.
+ (set_osabi, show_osabi): New functions.
+ (_initialize_gdb_osabi): Add "set osabi" and "show osabi" commands.
+
2003-01-04 Daniel Jacobowitz <drow@mvista.com>
* arch-utils.c (gdbarch_info_init): Set osabi to
# gdb/ header files
#
-acconfig_h = acconfig.h
ada_lang_h = ada-lang.h $(value_h) $(gdbtypes_h)
alpha_tdep_h = alpha-tdep.h
alphabsd_tdep_h = alphabsd-tdep.h
command_h = command.h
complaints_h = complaints.h
completer_h = completer.h
+config_h = config.h
cp_abi_h = cp-abi.h
cp_support_h = cp-support.h
dcache_h = dcache.h
$(gdb_stabs_h) $(serial_h) $(ocd_h) $(regcache_h)
op50-rom.o: op50-rom.c $(defs_h) $(gdbcore_h) $(target_h) $(monitor_h) \
$(serial_h)
-osabi.o: osabi.c $(defs_h) $(gdb_string_h) $(osabi_h) $(elf_bfd_h)
+osabi.o: osabi.c $(defs_h) $(gdb_string_h) $(osabi_h) $(elf_bfd_h) \
+ $(gdbcmd_h) $(command_h) $(arch_utils_h)
p-lang.o: p-lang.c $(defs_h) $(gdb_string_h) $(symtab_h) $(gdbtypes_h) \
$(expression_h) $(parser_defs_h) $(language_h) $(p_lang_h) \
$(valprint_h)
/* Define if <thread_db.h> has the TD_NOTALLOC error code. */
#undef THREAD_DB_HAS_TD_NOTALLOC
+/* Define to the default OS ABI for this configuration. */
+#undef GDB_OSABI_DEFAULT
+
/* Define to be a string naming the default host character set. */
#undef GDB_DEFAULT_HOST_CHARSET
*) { echo "configure: error: "GDB: Unknown GDB_MULTI_ARCH value ${GDB_MULTI_ARCH}"" 1>&2; exit 1; };;
esac
+if test x"${gdb_osabi}" != x ; then
+ cat >> confdefs.h <<EOF
+#define GDB_OSABI_DEFAULT $gdb_osabi
+EOF
+
+fi
+
# Enable multi-ice-gdb-server.
# Check whether --enable-multi-ice or --disable-multi-ice was given.
if test "${enable_multi_ice+set}" = set; then
# We only build gdbserver automatically if host and target are the same.
if test "x$target" = "x$host"; then
echo $ac_n "checking whether gdbserver is supported on this host""... $ac_c" 1>&6
-echo "configure:9845: checking whether gdbserver is supported on this host" >&5
+echo "configure:9852: checking whether gdbserver is supported on this host" >&5
if test "x$build_gdbserver" = xyes; then
configdirs="$configdirs gdbserver"
echo "$ac_t""yes" 1>&6
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:9909: checking for Cygwin environment" >&5
+echo "configure:9916: checking for Cygwin environment" >&5
if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9914 "configure"
+#line 9921 "configure"
#include "confdefs.h"
int main() {
return __CYGWIN__;
; return 0; }
EOF
-if { (eval echo configure:9925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_cygwin=yes
else
CYGWIN=
test "$ac_cv_cygwin" = yes && CYGWIN=yes
echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:9942: checking for mingw32 environment" >&5
+echo "configure:9949: checking for mingw32 environment" >&5
if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 9947 "configure"
+#line 9954 "configure"
#include "confdefs.h"
int main() {
return __MINGW32__;
; return 0; }
EOF
-if { (eval echo configure:9954: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_mingw32=yes
else
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:9973: checking for executable suffix" >&5
+echo "configure:9980: checking for executable suffix" >&5
if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
rm -f conftest*
echo 'int main () { return 0; }' > conftest.$ac_ext
ac_cv_exeext=
- if { (eval echo configure:9983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+ if { (eval echo configure:9990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
for file in conftest.*; do
case $file in
- *.c | *.C | *.o | *.obj | *.ilk | *.pdb) ;;
+ *.c | *.o | *.obj | *.ilk | *.pdb) ;;
*) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
esac
done
echo $ac_n "checking for iconv""... $ac_c" 1>&6
-echo "configure:10025: checking for iconv" >&5
+echo "configure:10032: checking for iconv" >&5
if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
am_cv_func_iconv="no, consider installing GNU libiconv"
am_cv_lib_iconv=no
cat > conftest.$ac_ext <<EOF
-#line 10033 "configure"
+#line 10040 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <iconv.h>
iconv_close(cd);
; return 0; }
EOF
-if { (eval echo configure:10043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_func_iconv=yes
else
am_save_LIBS="$LIBS"
LIBS="$LIBS -liconv"
cat > conftest.$ac_ext <<EOF
-#line 10055 "configure"
+#line 10062 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <iconv.h>
iconv_close(cd);
; return 0; }
EOF
-if { (eval echo configure:10065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
am_cv_lib_iconv=yes
am_cv_func_iconv=yes
EOF
echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6
-echo "configure:10086: checking for iconv declaration" >&5
+echo "configure:10093: checking for iconv declaration" >&5
if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 10092 "configure"
+#line 10099 "configure"
#include "confdefs.h"
#include <stdlib.h>
; return 0; }
EOF
-if { (eval echo configure:10111: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:10118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
am_cv_proto_iconv_arg1=""
else
*) AC_MSG_ERROR("GDB: Unknown GDB_MULTI_ARCH value ${GDB_MULTI_ARCH}");;
esac
+if test x"${gdb_osabi}" != x ; then
+ AC_DEFINE_UNQUOTED(GDB_OSABI_DEFAULT, $gdb_osabi,
+ [Define to the default OS ABI for this configuration.])
+fi
+
# Enable multi-ice-gdb-server.
AC_ARG_ENABLE(multi-ice,
[ --enable-multi-ice build the multi-ice-gdb-server],
xstormy16) gdb_multi_arch=yes ;;
mcore) gdb_multi_arch=yes ;;
esac
+
+# map target onto default OS ABI
+
+case "${target}" in
+*-*-linux*) gdb_osabi=GDB_OSABI_LINUX ;;
+*-*-gnu*) gdb_osabi=GDB_OSABI_HURD ;;
+esac
#include "gdb_string.h"
#include "osabi.h"
+#include "arch-utils.h"
+#include "gdbcmd.h"
+#include "command.h"
#include "elf-bfd.h"
+#ifndef GDB_OSABI_DEFAULT
+#define GDB_OSABI_DEFAULT GDB_OSABI_UNKNOWN
+#endif
+
+/* State for the "set osabi" command. */
+static enum { osabi_auto, osabi_default, osabi_user } user_osabi_state;
+static enum gdb_osabi user_selected_osabi;
+static const char *gdb_osabi_available_names[GDB_OSABI_INVALID + 3] = {
+ "auto",
+ "default",
+ "none",
+ NULL
+};
+static const char *set_osabi_string;
/* This table matches the indices assigned to enum gdb_osabi. Keep
them in sync. */
static const char * const gdb_osabi_names[] =
{
- "<unknown>",
+ "none",
"SVR4",
"GNU/Hurd",
{
struct gdb_osabi_handler **handler_p;
const struct bfd_arch_info *arch_info = bfd_lookup_arch (arch, machine);
+ const char **name_ptr;
/* Registering an OS ABI handler for "unknown" is not allowed. */
if (osabi == GDB_OSABI_UNKNOWN)
(*handler_p)->arch_info = arch_info;
(*handler_p)->osabi = osabi;
(*handler_p)->init_osabi = init_osabi;
+
+ /* Add this OS ABI to the list of enum values for "set osabi", if it isn't
+ already there. */
+ for (name_ptr = gdb_osabi_available_names; *name_ptr; name_ptr ++)
+ {
+ if (*name_ptr == gdbarch_osabi_name (osabi))
+ return;
+ }
+ *name_ptr++ = gdbarch_osabi_name (osabi);
+ *name_ptr = NULL;
}
\f
enum gdb_osabi osabi, match;
int match_specific;
- if (abfd == NULL)
- return GDB_OSABI_UNINITIALIZED;
+ /* If we aren't in "auto" mode, return the specified OS ABI. */
+ if (user_osabi_state == osabi_user)
+ return user_selected_osabi;
+
+ /* If we don't have a binary, return the default OS ABI (if set) or
+ an inconclusive result (otherwise). */
+ if (abfd == NULL)
+ {
+ if (GDB_OSABI_DEFAULT != GDB_OSABI_UNKNOWN)
+ return GDB_OSABI_DEFAULT;
+ else
+ return GDB_OSABI_UNINITIALIZED;
+ }
match = GDB_OSABI_UNKNOWN;
match_specific = 0;
}
}
- return match;
+ /* If we didn't find a match, but a default was specified at configure
+ time, return the default. */
+ if (GDB_OSABI_DEFAULT != GDB_OSABI_UNKNOWN && match == GDB_OSABI_UNKNOWN)
+ return GDB_OSABI_DEFAULT;
+ else
+ return match;
}
void
return osabi;
}
\f
+static void
+set_osabi (char *args, int from_tty, struct cmd_list_element *c)
+{
+ struct gdbarch_info info;
+ if (strcmp (set_osabi_string, "auto") == 0)
+ user_osabi_state = osabi_auto;
+ else if (strcmp (set_osabi_string, "default") == 0)
+ {
+ user_selected_osabi = GDB_OSABI_DEFAULT;
+ user_osabi_state = osabi_user;
+ }
+ else if (strcmp (set_osabi_string, "none") == 0)
+ {
+ user_selected_osabi = GDB_OSABI_UNKNOWN;
+ user_osabi_state = osabi_user;
+ }
+ else
+ {
+ int i;
+ for (i = 1; i < GDB_OSABI_INVALID; i++)
+ if (strcmp (set_osabi_string, gdbarch_osabi_name (i)) == 0)
+ {
+ user_selected_osabi = i;
+ user_osabi_state = osabi_user;
+ break;
+ }
+ if (i == GDB_OSABI_INVALID)
+ internal_error (__FILE__, __LINE__,
+ "Invalid OS ABI \"%s\" passed to command handler.",
+ set_osabi_string);
+ }
+
+ /* NOTE: At some point (true multiple architectures) we'll need to be more
+ graceful here. */
+ gdbarch_info_init (&info);
+ if (! gdbarch_update_p (info))
+ internal_error (__FILE__, __LINE__, "Updating OS ABI failed.");
+}
+
+void
+show_osabi (char *args, int from_tty)
+{
+ if (user_osabi_state == osabi_auto)
+ printf_filtered ("The current OS ABI is \"auto\" (currently \"%s\").\n",
+ gdbarch_osabi_name (gdbarch_osabi (current_gdbarch)));
+ else
+ printf_filtered ("The current OS ABI is \"%s\".\n",
+ gdbarch_osabi_name (user_selected_osabi));
+
+ if (GDB_OSABI_DEFAULT != GDB_OSABI_UNKNOWN)
+ printf_filtered ("The default OS ABI is \"%s\".\n",
+ gdbarch_osabi_name (GDB_OSABI_DEFAULT));
+}
+\f
void
_initialize_gdb_osabi (void)
{
+ struct cmd_list_element *c;
+
if (strcmp (gdb_osabi_names[GDB_OSABI_INVALID], "<invalid>") != 0)
internal_error
(__FILE__, __LINE__,
gdbarch_register_osabi_sniffer (bfd_arch_unknown,
bfd_target_elf_flavour,
generic_elf_osabi_sniffer);
+
+ if (!GDB_MULTI_ARCH)
+ return;
+
+ /* Register the "set osabi" command. */
+ c = add_set_enum_cmd ("osabi", class_support, gdb_osabi_available_names,
+ &set_osabi_string, "Set OS ABI of target.", &setlist);
+
+ set_cmd_sfunc (c, set_osabi);
+ add_cmd ("osabi", class_support, show_osabi, "Show OS/ABI of target.",
+ &showlist);
+ user_osabi_state = osabi_auto;
}
projects / binutils-gdb.git / commitdiff