From 13ba8b69271683f5cc4c723a6dbd1070b9aa671f Mon Sep 17 00:00:00 2001 From: Michael Meissner Date: Fri, 25 Aug 1995 16:05:32 +0000 Subject: [PATCH] Only build PowerPC simulator if target is powerpc*-*-eabisim --- gdb/ChangeLog | 9 +++++ gdb/config/powerpc/.Sanitize | 4 ++ gdb/config/powerpc/ppcle-eabi.mt | 3 -- gdb/config/powerpc/ppcle-sim.mt | 6 +++ gdb/config/powerpc/tm-ppc-sim.h | 26 +++++++++++++ gdb/config/powerpc/tm-ppcle-sim.h | 26 +++++++++++++ gdb/configure | 62 +++++++++++++++---------------- gdb/configure.in | 2 + sim/configure.in | 4 +- 9 files changed, 104 insertions(+), 38 deletions(-) create mode 100644 gdb/config/powerpc/ppcle-sim.mt create mode 100644 gdb/config/powerpc/tm-ppc-sim.h create mode 100644 gdb/config/powerpc/tm-ppcle-sim.h diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 595d7ba09e2..05889c08a06 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +Fri Aug 25 11:31:29 1995 Michael Meissner + + * configure.in (powerpc*-*-eabisim*): Only link in the simulator + if the target is powerpc{,le}-*-eabisim*, since the simulator + needs GCC to build. + * config/powerpc/ppc{,le}-sim.mt: Cloned from ppc{,le}-eabi.mt. + * config/powerpc/ppc{,le}-eabi.mt: Remove simulator support. + * config/powerpc/tm-ppc{,le}-sim.mt: Include tm-ppc{,le}-sim.h. + Wed Aug 23 16:55:35 1995 Michael Meissner * config/powerpc/ppc{,le}-eabi.mt (SIM_OBJS, SIM): Link in the diff --git a/gdb/config/powerpc/.Sanitize b/gdb/config/powerpc/.Sanitize index b38d3dab6c3..3bfa82dd074 100644 --- a/gdb/config/powerpc/.Sanitize +++ b/gdb/config/powerpc/.Sanitize @@ -29,12 +29,16 @@ gdbserve.mt nm-aix.h ppc-eabi.mt ppc-nw.mt +ppc-sim.mt ppcle-eabi.mt +ppcle-sim.mt tm-ppc-aix.h tm-ppc-aix4.h tm-ppc-eabi.h tm-ppc-nw.h +tm-ppc-sim.h tm-ppcle-eabi.h +tm-ppcle-sim.h xm-aix.h Things-to-lose: diff --git a/gdb/config/powerpc/ppcle-eabi.mt b/gdb/config/powerpc/ppcle-eabi.mt index ba177954753..27be44f2eb3 100644 --- a/gdb/config/powerpc/ppcle-eabi.mt +++ b/gdb/config/powerpc/ppcle-eabi.mt @@ -1,6 +1,3 @@ # Target: PowerPC running eabi in little endian mode TDEPFILES= rs6000-tdep.o TM_FILE= tm-ppcle-eabi.h - -SIM_OBS = remote-sim.o -SIM = ../sim/ppc/libsim.a diff --git a/gdb/config/powerpc/ppcle-sim.mt b/gdb/config/powerpc/ppcle-sim.mt new file mode 100644 index 00000000000..8aefc1a7676 --- /dev/null +++ b/gdb/config/powerpc/ppcle-sim.mt @@ -0,0 +1,6 @@ +# Target: PowerPC running eabi in little endian mode under the simulator +TDEPFILES= rs6000-tdep.o +TM_FILE= tm-ppcle-eabi.h + +SIM_OBS = remote-sim.o +SIM = ../sim/ppc/libsim.a diff --git a/gdb/config/powerpc/tm-ppc-sim.h b/gdb/config/powerpc/tm-ppc-sim.h new file mode 100644 index 00000000000..e4116bcc686 --- /dev/null +++ b/gdb/config/powerpc/tm-ppc-sim.h @@ -0,0 +1,26 @@ +/* Macro definitions for Power PC running embedded ABI under the simulator. + Copyright 1995 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 2 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, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef TM_PPC_SIM_H +#define TM_PPC_SIM_H + +#include "powerpc/tm-ppc-eabi.h" + +#endif /* TM_PPC_SIM_H */ + diff --git a/gdb/config/powerpc/tm-ppcle-sim.h b/gdb/config/powerpc/tm-ppcle-sim.h new file mode 100644 index 00000000000..76564f2cdc3 --- /dev/null +++ b/gdb/config/powerpc/tm-ppcle-sim.h @@ -0,0 +1,26 @@ +/* Macro definitions for Power PC running embedded ABI under the simulator. + Copyright 1995 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 2 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, write to the Free Software +Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef TM_PPCLE_SIM_H +#define TM_PPCLE_SIM_H + +#include "powerpc/tm-ppcle-eabi.h" + +#endif /* TM_PPCLE_SIM_H */ + diff --git a/gdb/configure b/gdb/configure index 65b76b32f72..c8721d3da57 100755 --- a/gdb/configure +++ b/gdb/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.4 +# Generated automatically using autoconf version 2.3 # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -222,7 +222,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.4" + echo "configure generated by autoconf version 2.3" exit 0 ;; -with-* | --with-*) @@ -527,15 +527,13 @@ fi rm -f conftest* ac_cv_prog_CPP="$CPP" fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" fi +CPP="$ac_cv_prog_CPP" echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF @@ -624,7 +622,6 @@ fi ac_aux_dir= for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - ac_dir=`cd $ac_dir; pwd` if test -f $ac_dir/install-sh; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -725,7 +722,6 @@ fi ac_aux_dir= for ac_dir in `cd $srcdir;pwd`/.. $srcdir/`cd $srcdir;pwd`/..; do - ac_dir=`cd $ac_dir; pwd` if test -f $ac_dir/install-sh; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -856,7 +852,7 @@ else ac_cv_c_cross=yes else cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < #include @@ -899,7 +895,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -917,7 +913,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -938,7 +934,7 @@ if test "$cross_compiling" = yes; then ac_cv_header_stdc=no else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -975,7 +971,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -1008,7 +1004,7 @@ if eval "test \"`echo '$''{'ac_cv_header_stat_broken'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -1066,7 +1062,7 @@ else ac_cv_func_mmap=no else cat > conftest.$ac_ext </dev/null | grep -v make` # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done + if test ! -f $ac_im_usrlibdir/libX11.a && test -f $ac_im_libdir/libX11.a + then + ac_im_usrlibdir=$ac_im_libdir + fi # Screen out bogus values from the imake configuration. case "$ac_im_incroot" in /usr/include) ;; @@ -1254,7 +1248,7 @@ test -z "$x_direct_test_library" && x_direct_test_library=Xt test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h cat > conftest.$ac_ext < EOF @@ -1317,7 +1311,7 @@ rm -f conftest* ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF @@ -1748,7 +1742,7 @@ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -2141,7 +2135,9 @@ powerpc-*-netware*) gdb_target=ppc-nw powerpc-*-aix4*) gdb_target=aix4 ;; powerpc-*-aix*) gdb_target=aix ;; +powerpc-*-eabisim*) gdb_target=ppc-sim ;; powerpc-*-eabi*) gdb_target=ppc-eabi ;; +powerpcle-*-eabisim*) gdb_target=ppcle-sim ;; powerpcle-*-eabi*) gdb_target=ppcle-eabi ;; pyramid-*-*) gdb_target=pyramid ;; @@ -2341,7 +2337,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.4" + echo "$CONFIG_STATUS generated by autoconf version 2.3" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; diff --git a/gdb/configure.in b/gdb/configure.in index b740931c15d..6fb7e4a1fed 100644 --- a/gdb/configure.in +++ b/gdb/configure.in @@ -381,7 +381,9 @@ powerpc-*-netware*) gdb_target=ppc-nw powerpc-*-aix4*) gdb_target=aix4 ;; powerpc-*-aix*) gdb_target=aix ;; +powerpc-*-eabisim*) gdb_target=ppc-sim ;; powerpc-*-eabi*) gdb_target=ppc-eabi ;; +powerpcle-*-eabisim*) gdb_target=ppcle-sim ;; powerpcle-*-eabi*) gdb_target=ppcle-eabi ;; pyramid-*-*) gdb_target=pyramid ;; diff --git a/sim/configure.in b/sim/configure.in index 36d6a789b82..90a3c8c258d 100644 --- a/sim/configure.in +++ b/sim/configure.in @@ -16,8 +16,8 @@ case "${target}" in h8300*-*-*) sim_target=h8300 ;; h8500-*-*) sim_target=h8500 ;; sh*-*-*) sim_target=sh ;; - powerpc-*-*) sim_target=ppc ;; - powerpcle-*-*) sim_target=ppc ;; + powerpc-*-eabisim*) sim_target=ppc ;; + powerpcle-*-eabisim*) sim_target=ppc ;; w65-*-*) sim_target=w65 ;; z8k*-*-*) sim_target=z8k ;; *) sim_target=none ;; -- 2.30.2