X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fconfigure.ac;h=39246aab8250a36501c351604e7eaf19c89f3cbb;hb=92726479b279b23d62ba955388e58abc287ed9b0;hp=55e19c410c2c0110653cba9fd04514df818d4d98;hpb=7cb9022a1453bc12448303e0139a1814fd815d7b;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/configure.ac b/gdb/configure.ac index 55e19c410c..39246aab82 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -1,22 +1,22 @@ dnl Autoconf configure script for GDB, the GNU debugger. -dnl Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 +dnl Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +dnl 2005, 2006 dnl Free Software Foundation, Inc. dnl dnl This file is part of GDB. dnl dnl This program is free software; you can redistribute it and/or modify dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2 of the License, or +dnl the Free Software Foundation; either version 3 of the License, or dnl (at your option) any later version. -dnl +dnl dnl This program is distributed in the hope that it will be useful, dnl but WITHOUT ANY WARRANTY; without even the implied warranty of dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the dnl GNU General Public License for more details. -dnl +dnl dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +dnl along with this program. If not, see . dnl Process this file with autoconf to produce a configure script. @@ -34,14 +34,6 @@ AM_PROG_CC_STDC AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..) AC_CANONICAL_SYSTEM -# FIXME: kettenis/20030102: The AC_PROG_RANLIB from Autoconf 2.13 -# doesn't support cross-compilation, but the one from Autoconf 2.5x -# does. Override RANLIB here (i.e. before running AC_PROG_RANLIB) to -# deal with the lossage. Note that CY_GNU_GETTEXT currently calls -# AC_PROG_RANLIB. This can be removed when we switch to Autoconf -# 2.5x. -AC_CHECK_TOOL(RANLIB, ranlib, :) - dnl List of object files and targets accumulated by configure. CONFIG_OBS= @@ -54,49 +46,13 @@ CONFIG_CLEAN= CONFIG_INSTALL= CONFIG_UNINSTALL= -dnl Set up for gettext. PACKAGE is used when we call bindtextdomain. - -CY_GNU_GETTEXT +dnl Set up for gettext. +ZW_GNU_GETTEXT_SISTER_DIR localedir='${datadir}/locale' AC_SUBST(localedir) -if test "x$POSUB" != x; then - - dnl Lifted from GCC's config/gettext.m4. - AC_MSG_CHECKING(for catalogs to be installed) - # Look for .po and .gmo files in the source directory. - CATALOGS= AC_SUBST(CATALOGS) - XLINGUAS= - for cat in $srcdir/po/*.gmo $srcdir/po/*.po; do - # If there aren't any .gmo files the shell will give us the - # literal string "../path/to/srcdir/po/*.gmo" which has to be - # weeded out. - case "$cat" in *\**) - continue;; - esac - # The quadruple backslash is collapsed to a double backslash - # by the backticks, then collapsed again by the double quotes, - # leaving us with one backslash in the sed expression (right - # before the dot that mustn't act as a wildcard). - cat=`echo $cat | sed -e "s!$srcdir/!!" -e "s!\\\\.po!.gmo!"` - lang=`echo $cat | sed -e 's!po/!!' -e "s!\\\\.gmo!!"` - # The user is allowed to set LINGUAS to a list of languages to - # install catalogs for. If it's empty that means "all of them." - if test "x$LINGUAS" = x; then - CATALOGS="$CATALOGS $cat" - XLINGUAS="$XLINGUAS $lang" - else - case "$LINGUAS" in *$lang*) - CATALOGS="$CATALOGS $cat" - XLINGUAS="$XLINGUAS $lang" - ;; - esac - fi - done - LINGUAS="$XLINGUAS" - AC_MSG_RESULT($LINGUAS) - +if test x"$USE_NLS" = xyes; then CONFIG_ALL="$CONFIG_ALL all-po" CONFIG_CLEAN="$CONFIG_CLEAN clean-po" CONFIG_INSTALL="$CONFIG_INSTALL install-po" @@ -117,11 +73,123 @@ AC_DEFINE_DIR(DEBUGDIR, debugdir, [Global directory for separate debug files. ]) #AC_DEFINE_UNQUOTED(DEBUGDIR, "$debugdir"), +if test "x$exec_prefix" = xNONE || test "x$exec_prefix" = 'x${prefix}'; then + if test "x$prefix" = xNONE; then + test_prefix=/usr/local + else + test_prefix=$prefix + fi +else + test_prefix=$exec_prefix +fi +case ${debugdir} in +"${test_prefix}"|"${test_prefix}/"*|\ +'${exec_prefix}'|'${exec_prefix}/'*) + AC_DEFINE(DEBUGDIR_RELOCATABLE, 1, [Define if the debug directory should be relocated when GDB is moved.]) + ;; +esac + AC_CONFIG_SUBDIRS(doc testsuite) +# Check whether to support alternative target configurations +AC_ARG_ENABLE(targets, +[ --enable-targets alternative target configurations], +[case "${enableval}" in + yes | "") AC_ERROR(enable-targets option must specify target names or 'all') + ;; + no) enable_targets= ;; + *) enable_targets=$enableval ;; +esac]) + +# Check whether to enable 64-bit support on 32-bit hosts +AC_ARG_ENABLE(64-bit-bfd, +[ --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes)], +[case "${enableval}" in + yes) want64=true ;; + no) want64=false ;; + *) AC_MSG_ERROR(bad value ${enableval} for 64-bit-bfd option) ;; +esac],[want64=false])dnl + +# Provide defaults for some variables set by the per-host and per-target +# configuration. +gdb_host_obs=posix-hdep.o + +if test "${target}" = "${host}"; then + gdb_native=yes +else + gdb_native=no +fi + . $srcdir/configure.host -. $srcdir/configure.tgt +# Accumulate some settings from configure.tgt over all enabled targets + +TARGET_OBS= +all_targets= + +for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'` +do + if test "$targ_alias" = "all"; then + all_targets=true + else + # Canonicalize the secondary target names. + result=`$ac_config_sub $targ_alias 2>/dev/null` + if test -n "$result"; then + targ=$result + else + targ=$targ_alias + fi + + . ${srcdir}/configure.tgt + + # Target-specific object files + for i in ${gdb_target_obs}; do + case " $TARGET_OBS " in + *" ${i} "*) ;; + *) + TARGET_OBS="$TARGET_OBS ${i}" + ;; + esac + done + + # Check whether this target needs 64-bit CORE_ADDR + if test x${want64} = xfalse; then + . ${srcdir}/../bfd/config.bfd + fi + fi +done + +if test x${all_targets} = xtrue; then + + # We want all 64-bit targets if we either: + # - run on a 64-bit host or + # - already require 64-bit support for some other target or + # - the --enable-64-bit-bfd option was supplied + # Otherwise we only support all 32-bit targets. + # + # NOTE: This test must be in sync with the corresponding + # tests in BFD! + + if test x${want64} = xfalse; then + AC_CHECK_SIZEOF(long) + if test "x${ac_cv_sizeof_long}" = "x8"; then + want64=true + fi + fi + if test x${want64} = xtrue; then + TARGET_OBS='$(ALL_TARGET_OBS) $(ALL_64_TARGET_OBS)' + else + TARGET_OBS='$(ALL_TARGET_OBS)' + fi +fi + +AC_SUBST(TARGET_OBS) + +# For other settings, only the main target counts. +gdb_sim= +gdb_osabi= +build_gdbserver= +targ=$target; . ${srcdir}/configure.tgt # Fetch the default architecture and default target vector from BFD. targ=$target; . $srcdir/../bfd/config.bfd @@ -202,7 +270,7 @@ AC_ARG_ENABLE(gdbtk, *) AC_MSG_ERROR([bad value $enableval for --enable-gdbtk]) ;; esac], - [if test -d $srcdir/gdbtk; then + [if test -d $srcdir/gdbtk -a -d $srcdir/../itcl; then enable_gdbtk=yes else enable_gdbtk=no @@ -232,7 +300,7 @@ esac],[ if test x"$enable_libunwind" = xyes; then AC_CHECK_HEADERS(libunwind.h) AC_CHECK_HEADERS(libunwind-ia64.h) - AC_DEFINE(HAVE_LIBUNWIND, 1) + AC_DEFINE(HAVE_LIBUNWIND, 1, [Define if libunwind library is being used.]) CONFIG_OBS="$CONFIG_OBS libunwind-frame.o" CONFIG_DEPS="$CONFIG_DEPS libunwind-frame.o" CONFIG_SRCS="$CONFIG_SRCS libunwind-frame.c" @@ -260,6 +328,16 @@ if test $ac_cv_var__etext = yes; then AC_DEFINE(HAVE__ETEXT, 1, [Define to 1 if your system has the _etext variable. ]) fi +AC_CACHE_CHECK([for etext], ac_cv_var_etext, +[AC_TRY_LINK( +[#include +extern char etext; +], +[free (&etext);], ac_cv_var_etext=yes, ac_cv_var_etext=no)]) +if test $ac_cv_var_etext = yes; then + AC_DEFINE(HAVE_ETEXT, 1, + [Define to 1 if your system has the etext variable. ]) +fi if test "$enable_profiling" = yes ; then if test $ac_cv_func_monstartup = no || test $ac_cv_func__mcleanup = no; then AC_MSG_ERROR(--enable-profiling requires monstartup and _mcleanup) @@ -327,6 +405,9 @@ AC_SEARCH_LIBS(socketpair, socket) # a situation. AC_SEARCH_LIBS(waddstr, [ncurses cursesX curses]) +# On HP/UX we may need libxpdl for dlgetmodinfo (used by solib-pa64.c). +AC_SEARCH_LIBS(dlgetmodinfo, [dl xpdl]) + # Since GDB uses Readline, we need termcap functionality. In many # cases this will be provided by the curses library, but some systems # have a seperate termcap library, or no curses library at all. @@ -340,6 +421,10 @@ case $host_os in go32* | *djgpp*) ac_cv_search_tgetent="none required" ;; + *mingw32*) + ac_cv_search_tgetent="none required" + CONFIG_OBS="$CONFIG_OBS win32-termcap.o" + ;; esac # These are the libraries checked by Readline. @@ -349,6 +434,49 @@ if test "$ac_cv_search_tgetent" = no; then AC_MSG_ERROR([no termcap library found]) fi +AC_ARG_WITH([system-readline], + [AS_HELP_STRING([--with-system-readline], + [use installed readline library])]) + +if test "$with_system_readline" = yes; then + READLINE=-lreadline + READLINE_DEPS= + READLINE_CFLAGS= +else + READLINE='$(READLINE_DIR)/libreadline.a' + READLINE_DEPS='$(READLINE)' + READLINE_CFLAGS='-I$(READLINE_SRC)/..' +fi +AC_SUBST(READLINE) +AC_SUBST(READLINE_DEPS) +AC_SUBST(READLINE_CFLAGS) + +AC_ARG_WITH(expat, + AS_HELP_STRING([--with-expat], [include expat support (auto/yes/no)]), + [], [with_expat=auto]) +AC_MSG_CHECKING([whether to use expat]) +AC_MSG_RESULT([$with_expat]) + +if test "${with_expat}" = no; then + AC_MSG_WARN([expat support disabled; some features may be unavailable.]) + HAVE_LIBEXPAT=no +else + AC_LIB_HAVE_LINKFLAGS([expat], [], [#include "expat.h"], + [XML_Parser p = XML_ParserCreate (0);]) + if test "$HAVE_LIBEXPAT" != yes; then + if test "$with_expat" = yes; then + AC_MSG_ERROR([expat is missing or unusable]) + else + AC_MSG_WARN([expat is missing or unusable; some features may be unavailable.]) + fi + else + save_LIBS=$LIBS + LIBS="$LIBS $LIBEXPAT" + AC_CHECK_FUNCS(XML_StopParser) + LIBS=$save_LIBS + fi +fi + # ------------------------- # # Checks for header files. # # ------------------------- # @@ -368,6 +496,7 @@ AC_CHECK_HEADERS(link.h, [], [], AC_CHECK_HEADERS(machine/reg.h) AC_CHECK_HEADERS(poll.h sys/poll.h) AC_CHECK_HEADERS(proc_service.h thread_db.h gnu/libc-version.h) +AC_CHECK_HEADERS(signal.h) AC_CHECK_HEADERS(stddef.h) AC_CHECK_HEADERS(stdlib.h) AC_CHECK_HEADERS(stdint.h) @@ -377,6 +506,7 @@ AC_CHECK_HEADERS(sys/file.h) AC_CHECK_HEADERS(sys/filio.h) AC_CHECK_HEADERS(sys/ioctl.h) AC_CHECK_HEADERS(sys/param.h) +AC_CHECK_HEADERS(sys/resource.h) AC_CHECK_HEADERS(sys/proc.h, [], [], [#if HAVE_SYS_PARAM_H # include @@ -404,41 +534,53 @@ case $host_os in solaris2.[[789]]) if test "$GCC" = yes; then AC_DEFINE(_MSE_INT_H, 1, - [[Define to 1 to avoid a clash between and on - Solaris 2.[789] when using GCC. ]]) + [Define to 1 to avoid a clash between and on + Solaris 2.[789] when using GCC. ]) fi ;; esac AC_CHECK_HEADERS(curses.h cursesX.h ncurses.h ncurses/ncurses.h) -AC_CHECK_HEADERS(ncurses/term.h term.h) +AC_CHECK_HEADERS(ncurses/term.h) +AC_CHECK_HEADERS(term.h, [], [], +[#if HAVE_CURSES_H +# include +#endif +]) + +# Check for HP/UX 64-bit shared library support +AC_CHECK_HEADERS(elf_hp.h) # FIXME: kettenis/20030102: In most cases we include these # unconditionally, so what's the point in checking these? AC_CHECK_HEADERS(ctype.h time.h) -dnl Check for struct stat with an st_blocks member -AC_MSG_CHECKING(for member st_blocks in struct stat) -AC_CACHE_VAL(gdb_cv_have_struct_stat_with_st_blocks_member, - [AC_TRY_COMPILE([#include -#include ], - [struct stat st; (void) st.st_blocks;], - gdb_cv_have_struct_stat_with_st_blocks_member=yes, - gdb_cv_have_struct_stat_with_st_blocks_member=no)]) -AC_MSG_RESULT($gdb_cv_have_struct_stat_with_st_blocks_member) -if test $gdb_cv_have_struct_stat_with_st_blocks_member = yes; then - AC_DEFINE(HAVE_STRUCT_STAT_ST_BLOCKS) -fi +# Create a header we can use portably to get the standard integer types. +GCC_HEADER_STDINT(gdb_stdint.h) # ------------------------- # # Checks for declarations. # # ------------------------- # -gcc_AC_CHECK_DECLS(getopt) +AC_CHECK_DECLS([free, malloc, realloc]) +AC_CHECK_DECLS([strerror, strstr]) +AC_CHECK_DECLS([getopt, snprintf, vsnprintf]) + +# ----------------------- # +# Checks for structures. # +# ----------------------- # + +AC_CHECK_MEMBERS([struct stat.st_blocks]) +AC_CHECK_MEMBERS([struct stat.st_blksize]) # ------------------ # # Checks for types. # # ------------------ # AC_TYPE_SIGNAL +AC_CHECK_TYPES(socklen_t, [], [], +[#include +#include +]) +AC_CHECK_TYPES(uintptr_t, [], [], [#include ]) # ------------------------------------- # # Checks for compiler characteristics. # @@ -446,6 +588,7 @@ AC_TYPE_SIGNAL AC_C_CONST AC_C_INLINE +AC_C_BIGENDIAN # ------------------------------ # # Checks for library functions. # @@ -455,6 +598,8 @@ AC_FUNC_ALLOCA AC_FUNC_MMAP AC_FUNC_VFORK AC_CHECK_FUNCS(canonicalize_file_name realpath) +AC_CHECK_FUNCS(getrusage) +AC_CHECK_FUNCS(getuid getgid) AC_CHECK_FUNCS(poll) AC_CHECK_FUNCS(pread64) AC_CHECK_FUNCS(sbrk) @@ -479,7 +624,7 @@ gdb_ptrace_headers=' #endif ' # There is no point in checking if we don't have a prototype. -gcc_AC_CHECK_DECLS(ptrace, , [ +AC_CHECK_DECLS(ptrace, [], [ : ${gdb_cv_func_ptrace_ret='int'} : ${gdb_cv_func_ptrace_args='int,int,long,long'} ], $gdb_ptrace_headers) @@ -495,7 +640,7 @@ AC_DEFINE_UNQUOTED(PTRACE_TYPE_RET, $gdb_cv_func_ptrace_ret, AC_CACHE_CHECK([types of arguments for ptrace], gdb_cv_func_ptrace_args, [ for gdb_arg1 in 'int' 'long'; do for gdb_arg2 in 'pid_t' 'int' 'long'; do - for gdb_arg3 in 'int *' 'caddr_t' 'int' 'long'; do + for gdb_arg3 in 'int *' 'caddr_t' 'int' 'long' 'void *'; do for gdb_arg4 in 'int' 'long'; do AC_TRY_COMPILE($gdb_ptrace_headers, [ extern $gdb_cv_func_ptrace_ret @@ -589,15 +734,11 @@ if test "$gdb_with_regex" = yes; then [Define to 1 if the regex included in libiberty should be used.]) fi -# See if defines `struct thread' with a td_pcb member. -AC_CACHE_CHECK([for td_pcb in struct thread], gdb_cv_struct_thread_td_pcb, -[AC_TRY_COMPILE([#include -#include ], [struct thread td; td.td_pcb;], -gdb_cv_struct_thread_td_pcb=yes, gdb_cv_struct_thread_td_pcb=no)]) -if test $gdb_cv_struct_thread_td_pcb = yes; then - AC_DEFINE(HAVE_STRUCT_THREAD_TD_PCB, 1, - [Define to 1 if your system has td_pcb in struct thread.]) -fi +# Check if defines `struct thread' with a td_pcb member. +AC_CHECK_MEMBERS([struct thread.td_pcb], [], [], +[#include +#include +]) # See if defines `struct lwp`. AC_CACHE_CHECK([for struct lwp], gdb_cv_struct_lwp, @@ -621,18 +762,8 @@ fi # See if supports the %fs and %gs i386 segment registers. # Older i386 BSD's don't have the r_fs and r_gs members of `struct reg'. -AC_CACHE_CHECK([for r_fs in struct reg], gdb_cv_struct_reg_r_fs, -[AC_TRY_COMPILE([#include ], [struct reg r; r.r_fs;], -gdb_cv_struct_reg_r_fs=yes, gdb_cv_struct_reg_r_fs=no)]) -if test $gdb_cv_struct_reg_r_fs = yes; then - AC_DEFINE(HAVE_STRUCT_REG_R_FS) -fi -AC_CACHE_CHECK([for r_gs in struct reg], gdb_cv_struct_reg_r_gs, -[AC_TRY_COMPILE([#include ], [struct reg r; r.r_gs;], -gdb_cv_struct_reg_r_gs=yes, gdb_cv_struct_reg_r_gs=no)]) -if test $gdb_cv_struct_reg_r_gs = yes; then - AC_DEFINE(HAVE_STRUCT_REG_R_GS) -fi +AC_CHECK_MEMBERS([struct reg.r_fs, struct reg.r_gs], [], [], + [#include ]) # See if provides the PTRACE_GETREGS request. AC_MSG_CHECKING(for PTRACE_GETREGS) @@ -643,7 +774,8 @@ AC_CACHE_VAL(gdb_cv_have_ptrace_getregs, [gdb_cv_have_ptrace_getregs=no])]) AC_MSG_RESULT($gdb_cv_have_ptrace_getregs) if test $gdb_cv_have_ptrace_getregs = yes; then - AC_DEFINE(HAVE_PTRACE_GETREGS) + AC_DEFINE(HAVE_PTRACE_GETREGS, 1, + [Define if sys/ptrace.h defines the PTRACE_GETREGS request.]) fi # See if provides the PTRACE_GETFPXREGS request. @@ -655,7 +787,8 @@ AC_CACHE_VAL(gdb_cv_have_ptrace_getfpxregs, [gdb_cv_have_ptrace_getfpxregs=no])]) AC_MSG_RESULT($gdb_cv_have_ptrace_getfpxregs) if test $gdb_cv_have_ptrace_getfpxregs = yes; then - AC_DEFINE(HAVE_PTRACE_GETFPXREGS) + AC_DEFINE(HAVE_PTRACE_GETFPXREGS, 1, + [Define if sys/ptrace.h defines the PTRACE_GETFPXREGS request.]) fi # See if provides the PT_GETDBREGS request. @@ -668,7 +801,8 @@ AC_CACHE_VAL(gdb_cv_have_pt_getdbregs, [gdb_cv_have_pt_getdbregs=no])]) AC_MSG_RESULT($gdb_cv_have_pt_getdbregs) if test $gdb_cv_have_pt_getdbregs = yes; then - AC_DEFINE(HAVE_PT_GETDBREGS) + AC_DEFINE(HAVE_PT_GETDBREGS, 1, + [Define if sys/ptrace.h defines the PT_GETDBREGS request.]) fi # See if provides the PT_GETXMMREGS request. @@ -681,71 +815,29 @@ AC_CACHE_VAL(gdb_cv_have_pt_getxmmregs, [gdb_cv_have_pt_getxmmregs=no])]) AC_MSG_RESULT($gdb_cv_have_pt_getxmmregs) if test $gdb_cv_have_pt_getxmmregs = yes; then - AC_DEFINE(HAVE_PT_GETXMMREGS) -fi - -# See if stdint.h provides the uintptr_t type. -# Autoconf 2.5X has an improved AC_CHECK_TYPE which will simplify this. -AC_CACHE_CHECK([for uintptr_t in stdint.h], gdb_cv_have_uintptr_t, - [AC_TRY_COMPILE( - [#include ], - [uintptr_t foo = 0;], - gdb_cv_have_uintptr_t=yes, - gdb_cv_have_uintptr_t=no)]) -if test $gdb_cv_have_uintptr_t = yes; then - AC_DEFINE(HAVE_UINTPTR_T, 1, [Define if provides the uintptr_t type.]) + AC_DEFINE(HAVE_PT_GETXMMREGS, 1, + [Define if sys/ptrace.h defines the PT_GETXMMREGS request.]) fi -BFD_NEED_DECLARATION(malloc) -BFD_NEED_DECLARATION(realloc) -BFD_NEED_DECLARATION(free) -BFD_NEED_DECLARATION(strerror) -BFD_NEED_DECLARATION(strdup) -BFD_NEED_DECLARATION(strstr) -BFD_NEED_DECLARATION(canonicalize_file_name) - -# The following save_state_t checkery is only necessary for HPUX -# versions earlier than 10.20. When those fade from memory, this -# could be expunged. --jsm 1999-03-22 - -AC_MSG_CHECKING(for HPUX save_state structure) -AC_EGREP_HEADER(save_state_t, machine/save_state.h, - gdb_cv_hpux_savestate=yes, gdb_cv_hpux_savestate=no) -AC_EGREP_HEADER(ss_wide, machine/save_state.h, gdb_cv_hpux_sswide=yes, - gdb_cv_hpux_sswide=no) -if test $gdb_cv_hpux_savestate = yes -then - AC_DEFINE(HAVE_STRUCT_SAVE_STATE_T, 1) -fi -if test $gdb_cv_hpux_sswide = yes -then - AC_DEFINE(HAVE_STRUCT_MEMBER_SS_WIDE, 1) -fi -AC_MSG_RESULT($gdb_cv_hpux_sswide) - - -# If we are configured native on GNU/Linux, work around problems with -# sys/procfs.h -# Also detect which type of /proc is in use, such as for Unixware or Solaris. +# Detect which type of /proc is in use, such as for Unixware or Solaris. if test "${target}" = "${host}"; then case "${host}" in - i[[3456]]86-*-linux*) - AC_DEFINE(START_INFERIOR_TRAPS_EXPECTED,2) - AC_DEFINE(sys_quotactl) - ;; - ia64-*-aix*) - AC_DEFINE(NEW_PROC_API) - ;; *-*-unixware* | *-*-sysv4.2* | *-*-sysv5* | *-*-interix* ) - AC_DEFINE(NEW_PROC_API) + AC_DEFINE(NEW_PROC_API, 1, + [Define if you want to use new multi-fd /proc interface + (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros).]) ;; - *-*-solaris2.[[6789]] | *-*-solaris2.1[[0-9]]) - AC_DEFINE(NEW_PROC_API) + *-*-solaris2.[[6789]] | *-*-solaris2.1[[0-9]]*) + AC_DEFINE(NEW_PROC_API, 1, + [Define if you want to use new multi-fd /proc interface + (replaces HAVE_MULTIPLE_PROC_FDS as well as other macros).]) ;; mips-sgi-irix5*) # Work around needing _KMEMUSER problem on IRIX 5. - AC_DEFINE([_KMEMUSER], 1) + AC_DEFINE([_KMEMUSER], 1, + [Define to 1 so gets a definition of anon_hdl. Works + around a problem on IRIX 5.]) ;; esac fi @@ -789,7 +881,8 @@ if test "$ac_cv_header_sys_procfs_h" = yes; then gdb_cv_prfpregset_t_broken=yes)]) AC_MSG_RESULT($gdb_cv_prfpregset_t_broken) if test $gdb_cv_prfpregset_t_broken = yes; then - AC_DEFINE(PRFPREGSET_T_BROKEN) + AC_DEFINE(PRFPREGSET_T_BROKEN, 1, + [Define if the prfpregset_t type is broken.]) fi fi @@ -807,7 +900,8 @@ if test "$ac_cv_header_sys_procfs_h" = yes; then gdb_cv_have_procfs_piocset=yes, gdb_cv_have_procfs_piocset=no)]) AC_MSG_RESULT($gdb_cv_have_procfs_piocset) if test $gdb_cv_have_procfs_piocset = yes; then - AC_DEFINE(HAVE_PROCFS_PIOCSET) + AC_DEFINE(HAVE_PROCFS_PIOCSET, 1, + [Define if ioctl argument PIOCSET is available.]) fi fi @@ -825,7 +919,10 @@ if test ${host} = ${target} ; then gdb_cv_have_struct_link_map_with_l_members=no)]) AC_MSG_RESULT($gdb_cv_have_struct_link_map_with_l_members) if test $gdb_cv_have_struct_link_map_with_l_members = yes; then - AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS) + AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_L_MEMBERS,1, + [Define if exists and defines struct link_map which has + members with an ``l_'' prefix. (For Solaris, SVR4, and + SVR4-like systems.)]) fi dnl Check for struct link_map with lm_ members which are indicative @@ -840,7 +937,9 @@ if test ${host} = ${target} ; then gdb_cv_have_struct_link_map_with_lm_members=no)]) AC_MSG_RESULT($gdb_cv_have_struct_link_map_with_lm_members) if test $gdb_cv_have_struct_link_map_with_lm_members = yes; then - AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS) + AC_DEFINE(HAVE_STRUCT_LINK_MAP_WITH_LM_MEMBERS, 1, + [Define if exists and defines struct link_map which has + members with an ``lm_'' prefix. (For SunOS.)]) fi dnl Check for struct so_map with som_ members which are found on @@ -858,7 +957,9 @@ if test ${host} = ${target} ; then gdb_cv_have_struct_so_map_with_som_members=no)]) AC_MSG_RESULT($gdb_cv_have_struct_so_map_with_som_members) if test $gdb_cv_have_struct_so_map_with_som_members = yes; then - AC_DEFINE(HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS) + AC_DEFINE(HAVE_STRUCT_SO_MAP_WITH_SOM_MEMBERS, 1, + [Define if exists and defines a struct so_map which has + members with an ``som_'' prefix. (Found on older *BSD systems.)]) fi dnl Check for struct link_map32 type, which allows a 64-bit Solaris @@ -872,98 +973,114 @@ if test ${host} = ${target} ; then gdb_cv_have_struct_link_map32=no)]) AC_MSG_RESULT($gdb_cv_have_struct_link_map32) if test $gdb_cv_have_struct_link_map32 = yes; then - AC_DEFINE(HAVE_STRUCT_LINK_MAP32) - AC_DEFINE(_SYSCALL32) + AC_DEFINE(HAVE_STRUCT_LINK_MAP32, 1, + [Define if has struct link_map32]) + AC_DEFINE(_SYSCALL32, 1, + [Define if has link_map32 (solaris sparc-64 target)]) fi fi -dnl See if compiler supports "long long" type. +# Check if the compiler supports the `long long' type. -AC_MSG_CHECKING(for long long support in compiler) -AC_CACHE_VAL(gdb_cv_c_long_long, -[AC_TRY_COMPILE(, [ - extern long long foo; - switch (foo & 2) { case 0: return 1; } -], -gdb_cv_c_long_long=yes, gdb_cv_c_long_long=no)]) -AC_MSG_RESULT($gdb_cv_c_long_long) +AC_CACHE_CHECK([for long long support in compiler], gdb_cv_c_long_long, + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM( +[[extern long long foo;]], +[[switch (foo & 2) { case 0: return 1; }]])], + gdb_cv_c_long_long=yes, + gdb_cv_c_long_long=no)]) if test $gdb_cv_c_long_long = yes; then - AC_DEFINE(CC_HAS_LONG_LONG) + AC_DEFINE(CC_HAS_LONG_LONG, 1, + [Define to 1 if the compiler supports long long.]) fi -dnl See if the compiler and runtime support printing long long +# Check if the compiler and runtime support printing long longs. -AC_MSG_CHECKING(for long long support in printf) -AC_CACHE_VAL(gdb_cv_printf_has_long_long, -[AC_TRY_RUN([ -int main () { - char buf[32]; +AC_CACHE_CHECK([for long long support in printf], + gdb_cv_printf_has_long_long, + [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], +[[char buf[32]; long long l = 0; l = (l << 16) + 0x0123; l = (l << 16) + 0x4567; l = (l << 16) + 0x89ab; l = (l << 16) + 0xcdef; sprintf (buf, "0x%016llx", l); - return (strcmp ("0x0123456789abcdef", buf)); -}], -gdb_cv_printf_has_long_long=yes, -gdb_cv_printf_has_long_long=no, -gdb_cv_printf_has_long_long=no)]) + return (strcmp ("0x0123456789abcdef", buf));]])], + gdb_cv_printf_has_long_long=yes, + gdb_cv_printf_has_long_long=no, + gdb_cv_printf_has_long_long=no)]) if test $gdb_cv_printf_has_long_long = yes; then - AC_DEFINE(PRINTF_HAS_LONG_LONG) + AC_DEFINE(PRINTF_HAS_LONG_LONG, 1, + [Define to 1 if the "%ll" format works to print long longs.]) fi -AC_MSG_RESULT($gdb_cv_printf_has_long_long) - -dnl See if compiler supports "long double" type. Can't use AC_C_LONG_DOUBLE -dnl because autoconf complains about cross-compilation issues. However, this -dnl code uses the same variables as the macro for compatibility. - -AC_MSG_CHECKING(for long double support in compiler) -AC_CACHE_VAL(ac_cv_c_long_double, -[AC_TRY_COMPILE(, [long double foo;], -ac_cv_c_long_double=yes, ac_cv_c_long_double=no)]) -AC_MSG_RESULT($ac_cv_c_long_double) -if test $ac_cv_c_long_double = yes; then - AC_DEFINE(HAVE_LONG_DOUBLE) + +# Check if the compiler and runtime support printing decfloats. + +AC_CACHE_CHECK([for decfloat support in printf], + gdb_cv_printf_has_decfloat, + [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], +[[char buf[64]; + _Decimal32 d32 = 1.2345df; + _Decimal64 d64 = 1.2345dd; + _Decimal128 d128 = 1.2345dl; + sprintf (buf, "Decimal32: %H\nDecimal64: %D\nDecimal128: %DD", d32, d64, d128); + return (strcmp ("Decimal32: 1.2345\nDecimal64: 1.2345\nDecimal128: 1.2345", buf));]])], + gdb_cv_printf_has_decfloat=yes, + gdb_cv_printf_has_decfloat=no, + gdb_cv_printf_has_decfloat=no)]) +if test $gdb_cv_printf_has_decfloat = yes; then + AC_DEFINE(PRINTF_HAS_DECFLOAT, 1, + [Define to 1 if the "%H, %D and %DD" formats work to print decfloats.]) fi -dnl See if the compiler and runtime support printing long doubles +# Check if the compiler supports the `long double' type. We can't use +# AC_C_LONG_DOUBLE because that one does additional checks on the +# constants defined in that fail on some systems, +# e.g. FreeBSD/i386 4.7 and OpenBSD/i386 3.6. + +AC_CACHE_CHECK([for long double support in compiler], gdb_cv_c_long_double, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([[long double foo;]])], + gdb_cv_c_long_double=yes, + gdb_cv_c_long_double=no)]) +if test $gdb_cv_c_long_double = yes; then + AC_DEFINE(HAVE_LONG_DOUBLE, 1, + [Define to 1 if the compiler supports long double.]) +fi -AC_MSG_CHECKING(for long double support in printf) -AC_CACHE_VAL(gdb_cv_printf_has_long_double, -[AC_TRY_RUN([ -int main () { - char buf[16]; +# Check if the compiler and runtime support printing long doubles. + +AC_CACHE_CHECK([for long double support in printf], + gdb_cv_printf_has_long_double, + [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], +[[char buf[16]; long double f = 3.141592653; sprintf (buf, "%Lg", f); - return (strncmp ("3.14159", buf, 7)); -}], -gdb_cv_printf_has_long_double=yes, -gdb_cv_printf_has_long_double=no, -gdb_cv_printf_has_long_double=no)]) + return (strncmp ("3.14159", buf, 7));]])], + gdb_cv_printf_has_long_double=yes, + gdb_cv_printf_has_long_double=no, + gdb_cv_printf_has_long_double=no)]) if test $gdb_cv_printf_has_long_double = yes; then - AC_DEFINE(PRINTF_HAS_LONG_DOUBLE) + AC_DEFINE(PRINTF_HAS_LONG_DOUBLE, 1, + [Define to 1 if the "%Lg" format works to print long doubles.]) fi -AC_MSG_RESULT($gdb_cv_printf_has_long_double) -dnl See if the compiler and runtime support scanning long doubles +# Check if the compiler and runtime support scanning long doubles. -AC_MSG_CHECKING(for long double support in scanf) -AC_CACHE_VAL(gdb_cv_scanf_has_long_double, -[AC_TRY_RUN([ -int main () { - char *buf = "3.141592653"; +AC_CACHE_CHECK([for long double support in scanf], + gdb_cv_scanf_has_long_double, + [AC_RUN_IFELSE([AC_LANG_PROGRAM( +[[#include ]], +[[char *buf = "3.141592653"; long double f = 0; sscanf (buf, "%Lg", &f); - return !(f > 3.14159 && f < 3.14160); -}], -gdb_cv_scanf_has_long_double=yes, -gdb_cv_scanf_has_long_double=no, -gdb_cv_scanf_has_long_double=no)]) + return !(f > 3.14159 && f < 3.14160);]])], + gdb_cv_scanf_has_long_double=yes, + gdb_cv_scanf_has_long_double=no, + gdb_cv_scanf_has_long_double=no)]) if test $gdb_cv_scanf_has_long_double = yes; then - AC_DEFINE(SCANF_HAS_LONG_DOUBLE) + AC_DEFINE(SCANF_HAS_LONG_DOUBLE, 1, + [Define to 1 if the "%Lg" format works to scan long doubles.]) fi -AC_MSG_RESULT($gdb_cv_scanf_has_long_double) case ${host_os} in aix*) @@ -997,7 +1114,8 @@ if test ${build} = ${host} -a ${host} = ${target} ; then if test -f /usr/include/dce/cma_config.h ; then if test "$GCC" = "yes" ; then AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_HPUX_THREAD_SUPPORT) + AC_DEFINE(HAVE_HPUX_THREAD_SUPPORT, 1, + [Define if you have HPUX threads]) CONFIG_OBS="${CONFIG_OBS} hpux-thread.o" CONFIG_SRCS="${CONFIG_SRCS} hpux-thread.c" else @@ -1015,7 +1133,8 @@ if test ${build} = ${host} -a ${host} = ${target} ; then AC_MSG_CHECKING(for Solaris thread debugging library) if test -f /usr/lib/libthread_db.so.1 ; then AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_THREAD_DB_LIB) + AC_DEFINE(HAVE_THREAD_DB_LIB, 1, + [Define if using Solaris thread debugging.]) CONFIG_OBS="${CONFIG_OBS} sol-thread.o" CONFIG_SRCS="${CONFIG_SRCS} sol-thread.c" AC_CHECK_LIB(dl, dlopen) @@ -1045,7 +1164,9 @@ if test ${build} = ${host} -a ${host} = ${target} ; then ]) AC_MSG_RESULT($gdb_cv_proc_service_is_old) if test $gdb_cv_proc_service_is_old = yes; then - AC_DEFINE(PROC_SERVICE_IS_OLD) + AC_DEFINE(PROC_SERVICE_IS_OLD, 1, + [Define if on solaris uses int instead of + size_t, and assorted other type changes.]) fi else AC_MSG_RESULT(no) @@ -1071,7 +1192,8 @@ if test ${build} = ${host} -a ${host} = ${target} ; then AC_SUBST(CONFIG_LDFLAGS) fi -dnl See if we have a thread_db header file that has TD_NOTALLOC. +dnl See if we have a thread_db header file that has TD_NOTALLOC and +dnl other error codes. if test "x$ac_cv_header_thread_db_h" = "xyes"; then AC_CACHE_CHECK([whether has TD_NOTALLOC], gdb_cv_thread_db_h_has_td_notalloc, @@ -1082,11 +1204,37 @@ if test "x$ac_cv_header_thread_db_h" = "xyes"; then gdb_cv_thread_db_h_has_td_notalloc=no ) ) + AC_CACHE_CHECK([whether has TD_VERSION], + gdb_cv_thread_db_h_has_td_version, + AC_TRY_COMPILE( + [#include ], + [int i = TD_VERSION;], + gdb_cv_thread_db_h_has_td_version=yes, + gdb_cv_thread_db_h_has_td_version=no + ) + ) + AC_CACHE_CHECK([whether has TD_NOTLS], + gdb_cv_thread_db_h_has_td_notls, + AC_TRY_COMPILE( + [#include ], + [int i = TD_NOTLS;], + gdb_cv_thread_db_h_has_td_notls=yes, + gdb_cv_thread_db_h_has_td_notls=no + ) + ) fi if test "x$gdb_cv_thread_db_h_has_td_notalloc" = "xyes"; then AC_DEFINE(THREAD_DB_HAS_TD_NOTALLOC, 1, [Define if has the TD_NOTALLOC error code.]) fi +if test "x$gdb_cv_thread_db_h_has_td_version" = "xyes"; then + AC_DEFINE(THREAD_DB_HAS_TD_VERSION, 1, + [Define if has the TD_VERSION error code.]) +fi +if test "x$gdb_cv_thread_db_h_has_td_notls" = "xyes"; then + AC_DEFINE(THREAD_DB_HAS_TD_NOTLS, 1, + [Define if has the TD_NOTLS error code.]) +fi dnl See if we have a sys/syscall header file that has __NR_tkill. if test "x$ac_cv_header_sys_syscall_h" = "xyes"; then @@ -1102,8 +1250,7 @@ if test "x$ac_cv_header_sys_syscall_h" = "xyes"; then fi dnl See if we can issue tkill syscall. if test "x$gdb_cv_sys_syscall_h_has_tkill" = "xyes" && test "x$ac_cv_func_syscall" = "xyes"; then - AC_DEFINE(HAVE_TKILL_SYSCALL, 1, - [Define if we can use the tkill syscall.]) + AC_DEFINE(HAVE_TKILL_SYSCALL, 1, [Define if you support the tkill syscall.]) fi dnl Handle optional features that can be enabled. @@ -1118,17 +1265,20 @@ AC_ARG_WITH(sysroot, TARGET_SYSTEM_ROOT_DEFINE='-DTARGET_SYSTEM_ROOT=\"$(TARGET_SYSTEM_ROOT)\"' - if test "x$exec_prefix" = xNONE; then - if test "x$prefix" = xNONE; then - test_prefix=/usr/local - else - test_prefix=$prefix - fi + if test "x$prefix" = xNONE; then + test_prefix=/usr/local else - test_prefix=$exec_prefix + test_prefix=$prefix + fi + if test "x$exec_prefix" = xNONE || test "x$exec_prefix" = 'x${prefix}'; then + test_exec_prefix=$test_prefix + else + test_exec_prefix=$exec_prefix fi case ${TARGET_SYSTEM_ROOT} in "${test_prefix}"|"${test_prefix}/"*|\ + "${test_exec_prefix}"|"${test_exec_prefix}/"*|\ + '${prefix}'|'${prefix}/'*|\ '${exec_prefix}'|'${exec_prefix}/'*) t="$TARGET_SYSTEM_ROOT_DEFINE -DTARGET_SYSTEM_ROOT_RELOCATABLE" TARGET_SYSTEM_ROOT_DEFINE="$t" @@ -1141,19 +1291,33 @@ AC_ARG_WITH(sysroot, AC_SUBST(TARGET_SYSTEM_ROOT) AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) -# NOTE: Don't add -Wall or -Wunused, they both include -# -Wunused-parameter which reports bogus warnings. -# NOTE: If you add to this list, remember to update +AC_ARG_ENABLE(werror, + [ --enable-werror treat compile warnings as errors], + [case "${enableval}" in + yes | y) ERROR_ON_WARNING="yes" ;; + no | n) ERROR_ON_WARNING="no" ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-werror) ;; + esac]) + +# Enable -Werror by default when using gcc +if test "${GCC}" = yes -a -z "${ERROR_ON_WARNING}" ; then + ERROR_ON_WARNING=yes +fi + +WERROR_CFLAGS="" +if test "${ERROR_ON_WARNING}" = yes ; then + WERROR_CFLAGS="-Werror" +fi + +# The entries after -Wno-pointer-sign are disabled warnings which may +# be enabled in the future, which can not currently be used to build +# GDB. +# NOTE: If you change this list, remember to update # gdb/doc/gdbint.texinfo. -build_warnings="-Wimplicit -Wreturn-type -Wcomment -Wtrigraphs \ --Wformat -Wparentheses -Wpointer-arith -Wuninitialized -Wformat-nonliteral \ --Wunused-label -Wunused-function" -# Up for debate: -Wswitch -Wcomment -trigraphs -Wtrigraphs -# -Wunused-function -Wunused-variable -Wunused-value -# -Wchar-subscripts -Wtraditional -Wshadow -Wcast-qual -# -Wcast-align -Wwrite-strings -Wconversion -Wstrict-prototypes -# -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -# -Woverloaded-virtual -Winline -Werror" +build_warnings="-Wall -Wdeclaration-after-statement -Wpointer-arith \ +-Wformat-nonliteral -Wno-pointer-sign \ +-Wno-unused -Wno-switch -Wno-char-subscripts" + AC_ARG_ENABLE(build-warnings, [ --enable-build-warnings Enable build-time compiler warnings if gcc is used], [case "${enableval}" in @@ -1183,7 +1347,6 @@ if test x"$silent" != x"yes" && test x"$build_warnings" != x""; then echo "Setting GDB specific compiler warning flags = $build_warnings" 6>&1 fi])dnl WARN_CFLAGS="" -WERROR_CFLAGS="" if test "x${build_warnings}" != x -a "x$GCC" = xyes then AC_MSG_CHECKING(compiler warning flags) @@ -1199,7 +1362,7 @@ then CFLAGS="$saved_CFLAGS" esac done - AC_MSG_RESULT(${WARN_CFLAGS}${WERROR_CFLAGS}) + AC_MSG_RESULT(${WARN_CFLAGS} ${WERROR_CFLAGS}) fi AC_SUBST(WARN_CFLAGS) AC_SUBST(WERROR_CFLAGS) @@ -1213,10 +1376,11 @@ lose dnl Figure out which of the many generic ser-*.c files the _host_ supports. -SER_HARDWIRE="ser-unix.o ser-pipe.o ser-tcp.o" +SER_HARDWIRE="ser-base.o ser-unix.o ser-pipe.o ser-tcp.o" case ${host} in *go32* ) SER_HARDWIRE=ser-go32.o ;; *djgpp* ) SER_HARDWIRE=ser-go32.o ;; + *mingw32*) SER_HARDWIRE="ser-base.o ser-tcp.o ser-mingw.o" ;; esac AC_SUBST(SER_HARDWIRE) @@ -1229,8 +1393,48 @@ if test x$gdb_cv_os_cygwin = xyes; then ;; esac fi + +# The ser-tcp.c module requires sockets. +case ${host} in + *mingw32*) + AC_DEFINE(USE_WIN32API, 1, + [Define if we should use the Windows API, instead of the + POSIX API. On Windows, we use the Windows API when + building for MinGW, but the POSIX API when building + for Cygwin.]) + WIN32LIBS="$WIN32LIBS -lws2_32" + ;; +esac AC_SUBST(WIN32LIBS) +# Add ELF support to GDB, but only if BFD includes ELF support. +OLD_CFLAGS=$CFLAGS +OLD_LDFLAGS=$LDFLAGS +OLD_LIBS=$LIBS +CFLAGS="$CFLAGS -I${srcdir}/../include -I../bfd -I${srcdir}/../bfd" +LDFLAGS="$LDFLAGS -L../bfd -L../libiberty" +intl=`echo $LIBINTL | sed 's,${top_builddir}/,,g'` +LIBS="$LIBS -lbfd -liberty $intl" +AC_CACHE_CHECK([for ELF support in BFD], gdb_cv_var_elf, +[AC_TRY_LINK( +[#include +#include "bfd.h" +#include "elf-bfd.h" +], +[bfd *abfd = NULL; bfd_get_elf_phdr_upper_bound (abfd); ], +gdb_cv_var_elf=yes, gdb_cv_var_elf=no)]) +if test $gdb_cv_var_elf = yes; then + CONFIG_OBS="$CONFIG_OBS elfread.o" + AC_DEFINE(HAVE_ELF, 1, + [Define if ELF support should be included.]) +fi +CFLAGS=$OLD_CFLAGS +LDFLAGS=$OLD_LDFLAGS +LIBS=$OLD_LIBS + +# Add any host-specific objects to GDB. +CONFIG_OBS="${CONFIG_OBS} ${gdb_host_obs}" + LIBGUI="../libgui/src/libgui.a" GUI_CFLAGS_X="-I${srcdir}/../libgui/src" AC_SUBST(LIBGUI) @@ -1307,15 +1511,6 @@ if test "${enable_gdbtk}" = "yes"; then fi ENABLE_CFLAGS="${ENABLE_CFLAGS} \$(SUBDIR_GDBTK_CFLAGS)" - # Tcl/Tk 8.1 require -fwritable strings. I don't - # know whether 8.2 will or not, but I bet it will. - # I don't have to worry about 7.x since we don't support it. - GDBTK_CFLAGS="" - if test "$GCC" = "yes"; then - if test "$TCL_VERSION" != "8.0" ; then - GDBTK_CFLAGS="-fwritable-strings" - fi - fi # Include some libraries that Tcl and Tk want. TCL_LIBS='$(LIBGUI) $(ITCL) $(ITK) $(TK) $(TCL) $(X11_LDFLAGS) $(X11_LIBS)' @@ -1381,7 +1576,7 @@ if test x"$enable_tui" = xyes; then fi # Unlike the sim directory, whether a simulator is linked is controlled by -# presence of a SIM= and a SIM_OBS= definition in the target '.mt' file. +# presence of a gdb_sim definition in the target configure.tgt entry. # This code just checks for a few cases where we'd like to ignore those # definitions, even when they're present in the '.mt' file. These cases # are when --disable-sim is specified, or if the simulator directory is @@ -1402,16 +1597,17 @@ if test ! -d "${srcdir}/../sim"; then ignore_sim=true fi -if test "${ignore_sim}" = "true"; then - IGNORE_SIM="SIM=" - IGNORE_SIM_OBS="SIM_OBS=" -else - IGNORE_SIM="" - IGNORE_SIM_OBS="" - AC_DEFINE(WITH_SIM) +SIM= +SIM_OBS= +if test "${ignore_sim}" = "false"; then + if test x"${gdb_sim}" != x ; then + SIM="${gdb_sim}" + SIM_OBS="remote-sim.o" + AC_DEFINE(WITH_SIM, 1, [Define if the simulator is being linked in.]) + fi fi -AC_SUBST(IGNORE_SIM) -AC_SUBST(IGNORE_SIM_OBS) +AC_SUBST(SIM) +AC_SUBST(SIM_OBS) AC_SUBST(ENABLE_CFLAGS) AC_SUBST(PROFILE_CFLAGS) @@ -1437,7 +1633,7 @@ fi AC_SUBST(target_subdir) frags= -if test "${target}" = "${host}"; then +if test "${gdb_native}" = "yes"; then host_makefile_frag=${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh if test ! -f ${host_makefile_frag}; then AC_MSG_ERROR("*** Gdb does not support native target ${host}") @@ -1447,26 +1643,11 @@ else host_makefile_frag=/dev/null fi -target_makefile_frag=${srcdir}/config/${gdb_target_cpu}/${gdb_target}.mt -if test ! -f ${target_makefile_frag}; then - AC_MSG_ERROR("*** Gdb does not support target ${target}") -fi -frags="$frags $target_makefile_frag" - AC_SUBST_FILE(host_makefile_frag) -AC_SUBST_FILE(target_makefile_frag) AC_SUBST(frags) changequote(,)dnl -hostfile=`sed -n ' -s/XM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p -' ${host_makefile_frag}` - -targetfile=`sed -n ' -s/DEPRECATED_TM_FILE[ ]*=[ ]*\([^ ]*\)/\1/p -' ${target_makefile_frag}` - -if test "${target}" = "${host}"; then +if test "${gdb_native}" = "yes"; then # We pick this up from the host configuration file (.mh) because we # do not have a native configuration Makefile fragment. nativefile=`sed -n ' @@ -1492,8 +1673,8 @@ if test "x$enable_multi_ice" = xyes; then AC_CONFIG_SUBDIRS(multi-ice) fi -# We only build gdbserver automatically if host and target are the same. -if test "x$target" = "x$host"; then +# We only build gdbserver automatically in a native configuration. +if test "$gdb_native" = "yes"; then AC_MSG_CHECKING(whether gdbserver is supported on this host) if test "x$build_gdbserver" = xyes; then AC_MSG_RESULT(yes) @@ -1503,41 +1684,12 @@ if test "x$target" = "x$host"; then fi fi -# If hostfile (XM_FILE) and/or targetfile (DEPRECATED_TM_FILE) and/or -# nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link +# If nativefile (NAT_FILE) is not set in config/*/*.m[ht] files, we link # to an empty version. files= links= -rm -f xm.h -xm_h="" -if test "${hostfile}" != ""; then - xm_h=xm.h - case "${hostfile}" in - xm-*.h ) GDB_XM_FILE="config/${gdb_host_cpu}/${hostfile}" ;; - * ) GDB_XM_FILE="${hostfile}" - esac - files="${files} ${GDB_XM_FILE}" - links="${links} xm.h" - AC_DEFINE_UNQUOTED(GDB_XM_FILE, "${GDB_XM_FILE}") -fi -AC_SUBST(xm_h) - -rm -f tm.h -tm_h="" -if test "${targetfile}" != ""; then - tm_h=tm.h - case "${targetfile}" in - tm-*.h ) GDB_TM_FILE="config/${gdb_target_cpu}/${targetfile}" ;; - * ) GDB_TM_FILE="${targetfile}" - esac - files="${files} ${GDB_TM_FILE}" - links="${links} tm.h" - AC_DEFINE_UNQUOTED(GDB_TM_FILE, "${GDB_TM_FILE}") -fi -AC_SUBST(tm_h) - rm -f nm.h nm_h="" if test "${nativefile}" != ""; then @@ -1548,7 +1700,7 @@ if test "${nativefile}" != ""; then esac files="${files} ${GDB_NM_FILE}" links="${links} nm.h" - AC_DEFINE_UNQUOTED(GDB_NM_FILE, "${GDB_NM_FILE}") + AC_DEFINE_UNQUOTED(GDB_NM_FILE, "${GDB_NM_FILE}", [nativefile]) fi AC_SUBST(nm_h) @@ -1576,9 +1728,7 @@ dnl provided by makefile fragments. dnl changequote(,)dnl -sed -e '/^DEPRECATED_TM_FILE[ ]*=/s,^DEPRECATED_TM_FILE[ ]*=[ ]*,&config/'"${gdb_target_cpu}"'/, -/^XM_FILE[ ]*=/s,^XM_FILE[ ]*=[ ]*,&config/'"${gdb_host_cpu}"'/, -/^NAT_FILE[ ]*=/s,^NAT_FILE[ ]*=[ ]*,&config/'"${gdb_host_cpu}"'/,' Makefile.tmp +sed -e '/^NAT_FILE[ ]*=/s,^NAT_FILE[ ]*=[ ]*,&config/'"${gdb_host_cpu}"'/,' Makefile.tmp mv -f Makefile.tmp Makefile changequote([,])dnl @@ -1590,7 +1740,6 @@ esac ], [ gdb_host_cpu=$gdb_host_cpu -gdb_target_cpu=$gdb_target_cpu nativefile=$nativefile ])