From a21a12e39ec04e34a31daccd5e93a213c59b8c3b Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 1 Feb 1999 11:21:32 +0000 Subject: [PATCH] Remove v850e sanitization --- binutils/.Sanitize | 28 ---- binutils/readelf.c | 18 +++ gas/.Sanitize | 28 ---- gas/ChangeLog | 8 +- gas/ChangeLog-9697 | 18 --- gas/config/.Sanitize | 28 ---- gas/configure | 386 ++++++++++++++++++++++------------------------- gas/configure.in | 49 +++--- gas/doc/.Sanitize | 28 ---- gas/po/gas.pot | 11 +- include/elf/.Sanitize | 28 ---- include/elf/ChangeLog | 7 - include/opcode/.Sanitize | 29 ---- include/opcode/ChangeLog | 5 - ld/.Sanitize | 28 ---- ld/ChangeLog | 4 - ld/configure.tgt | 2 - ld/emulparams/.Sanitize | 30 ---- ld/scripttempl/.Sanitize | 27 ---- opcodes/.Sanitize | 29 ---- opcodes/ChangeLog | 12 -- opcodes/configure | 4 +- opcodes/configure.in | 6 +- sim/.Sanitize | 28 ---- sim/ChangeLog | 20 ++- sim/configure | 81 ++++++---- sim/configure.in | 2 - sim/v850/.Sanitize | 28 ---- 28 files changed, 293 insertions(+), 679 deletions(-) diff --git a/binutils/.Sanitize b/binutils/.Sanitize index 87b3465..ad1296f 100644 --- a/binutils/.Sanitize +++ b/binutils/.Sanitize @@ -136,34 +136,6 @@ Things-to-lose: Do-last: -v850e_files="readelf.c" -if ( echo $* | grep keep\-v850e > /dev/null ) ; then - for i in $v850e_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping v850e stuff in $i - fi - fi - done -else - for i in $v850e_files ; do - if test -r $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"v850e\" from $i... - fi - cp $i new - sed '/start\-sanitize\-v850e/,/end\-sanitize\-v850e/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - m32rx_files="readelf.c" if ( echo $* | grep keep\-m32rx > /dev/null ) ; then for i in $m32rx_files ; do diff --git a/binutils/readelf.c b/binutils/readelf.c index d67f71a..9547520 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -772,6 +772,24 @@ get_machine_flags (e_flags, e_machine) strcat (buf, ", relocatable-lib"); break; + case EM_CYGNUS_V850: + switch (e_flags & EF_V850_ARCH) + { + case E_V850E_ARCH: + strcat (buf, ", v850e"); + break; + case E_V850EA_ARCH: + strcat (buf, ", v850ea"); + break; + case E_V850_ARCH: + strcat (buf, ", v850"); + break; + default: + strcat (buf, ", unknown v850 architecture variant"); + break; + } + break; + case EM_CYGNUS_M32R: if ((e_flags & EF_M32R_ARCH) == E_M32R_ARCH) strcat (buf, ", m32r"); diff --git a/gas/.Sanitize b/gas/.Sanitize index f89b5fa..9b015cc 100644 --- a/gas/.Sanitize +++ b/gas/.Sanitize @@ -137,34 +137,6 @@ Things-to-lose: Do-last: -v850_files="ChangeLog ChangeLog-9697 configure.in configure" -if ( echo $* | grep keep\-v850e > /dev/null ) ; then - for i in $v850_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping v850e stuff in $i - fi - fi - done -else - for i in $v850_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"v850e\" from $i... - fi - cp $i new - sed '/start\-sanitize\-v850e/,/end-\sanitize\-v850e/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - r5900_files="ChangeLog ChangeLog-9697 configure configure.in" if ( echo $* | grep keep\-r5900 > /dev/null ) ; then for i in $r5900_files ; do diff --git a/gas/ChangeLog b/gas/ChangeLog index 857e440..59760ab 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1207,10 +1207,9 @@ Tue Jun 23 17:47:31 1998 Jim Wilson char with code that explicitly sign-extends. Tue Jun 23 13:54:57 1998 Nick Clifton -start-sanitize-v850e + * config/tc-v850.c (md_begin): Restore text section as the current section after creating call table sections. -end-sanitize-v850e * config/obj-coff.h (SYM_AUXINFO): New macro to conceal ugly code. @@ -1469,13 +1468,11 @@ Mon Jun 8 12:20:30 1998 Alan Modra (md_assemble): Allow immediate operands without suffix or other reg operand to default in size to the current code size. -start-sanitize-v850e Mon Jun 8 09:45:00 1998 Catherine Moore * config/tc-v850.c (md_begin): Restore creation of .call_table_text and .call_table_data sections. -end-sanitize-v850e Sat Jun 6 00:02:41 1998 Nick Clifton * config/tc-d30v.c (md_assemble): Set execution type to unknown @@ -3045,11 +3042,10 @@ Fri Feb 6 16:08:30 1998 Jeffrey A Law (law@cygnus.com) bit size of an address instead of looking at the isa level. (macro, macro2, s_cprestore, s_cpadd): Likewise. -start-sanitize-v850e Fri Feb 6 14:44:34 1998 Nick Clifton * config/tc-v850.c (md_parse_option): Add -mv850any command line option. -end-sanitize-v850e + Thu Feb 5 12:39:08 1998 Ian Lance Taylor * ehopt.c: New file. diff --git a/gas/ChangeLog-9697 b/gas/ChangeLog-9697 index eed55ed..6bb8f43 100644 --- a/gas/ChangeLog-9697 +++ b/gas/ChangeLog-9697 @@ -708,7 +708,6 @@ Wed Sep 17 16:54:20 1997 Nick Clifton * config/tc-v850.c (v850_reloc_prefix): Recoded to use CHECK_ () macro. (handle_tdaoff, handle_zdaoff, handle_sdaoff): New functions. -start-sanitize-v850e * config/tc-v850.c (md_assemble): Corrected typo. * config/tc-v850.c Add new sections: call_table_data and @@ -717,7 +716,6 @@ start-sanitize-v850e (handle_ctoff): New Function. * doc/c-v850.texi (V850 Opcodes): Document call table relocations. -end-sanitize-v850e Tue Sep 16 14:18:22 1997 Nick Clifton @@ -737,10 +735,6 @@ Mon Sep 15 18:33:06 1997 Nick Clifton processor. * config/tc-v850.h (TARGET_PROCESSOR): New constant. -start-sanitize-v850e - (TARGET_PROCESSOR): New constant. - (TARGET_PROCESSOR): New constant. -end-sanitize-v850e start-sanitize-tx19 Mon Sep 15 17:26:46 1997 Gavin Koch @@ -804,9 +798,7 @@ Mon Sep 15 11:28:04 1997 Ken Raeburn Wed Sep 10 10:07:08 1997 Nick Clifton -start-sanitize-v850e * config/tc-v850.c (md_assemble): Corrected spelling mistake. -end-sanitize-v850e * configure.in (emulations): Add v850 emulation. Tue Sep 9 17:14:33 1997 Doug Evans @@ -825,21 +817,17 @@ Tue Sep 9 10:19:37 1997 Nick Clifton * doc/c-v850.texi (V850 Opcodes): Document hi0() reloc prefix. Correct description of hi() reloc prefix. -start-sanitize-v850e * doc/c-v850.texi (V850 Opcodes): Document new reloc prefix. * config/tc-v850.c (v850_reloc_prefix): Add hilo() reloc prefix. * config/tc-v850.c (md_assemble): Add support for BFD_RELOC_32. -end-sanitize-v850e * doc/c-v850.texi: Document new pseudo ops and command line options. * config/tc-v850.c (set_machine): New function. * config/tc-v850.c (.v850): New pseudo op. -start-sanitize-v850e * config/tc-v850.c (.v850e): New pseudo op. * config/tc-v850.c (.v850ea): New pseudo op. -end-sanitize-v850e Mon Sep 8 23:08:04 1997 Ian Lance Taylor @@ -978,10 +966,8 @@ Mon Aug 25 11:21:48 1997 Nick Clifton * config/tc-v850.c (md_assemble): Restore input_line_pointer upon exit. -start-sanitize-v850e * config/tc-v850.c (parse_register_list): Support constant expressions as register lists. -end-sanitize-v850e Mon Aug 25 10:19:34 1997 Nick Clifton @@ -1072,7 +1058,6 @@ Mon Aug 18 11:26:36 1997 Nick Clifton * config/tc-v850.c (md_apply_fix3): Add support for new 16 bit PC relative reloc. -start-sanitize-v850e Mon Aug 18 11:24:21 1997 Nick Clifton * config/tc-v850.c: Remove support_v850e flag and command line @@ -1090,7 +1075,6 @@ Mon Aug 18 11:24:21 1997 Nick Clifton * configure.in (emulations): Add support for v850ea target * configure (emulations): Add support for v850ea target -end-sanitize-v850e Fri Aug 15 14:00:13 1997 Ian Lance Taylor @@ -1124,13 +1108,11 @@ Fri Aug 15 14:00:13 1997 Ian Lance Taylor Wed Aug 13 18:58:56 1997 Nick Clifton -start-sanitize-v850e * config/tc-v850.c (md_assemble, md_show_usage, md_parse_option): Add support for v850ea instructions. * config/tc-v850.c (md_assemble, md_show_usage, md_parse_option): Add support for v850e instructions. -end-sanitize-v850e * config/tc-v850.c (md_assemble): Fix error recovery to reload text of entire opcode. diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize index c70d252..c3f4e51 100644 --- a/gas/config/.Sanitize +++ b/gas/config/.Sanitize @@ -323,34 +323,6 @@ else done fi -v850e_files="tc-v850.c tc-v850.h" -if ( echo $* | grep keep\-v850e > /dev/null ) ; then - for i in $v850e_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping v850e stuff in $i - fi - fi - done -else - for i in $v850e_files ; do - if test -r $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"v850e\" from $i... - fi - cp $i new - sed '/start\-sanitize\-v850e/,/end\-sanitize\-v850e/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - m32rx_files="tc-m32r.c tc-m32r.h" if ( echo $* | grep keep\-m32rx > /dev/null ) ; then for i in $m32rx_files ; do diff --git a/gas/configure b/gas/configure index 570a54d..6b089cd 100755 --- a/gas/configure +++ b/gas/configure @@ -1573,6 +1573,8 @@ fi emulations="" +using_cgen=no + for this_target in $target $canon_targets ; do eval `echo $this_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/cpu=\1 vendor=\2 os=\3/'` @@ -1652,15 +1654,14 @@ for this_target in $target $canon_targets ; do dvp-*-*) fmt=elf bfd_gas=yes install_tooldir= ;; # end-sanitize-sky -# start-sanitize-fr30 fr30-*-*) fmt=elf bfd_gas=yes ;; -# end-sanitize-fr30 hppa-*-*elf*) fmt=elf em=hppa ;; hppa-*-lites*) fmt=elf em=hppa ;; hppa-*-osf*) fmt=som em=hppa ;; hppa-*-rtems*) fmt=elf em=hppa ;; hppa-*-hpux*) fmt=som em=hppa ;; + hppa-*-mpeix*) fmt=som em=hppa ;; hppa-*-bsd*) fmt=som em=hppa ;; hppa-*-hiux*) fmt=som em=hppa ;; @@ -1817,11 +1818,9 @@ EOF # end-sanitize-tic80 v850-*-*) fmt=elf bfd_gas=yes ;; - -# start-sanitize-v850e v850e-*-*) fmt=elf bfd_gas=yes ;; v850ea-*-*) fmt=elf bfd_gas=yes ;; -# end-sanitize-v850e + vax-*-bsd* | vax-*-ultrix*) fmt=aout ;; vax-*-vms) fmt=vms ;; @@ -1898,32 +1897,15 @@ EOF esac case ${cpu_type} in - m32r) + fr30 | m32r) case "x${extra_objects}" in *cgen.o*) ;; *) extra_objects="$extra_objects cgen.o" - cat >> confdefs.h <<\EOF -#define USING_CGEN 1 -EOF - + using_cgen=yes ;; esac ;; -# start-sanitize-fr30 - fr30) - case "x${extra_objects}" in - *cgen.o*) ;; - *) extra_objects="$extra_objects cgen.o" - cat >> confdefs.h <<\EOF -#define USING_CGEN 1 -EOF - - ;; - esac - ;; -# end-sanitize-fr30 - m68k) case ${extra_objects} in *m68k-parse.o*) ;; @@ -2018,14 +2000,16 @@ esac # Unfortunately the cpu in cpu-opc.h file isn't always $(TARGET_CPU). cgen_cpu_prefix="" -case "x${extra_objects}" in - *cgen.o*) - case ${target_cpu} in - *) cgen_cpu_prefix=${target_cpu} ;; - esac - ;; -esac +if test "x$using_cgen" = xyes ; then + case ${target_cpu} in + *) cgen_cpu_prefix=${target_cpu} ;; + esac + + cat >> confdefs.h <<\EOF +#define USING_CGEN 1 +EOF +fi if test ! -r ${srcdir}/config/tc-${target_cpu_type}.c; then @@ -2288,7 +2272,7 @@ EOF # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2292: checking for $ac_word" >&5 +echo "configure:2278: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2317,7 +2301,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2321: checking for $ac_word" >&5 +echo "configure:2307: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2367,7 +2351,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2371: checking for $ac_word" >&5 +echo "configure:2357: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2398,7 +2382,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2402: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2388: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2408,11 +2392,11 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2432,12 +2416,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2436: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2422: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2441: checking whether we are using GNU C" >&5 +echo "configure:2427: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2446,7 +2430,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2465,7 +2449,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2469: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2455: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2502,7 +2486,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2506: checking for $ac_word" >&5 +echo "configure:2492: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2532,7 +2516,7 @@ done test -n "$YACC" || YACC="yacc" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2536: checking how to run the C preprocessor" >&5 +echo "configure:2522: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2547,13 +2531,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2564,13 +2548,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2560: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2581,13 +2565,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2617,7 +2601,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2621: checking for $ac_word" >&5 +echo "configure:2607: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2649,7 +2633,7 @@ test -n "$LEX" || LEX=""$missing_dir/missing flex"" # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2653: checking for $ac_word" >&5 +echo "configure:2639: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2682,7 +2666,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:2686: checking for yywrap in -l$ac_lib" >&5 +echo "configure:2672: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2690,7 +2674,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2724,7 +2708,7 @@ fi fi echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:2728: checking lex output file root" >&5 +echo "configure:2714: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2745,7 +2729,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:2749: checking whether yytext is a pointer" >&5 +echo "configure:2735: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2757,14 +2741,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -2788,7 +2772,7 @@ fi ALL_LINGUAS= echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6 -echo "configure:2792: checking for POSIXized ISC" >&5 +echo "configure:2778: checking for POSIXized ISC" >&5 if test -d /etc/conf/kconfig.d && grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1 then @@ -2809,12 +2793,12 @@ else fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2813: checking for ANSI C header files" >&5 +echo "configure:2799: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -2822,7 +2806,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2812: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2839,7 +2823,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 @@ -2857,7 +2841,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 @@ -2878,7 +2862,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2889,7 +2873,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2879: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2913,12 +2897,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2917: checking for working const" >&5 +echo "configure:2903: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2957: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2988,21 +2972,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2992: checking for inline" >&5 +echo "configure:2978: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -3028,12 +3012,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3032: checking for off_t" >&5 +echo "configure:3018: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3061,12 +3045,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:3065: checking for size_t" >&5 +echo "configure:3051: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -3096,19 +3080,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:3100: checking for working alloca.h" >&5 +echo "configure:3086: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:3112: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -3129,12 +3113,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:3133: checking for alloca" >&5 +echo "configure:3119: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -3194,12 +3178,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:3198: checking whether alloca needs Cray hooks" >&5 +echo "configure:3184: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3228: checking for $ac_func" >&5 +echo "configure:3214: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3242: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3279,7 +3263,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3283: checking stack direction for C alloca" >&5 +echo "configure:3269: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3287,7 +3271,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -3331,17 +3315,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3335: checking for $ac_hdr" >&5 +echo "configure:3321: checking for $ac_hdr" >&5 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3370,12 +3354,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3374: checking for $ac_func" >&5 +echo "configure:3360: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3423,7 +3407,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3427: checking for working mmap" >&5 +echo "configure:3413: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3431,7 +3415,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -3599,17 +3583,17 @@ unistd.h values.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3603: checking for $ac_hdr" >&5 +echo "configure:3589: checking for $ac_hdr" >&5 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3639,12 +3623,12 @@ done __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3643: checking for $ac_func" >&5 +echo "configure:3629: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3696,12 +3680,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3700: checking for $ac_func" >&5 +echo "configure:3686: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3758,19 +3742,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3762: checking for LC_MESSAGES" >&5 +echo "configure:3748: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -3791,7 +3775,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3795: checking whether NLS is requested" >&5 +echo "configure:3781: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -3811,7 +3795,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3815: checking whether included gettext is requested" >&5 +echo "configure:3801: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -3830,17 +3814,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3834: checking for libintl.h" >&5 +echo "configure:3820: checking for libintl.h" >&5 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3857,19 +3841,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:3861: checking for gettext in libc" >&5 +echo "configure:3847: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:3873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -3885,7 +3869,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3889: checking for bindtextdomain in -lintl" >&5 +echo "configure:3875: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3893,7 +3877,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3920,19 +3904,19 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:3924: checking for gettext in libintl" >&5 +echo "configure:3910: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libintl=yes else @@ -3960,7 +3944,7 @@ EOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3964: checking for $ac_word" >&5 +echo "configure:3950: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3994,12 +3978,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3998: checking for $ac_func" >&5 +echo "configure:3984: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4049,7 +4033,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4053: checking for $ac_word" >&5 +echo "configure:4039: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4084,7 +4068,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4088: checking for $ac_word" >&5 +echo "configure:4074: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4116,7 +4100,7 @@ else fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -4156,7 +4140,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4160: checking for $ac_word" >&5 +echo "configure:4146: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4190,7 +4174,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4194: checking for $ac_word" >&5 +echo "configure:4180: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4225,7 +4209,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4229: checking for $ac_word" >&5 +echo "configure:4215: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4315,7 +4299,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:4319: checking for catalogs to be installed" >&5 +echo "configure:4305: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -4343,17 +4327,17 @@ echo "configure:4319: checking for catalogs to be installed" >&5 if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:4347: checking for linux/version.h" >&5 +echo "configure:4333: checking for linux/version.h" >&5 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4357: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4343: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4416,7 +4400,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:4420: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:4406: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -4434,19 +4418,19 @@ fi echo $ac_n "checking for Cygwin32 environment""... $ac_c" 1>&6 -echo "configure:4438: checking for Cygwin32 environment" >&5 +echo "configure:4424: checking for Cygwin32 environment" >&5 if eval "test \"`echo '$''{'am_cv_cygwin32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4436: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_cygwin32=yes else @@ -4463,19 +4447,19 @@ echo "$ac_t""$am_cv_cygwin32" 1>&6 CYGWIN32= test "$am_cv_cygwin32" = yes && CYGWIN32=yes echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:4467: checking for Cygwin environment" >&5 +echo "configure:4453: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'am_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_cygwin=yes else @@ -4492,19 +4476,19 @@ echo "$ac_t""$am_cv_cygwin" 1>&6 CYGWIN= test "$am_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6 -echo "configure:4496: checking for Mingw32 environment" >&5 +echo "configure:4482: checking for Mingw32 environment" >&5 if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_mingw32=yes else @@ -4523,7 +4507,7 @@ test "$am_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:4527: checking for executable suffix" >&5 +echo "configure:4513: checking for executable suffix" >&5 if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4558,17 +4542,17 @@ for ac_hdr in string.h stdlib.h memory.h strings.h unistd.h stdarg.h varargs.h e do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4562: checking for $ac_hdr" >&5 +echo "configure:4548: checking for $ac_hdr" >&5 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4558: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4598,7 +4582,7 @@ done # Put this here so that autoconf's "cross-compiling" message doesn't confuse # people who are not cross-compiling but are compiling cross-assemblers. echo $ac_n "checking whether compiling a cross-assembler""... $ac_c" 1>&6 -echo "configure:4602: checking whether compiling a cross-assembler" >&5 +echo "configure:4588: checking whether compiling a cross-assembler" >&5 if test "${host}" = "${target}"; then cross_gas=no else @@ -4613,19 +4597,19 @@ echo "$ac_t""$cross_gas" 1>&6 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:4617: checking for working alloca.h" >&5 +echo "configure:4603: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:4629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -4646,12 +4630,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:4650: checking for alloca" >&5 +echo "configure:4636: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -4711,12 +4695,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:4715: checking whether alloca needs Cray hooks" >&5 +echo "configure:4701: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4745: checking for $ac_func" >&5 +echo "configure:4731: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4796,7 +4780,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:4800: checking stack direction for C alloca" >&5 +echo "configure:4786: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4804,7 +4788,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -4845,21 +4829,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:4849: checking for inline" >&5 +echo "configure:4835: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -4889,12 +4873,12 @@ esac for ac_func in unlink remove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4893: checking for $ac_func" >&5 +echo "configure:4879: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4946,12 +4930,12 @@ done for ac_func in sbrk do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4950: checking for $ac_func" >&5 +echo "configure:4936: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5003,12 +4987,12 @@ done # enough, but on some of those systems, the assert macro relies on requoting # working properly! echo $ac_n "checking for working assert macro""... $ac_c" 1>&6 -echo "configure:5007: checking for working assert macro" >&5 +echo "configure:4993: checking for working assert macro" >&5 if eval "test \"`echo '$''{'gas_cv_assert_ok'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -5024,7 +5008,7 @@ assert (a == b ; return 0; } EOF -if { (eval echo configure:5028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_assert_ok=yes else @@ -5065,12 +5049,12 @@ gas_test_headers=" " echo $ac_n "checking whether declaration is required for strstr""... $ac_c" 1>&6 -echo "configure:5069: checking whether declaration is required for strstr" >&5 +echo "configure:5055: checking whether declaration is required for strstr" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_strstr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_strstr=no else @@ -5102,12 +5086,12 @@ EOF echo $ac_n "checking whether declaration is required for malloc""... $ac_c" 1>&6 -echo "configure:5106: checking whether declaration is required for malloc" >&5 +echo "configure:5092: checking whether declaration is required for malloc" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_malloc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_malloc=no else @@ -5139,12 +5123,12 @@ EOF echo $ac_n "checking whether declaration is required for free""... $ac_c" 1>&6 -echo "configure:5143: checking whether declaration is required for free" >&5 +echo "configure:5129: checking whether declaration is required for free" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_free'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_free=no else @@ -5176,12 +5160,12 @@ EOF echo $ac_n "checking whether declaration is required for sbrk""... $ac_c" 1>&6 -echo "configure:5180: checking whether declaration is required for sbrk" >&5 +echo "configure:5166: checking whether declaration is required for sbrk" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_sbrk'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_sbrk=no else @@ -5216,12 +5200,12 @@ EOF # for it? echo $ac_n "checking whether declaration is required for errno""... $ac_c" 1>&6 -echo "configure:5220: checking whether declaration is required for errno" >&5 +echo "configure:5206: checking whether declaration is required for errno" >&5 if eval "test \"`echo '$''{'gas_cv_decl_needed_errno'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gas_cv_decl_needed_errno=no else @@ -5673,6 +5657,7 @@ EOF cat >> $CONFIG_STATUS < obj-format.h echo '#include "te-'"${te_file}"'.h"' > targ-env.h echo '#include "itbl-'"${target_cpu_type}"'.h"' > itbl-cpu.h - case ${target_cpu_type} in - m32r) echo '#include "opcodes/'"${target_cpu_type}"'-opc.h"' > cgen-opc.h ;; -# start-sanitize-fr30 - fr30) echo '#include "opcodes/'"${target_cpu_type}"'-opc.h"' > cgen-opc.h ;; -# end-sanitize-fr30 - esac + if test "x$cgen_cpu_prefix" != x ; then + echo '#include "opcodes/'"${cgen_cpu_prefix}"'-opc.h"' > cgen-opc.h + fi sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile exit 0 diff --git a/gas/configure.in b/gas/configure.in index b53c4b4..e23936c 100644 --- a/gas/configure.in +++ b/gas/configure.in @@ -62,6 +62,8 @@ fi emulations="" +using_cgen=no + for this_target in $target $canon_targets ; do changequote(,)dnl @@ -145,15 +147,14 @@ changequote([,])dnl dvp-*-*) fmt=elf bfd_gas=yes install_tooldir= ;; # end-sanitize-sky -# start-sanitize-fr30 fr30-*-*) fmt=elf bfd_gas=yes ;; -# end-sanitize-fr30 hppa-*-*elf*) fmt=elf em=hppa ;; hppa-*-lites*) fmt=elf em=hppa ;; hppa-*-osf*) fmt=som em=hppa ;; hppa-*-rtems*) fmt=elf em=hppa ;; hppa-*-hpux*) fmt=som em=hppa ;; + hppa-*-mpeix*) fmt=som em=hppa ;; hppa-*-bsd*) fmt=som em=hppa ;; hppa-*-hiux*) fmt=som em=hppa ;; @@ -306,11 +307,9 @@ dnl end-sanitize-beos # end-sanitize-tic80 v850-*-*) fmt=elf bfd_gas=yes ;; - -# start-sanitize-v850e v850e-*-*) fmt=elf bfd_gas=yes ;; v850ea-*-*) fmt=elf bfd_gas=yes ;; -# end-sanitize-v850e + vax-*-bsd* | vax-*-ultrix*) fmt=aout ;; vax-*-vms) fmt=vms ;; @@ -381,26 +380,15 @@ dnl end-sanitize-beos esac case ${cpu_type} in - m32r) + fr30 | m32r) case "x${extra_objects}" in *cgen.o*) ;; *) extra_objects="$extra_objects cgen.o" - AC_DEFINE(USING_CGEN) + using_cgen=yes ;; esac ;; -# start-sanitize-fr30 - fr30) - case "x${extra_objects}" in - *cgen.o*) ;; - *) extra_objects="$extra_objects cgen.o" - AC_DEFINE(USING_CGEN) - ;; - esac - ;; -# end-sanitize-fr30 - m68k) case ${extra_objects} in *m68k-parse.o*) ;; @@ -492,14 +480,13 @@ esac # Unfortunately the cpu in cpu-opc.h file isn't always $(TARGET_CPU). cgen_cpu_prefix="" -case "x${extra_objects}" in - *cgen.o*) - case ${target_cpu} in - *) cgen_cpu_prefix=${target_cpu} ;; - esac - ;; -esac -AC_SUBST(cgen_cpu_prefix) +if test "x$using_cgen" = xyes ; then + case ${target_cpu} in + *) cgen_cpu_prefix=${target_cpu} ;; + esac + AC_SUBST(cgen_cpu_prefix) + AC_DEFINE(USING_CGEN) +fi dnl dnl Make sure the desired support files exist. @@ -747,14 +734,12 @@ AC_OUTPUT(Makefile doc/Makefile .gdbinit:gdbinit.in po/Makefile.in:po/Make-in, echo '#include "obj-'"${obj_format}"'.h"' > obj-format.h echo '#include "te-'"${te_file}"'.h"' > targ-env.h echo '#include "itbl-'"${target_cpu_type}"'.h"' > itbl-cpu.h - case ${target_cpu_type} in - m32r) echo '#include "opcodes/'"${target_cpu_type}"'-opc.h"' > cgen-opc.h ;; -# start-sanitize-fr30 - fr30) echo '#include "opcodes/'"${target_cpu_type}"'-opc.h"' > cgen-opc.h ;; -# end-sanitize-fr30 - esac + if test "x$cgen_cpu_prefix" != x ; then + echo '#include "opcodes/'"${cgen_cpu_prefix}"'-opc.h"' > cgen-opc.h + fi sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile], [target_cpu_type=${target_cpu_type} + cgen_cpu_prefix=${cgen_cpu_prefix} obj_format=${obj_format} te_file=${te_file}]) diff --git a/gas/doc/.Sanitize b/gas/doc/.Sanitize index fd109e3..848c29f 100644 --- a/gas/doc/.Sanitize +++ b/gas/doc/.Sanitize @@ -60,34 +60,6 @@ Things-to-lose: Do-last: -v850e_files="c-v850.texi" -if ( echo $* | grep keep\-v850e > /dev/null ) ; then - for i in $v850e_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping v850e stuff in $i - fi - fi - done -else - for i in $v850e_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"v850e\" from $i... - fi - cp $i new - sed '/start\-sanitize\-v850e/,/end-\sanitize\-v850e/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - m32rx_files="c-m32r.texi as.texinfo" if ( echo $* | grep keep\-m32rx > /dev/null ) ; then for i in $m32rx_files ; do diff --git a/gas/po/gas.pot b/gas/po/gas.pot index 7f35f1a..59cb006 100644 --- a/gas/po/gas.pot +++ b/gas/po/gas.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1998-11-04 16:53-0500\n" +"POT-Creation-Date: 1998-11-12 13:28-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1261,7 +1261,7 @@ msgstr "" msgid "expression too complex for %%st" msgstr "" -#: config/tc-arc.c:1324 config/tc-arm.c:2915 config/tc-d10v.c:1442 +#: config/tc-arc.c:1324 config/tc-arm.c:2915 config/tc-d10v.c:1448 #: config/tc-d30v.c:1792 config/tc-mips.c:3341 config/tc-mips.c:4297 #: config/tc-mips.c:5082 config/tc-mips.c:5628 config/tc-ppc.c:4668 #: config/tc-v850.c:2402 @@ -1918,12 +1918,12 @@ msgstr "" msgid "reloc %d not supported by object file format" msgstr "" -#: config/tc-d10v.c:1492 +#: config/tc-d10v.c:1498 #, c-format msgid "line %d: rep or repi must include at least 4 instructions" msgstr "" -#: config/tc-d10v.c:1505 config/tc-d30v.c:1909 +#: config/tc-d10v.c:1517 config/tc-d30v.c:1909 #, c-format msgid "line %d: unknown relocation type: 0x%x" msgstr "" @@ -1943,7 +1943,7 @@ msgid "" "-N\t\t\tWarn about NOPs inserted after word multiplies.\n" "-c Warn about symbols whoes names match register " "names.\n" -"-C Opposite of -C. -c is the default.\n" +"-C Opposite of -C. -C is the default.\n" msgstr "" #: config/tc-d30v.c:450 @@ -5337,7 +5337,6 @@ msgstr "" msgid " -mv850 The code is targeted at the v850\n" msgstr "" -#. start-sanitize-v850e #: config/tc-v850.c:1218 msgid " -mv850e The code is targeted at the v850e\n" msgstr "" diff --git a/include/elf/.Sanitize b/include/elf/.Sanitize index c6860d0..0c23c60 100644 --- a/include/elf/.Sanitize +++ b/include/elf/.Sanitize @@ -52,34 +52,6 @@ Things-to-lose: Do-last: -v850_files="ChangeLog common.h v850.h" -if ( echo $* | grep keep\-v850e > /dev/null ) ; then - for i in $v850_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping v850e stuff in $i - fi - fi - done -else - for i in $v850_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"v850e\" from $i... - fi - cp $i new - sed '/start\-sanitize\-v850e/,/end\-sanitize\-v850e/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - m32rx_files="ChangeLog m32r.h" if ( echo $* | grep keep\-m32rx > /dev/null ) ; then for i in $m32rx_files ; do diff --git a/include/elf/ChangeLog b/include/elf/ChangeLog index 0f23ec0..5e3fd55 100644 --- a/include/elf/ChangeLog +++ b/include/elf/ChangeLog @@ -329,12 +329,10 @@ Tue Sep 30 13:26:58 1997 Doug Evans (R_SPARC_{H44,M44,L44,REGISTER}): New relocations. (ELF64_R_TYPE_{DATA,ID,INFO}): New macros. -start-sanitize-v850e Wed Sep 17 16:41:42 1997 Nick Clifton * v850.h: Add R_V850_CALLT_6_7_OFFSET and R_V850_CALLT_16_16_OFFSET. -end-sanitize-v850e Tue Sep 16 14:16:17 1997 Nick Clifton * v850.h (reloc_type): Add R_V850_TDA_16_16_OFFSET. @@ -349,19 +347,14 @@ Wed Sep 3 11:25:57 1997 Nick Clifton Tue Sep 2 17:41:05 1997 Nick Clifton -start-sanitize-v850e * common.h: Remove magic number for V850E. * common.h: Remove magic number for V850EA. -end-sanitize-v850e - * v850.h: Add new flags for e_flags field in elf header. -start-sanitize-v850e Mon Aug 25 16:06:47 1997 Nick Clifton * common.h (EM_CYGNUS_V850E): backend magic number for v850e. * common.h (EM_CYGNUS_V850EA): backend magic number for v850ea. -end-sanitize-v850e Mon Aug 18 11:05:23 1997 Nick Clifton diff --git a/include/opcode/.Sanitize b/include/opcode/.Sanitize index 6df5091..473bcea 100644 --- a/include/opcode/.Sanitize +++ b/include/opcode/.Sanitize @@ -73,35 +73,6 @@ Things-to-lose: Do-last: -v850e_files="ChangeLog v850.h" - -if ( echo $* | grep keep\-v850e > /dev/null ) ; then - for i in $v850e_files ; do - if test -f $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping v850e stuff in $i - fi - fi - done -else - for i in $v850e_files ; do - if test -f $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"v850e\" from $i... - fi - cp $i new - sed '/start\-sanitize\-v850e/,/end-\sanitize\-v850e/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - tx49_files="ChangeLog mips.h" if ( echo $* | grep keep\-tx49 > /dev/null ) ; then diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog index ab0df59..324fbeb 100644 --- a/include/opcode/ChangeLog +++ b/include/opcode/ChangeLog @@ -603,10 +603,8 @@ Mon Sep 15 18:28:37 1997 Nick Clifton * v850.h (struct v850_opcode): Add processors field. (PROCESSOR_V850, PROCESSOR_ALL): New bit constants. -start-sanitize-v850e (PROCESSOR_V850E, PROCESSOR_NOT_V850): New bit constants. (PROCESSOR_V850EA): New bit constants. -end-sanitize-v850e Mon Sep 15 11:29:43 1997 Ken Raeburn @@ -664,11 +662,8 @@ Wed Aug 13 18:45:48 1997 Nick Clifton * v850.h (struct v850_opcode): Add flags field. (struct v850_operand): Extend meaning of 'bits' and 'shift' fields. - -start-sanitize-v850e (V850E_INSTRUCTION, V850EA_INSTRUCTION): New flags. (V850E_PUSH_POP, V850E_IMMEDIATE16, V850E_IMMEDIATE32): New flags. -end-sanitize-v850e Fri Aug 8 16:58:42 1997 Doug Evans diff --git a/ld/.Sanitize b/ld/.Sanitize index 48c53e4..de0a1b3 100644 --- a/ld/.Sanitize +++ b/ld/.Sanitize @@ -117,34 +117,6 @@ Things-to-lose: Do-last: -v850_files="ChangeLog configure.tgt Makefile.am Makefile.in" -if ( echo $* | grep keep\-v850e > /dev/null ) ; then - for i in $v850_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping v850e stuff in $i - fi - fi - done -else - for i in $v850_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"v850e\" from $i... - fi - cp $i new - sed '/start\-sanitize\-v850e/,/end-\sanitize\-v850e/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - tx49_files="ChangeLog configure.tgt" if ( echo $* | grep keep\-tx49 > /dev/null ) ; then for i in $tx49_files ; do diff --git a/ld/ChangeLog b/ld/ChangeLog index d5594de..15d7058 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1335,13 +1335,11 @@ Wed Sep 17 16:45:34 1997 Nick Clifton * Makefile.am, Makefile.in: Add rule for ev850.c * configure.tgt (targ_extra_emuls): Add v850 target. -start-sanitize-v850e Wed Sep 17 16:43:39 1997 Nick Clifton * emulparams/v850.sh (CALL_TABLE_START_ADDR): New entry. * scripttempl/v850.sc: Add call table data area -end-sanitize-v850e Mon Sep 15 11:29:13 1997 Ken Raeburn Merge change from Martin Hunt: @@ -1390,7 +1388,6 @@ Wed Aug 20 11:14:13 1997 Ian Lance Taylor * ld.texinfo (Section Definition): Clarify use of whitespace. (Section Placement): Likewise. -start-sanitize-v850e Mon Aug 18 11:12:03 1997 Nick Clifton * configure.tgt (targ_extra_emuls): Add support for v850e target. @@ -1398,7 +1395,6 @@ Mon Aug 18 11:12:03 1997 Nick Clifton Mon Aug 18 11:12:03 1997 Nick Clifton * configure.tgt (targ_extra_emuls): Add support for v850e target. -end-sanitize-v850e Sat Aug 9 00:42:27 1997 Ian Lance Taylor diff --git a/ld/configure.tgt b/ld/configure.tgt index f1fae54..353d94a 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -237,10 +237,8 @@ tic30-*-*coff*) targ_emul=tic30coff ;; tic80-*-*) targ_emul=tic80coff ;; # end-sanitize-tic80 v850-*-*) targ_emul=v850 ;; -# start-sanitize-v850e v850e-*-*) targ_emul=v850 ;; v850ea-*-*) targ_emul=v850 ;; -# end-sanitize-v850e w65-*-*) targ_emul=w65 ;; fr30-*-*) targ_emul=elf32fr30 ;; *-*-aout) targ_emul=${target_cpu}-${target_vendor} ;; diff --git a/ld/emulparams/.Sanitize b/ld/emulparams/.Sanitize index ed23f41..20a4405 100644 --- a/ld/emulparams/.Sanitize +++ b/ld/emulparams/.Sanitize @@ -154,40 +154,10 @@ z8002.sh Things-to-lose: - - # The lines between the "Do-last:" line and the end of the file # are executed as a /bin/sh shell script after everything else is # done. Do-last: -v850e_files="v850.sh" -if ( echo $* | grep keep\-v850e > /dev/null ) ; then - for i in $v850e_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping v850e stuff in $i - fi - fi - done -else - for i in $v850e_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"v850e\" from $i... - fi - cp $i new - sed '/start\-sanitize\-v850e/,/end-\sanitize\-v850e/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - # eof diff --git a/ld/scripttempl/.Sanitize b/ld/scripttempl/.Sanitize index 119834a..d29f5e7 100644 --- a/ld/scripttempl/.Sanitize +++ b/ld/scripttempl/.Sanitize @@ -98,32 +98,5 @@ Things-to-lose: Do-last: -v850_files="v850.sc" -if ( echo $* | grep keep\-v850e > /dev/null ) ; then - for i in $v850_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping v850e stuff in $i - fi - fi - done -else - for i in $v850_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"v850e\" from $i... - fi - cp $i new - sed '/start\-sanitize\-v850e/,/end-\sanitize\-v850e/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi # eof diff --git a/opcodes/.Sanitize b/opcodes/.Sanitize index fcc3361..86ed309 100644 --- a/opcodes/.Sanitize +++ b/opcodes/.Sanitize @@ -175,35 +175,6 @@ else done fi -v850e_files="ChangeLog Makefile.in Makefile.am configure.in configure disassemble.c v850-opc.c v850-dis.c" -if ( echo $* | grep keep\-v850e > /dev/null ) ; then - for i in $v850e_files ; do - if test -f $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping v850e stuff in $i - fi - fi - done -else - for i in $v850e_files ; do - if test -f $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"v850e\" from $i... - fi - cp $i new - sed '/start\-sanitize\-v850e/,/end\-sanitize\-v850e/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - - r5900_files="ChangeLog mips-opc.c mips-dis.c Makefile.am Makefile.in" if ( echo $* | grep keep\-r5900 > /dev/null ) ; then for i in $r5900_files ; do diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index 3c073a8..557ccfa 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -2175,13 +2175,11 @@ Fri Oct 3 17:26:54 1997 Ian Lance Taylor values, rather than assuming that short is 16 bits. (OP_sI, OP_J, OP_DIR): Likewise. -start-sanitize-v850e Thu Oct 2 13:36:45 1997 Nick Clifton * v850-dis.c (v850_sreg_names): Use symbolic names for higher system registers. -end-sanitize-v850e Wed Oct 1 16:58:54 1997 Nick Clifton * v850-opc.c: Fix typo in comment. @@ -2213,12 +2211,10 @@ Wed Sep 24 11:29:35 1997 Ian Lance Taylor * aclocal.m4: Rebuild with new libtool. * configure: Rebuild. -start-sanitize-v850e Fri Sep 19 11:45:49 1997 Andrew Cagney * v850-opc.c ("cmov"): Order reg param r1, r2 not r2, r2. -end-sanitize-v850e Thu Sep 18 11:21:43 1997 Doug Evans * sparc-opc.c (sparclet_cpreg_table): Add %ccsr2, %cccrr, %ccrstr. @@ -2297,12 +2293,10 @@ Wed Aug 27 21:42:39 1997 Ken Raeburn * d30v-opc.c (SHORT_M2, LONG_M2): Two new forms. -start-sanitize-v850e Fri Sep 12 11:43:54 1997 Nick Clifton * v850-dis.c (disassemble): Improved display of register lists. -end-sanitize-v850e Thu Sep 11 17:35:10 1997 Doug Evans * sparc-opc.c (sparc_opcodes): Fix assembler args to @@ -2352,11 +2346,9 @@ Fri Aug 22 10:35:15 1997 Nick Clifton * v850-opc.c (v850_opcodes[]): Add NOT_R0 flag to decect cases where r0 is being used as a destination register. -start-sanitize-v850e Thu Aug 21 11:09:09 1997 Nick Clifton * v850-opc.c (v850_opcodes[]): Move divh opcodes next to each other. -end-sanitize-v850e Wed Aug 20 00:43:11 1997 J"orn Rennecke @@ -2370,7 +2362,6 @@ Tue Aug 19 10:59:59 1997 Richard Henderson * alpha-opc.c (alpha_opcodes): Fix hw_rei_stall mungage. -start-sanitize-v850e Mon Aug 18 11:10:03 1997 Nick Clifton * v850-opc.c (v850_opcodes[]): Remove use of flag field. @@ -2386,7 +2377,6 @@ Mon Aug 18 11:08:25 1997 Nick Clifton * configure (cgen_files): Add support for v850ea target. * configure.in (cgen_files): Add support for v850ea target. -end-sanitize-v850e Fri Aug 15 05:17:48 1997 Doug Evans @@ -2400,7 +2390,6 @@ Fri Aug 15 05:17:48 1997 Doug Evans Wed Aug 13 18:52:11 1997 Nick Clifton -start-sanitize-v850e * v850-dis.c (disassemble): Add support for v850EA instructions. * v850-opc.c (insert_i5div, extract_i5div): New Functions. @@ -2412,7 +2401,6 @@ start-sanitize-v850e extract_d16_16, insert_i9, extract_i9, insert_u9, extract_u9, insert_spe, extract_spe): New Functions. (v850_opcodes): Add v850E instructions. -end-sanitize-v850e * v850-opc.c: Reorganised and re-layed out to improve readability and portability. diff --git a/opcodes/configure b/opcodes/configure index 47bcc9f..d0d774a 100755 --- a/opcodes/configure +++ b/opcodes/configure @@ -3847,7 +3847,7 @@ if test x${all_targets} = xfalse ; then bfd_hppa_arch) ta="$ta hppa-dis.lo" ;; bfd_i386_arch) ta="$ta i386-dis.lo" ;; bfd_i860_arch) ;; - bfd_i960_arch) ta="$ta i960-dis.lo" ;; + bfd_i960_arch) ta="$ta $cgen_files i960-dis.lo i960c-opc.lo i960c-asm.lo i960c-dis.lo" ;; bfd_m32r_arch) ta="$ta $cgen_files m32r-opc.lo m32r-asm.lo m32r-dis.lo" ;; bfd_m68k_arch) ta="$ta m68k-dis.lo m68k-opc.lo" ;; bfd_m88k_arch) ta="$ta m88k-dis.lo" ;; @@ -3870,10 +3870,8 @@ if test x${all_targets} = xfalse ; then bfd_dvp_arch) ta="$ta mips-dis.lo mips-opc.lo mips16-opc.lo dvp-dis.lo dvp-opc.lo" ;; # end-sanitize-sky bfd_v850_arch) ta="$ta v850-opc.lo v850-dis.lo" ;; -# start-sanitize-v850e bfd_v850e_arch) ta="$ta v850-opc.lo v850-dis.lo" ;; bfd_v850ea_arch) ta="$ta v850-opc.lo v850-dis.lo" ;; -# end-sanitize-v850e bfd_vax_arch) ta="$ta vax-dis.lo" ;; bfd_w65_arch) ta="$ta w65-dis.lo" ;; bfd_we32k_arch) ;; diff --git a/opcodes/configure.in b/opcodes/configure.in index 7f931bd..343d7d9 100644 --- a/opcodes/configure.in +++ b/opcodes/configure.in @@ -1,4 +1,4 @@ -dnl Process this file with autoconf to produce a configure script. +nl Process this file with autoconf to produce a configure script. dnl AC_PREREQ(2.12.1) @@ -163,9 +163,7 @@ if test x${all_targets} = xfalse ; then bfd_convex_arch) ;; bfd_d10v_arch) ta="$ta d10v-dis.lo d10v-opc.lo" ;; bfd_d30v_arch) ta="$ta d30v-dis.lo d30v-opc.lo" ;; -# start-sanitize-fr30 bfd_fr30_arch) ta="$ta $cgen_files fr30-opc.lo fr30-asm.lo fr30-dis.lo" ;; -# end-sanitize-fr30 bfd_h8300_arch) ta="$ta h8300-dis.lo" ;; bfd_h8500_arch) ta="$ta h8500-dis.lo" ;; bfd_hppa_arch) ta="$ta hppa-dis.lo" ;; @@ -194,10 +192,8 @@ if test x${all_targets} = xfalse ; then bfd_dvp_arch) ta="$ta mips-dis.lo mips-opc.lo mips16-opc.lo dvp-dis.lo dvp-opc.lo" ;; # end-sanitize-sky bfd_v850_arch) ta="$ta v850-opc.lo v850-dis.lo" ;; -# start-sanitize-v850e bfd_v850e_arch) ta="$ta v850-opc.lo v850-dis.lo" ;; bfd_v850ea_arch) ta="$ta v850-opc.lo v850-dis.lo" ;; -# end-sanitize-v850e bfd_vax_arch) ta="$ta vax-dis.lo" ;; bfd_w65_arch) ta="$ta w65-dis.lo" ;; bfd_we32k_arch) ;; diff --git a/sim/.Sanitize b/sim/.Sanitize index d1df4e7..1772ebc 100644 --- a/sim/.Sanitize +++ b/sim/.Sanitize @@ -125,34 +125,6 @@ else done fi -v850_files="configure configure.in ChangeLog" -if ( echo $* | grep keep\-v850e > /dev/null ) ; then - for i in $v850_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping v850e stuff in $i - fi - fi - done -else - for i in $v850_files ; do - if test ! -d $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"v850e\" from $i... - fi - cp $i new - sed '/start\-sanitize\-v850e/,/end-\sanitize\-v850e/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - vr4320_files="ChangeLog" if ( echo $* | grep keep\-vr4320 > /dev/null ) ; then for i in $vr4320_files ; do diff --git a/sim/ChangeLog b/sim/ChangeLog index 7da0160..411aa31 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,3 +1,19 @@ +1999-01-04 Jason Molenda (jsm@bugshack.cygnus.com) + + * configure.in: Require autoconf 2.12.1 or higher. + +1998-12-08 James E Wilson + + * configure.in (i960-*-*): Add. + * configure: Rebuild. + +start-sanitize-gxsim +1998-11-13 Frank Ch. Eigler + + * configure.in: Added "--enable-sim-gx" option. + * configure: Regenerated. + +end-sanitize-gxsim Wed Nov 4 19:11:43 1998 Dave Brolley * configure.in: Added case for fr30-*-*. @@ -63,13 +79,11 @@ Wed Oct 8 12:38:48 1997 Andrew Cagney target. * configure: Regenerate. -start-sanitize-v850e Fri Sep 12 13:10:31 1997 Andrew Cagney * configure.in (extra_subdirs): v850ea needs igen. * configure: Re-generate. -end-sanitize-v850e Mon Sep 1 16:48:23 1997 Andrew Cagney * configure.in (testdir): When a testsuite directory, add that to @@ -91,7 +105,6 @@ Mon Aug 25 16:26:53 1997 Andrew Cagney simulator. * configure: Regenerate. -start-sanitize-v850e Mon Aug 18 10:56:59 1997 Nick Clifton * configure.in (extra_subdirs): Add v850e target. @@ -100,7 +113,6 @@ Mon Aug 18 10:56:59 1997 Nick Clifton * configure.in (extra_subdirs): Add v850ea target. -end-sanitize-v850e Fri Jul 25 11:40:47 1997 Doug Evans * configure.in (sparc*-*-*): Don't build erc32. diff --git a/sim/configure b/sim/configure index 5c9934a..0a52d68 100755 --- a/sim/configure +++ b/sim/configure @@ -13,6 +13,8 @@ ac_default_prefix=/usr/local # Any additions from configure.in: ac_help="$ac_help --enable-sim " +ac_help="$ac_help +" # Initialize some variables set by options. # The variables have the same names as the options, with @@ -527,7 +529,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:531: checking for $ac_word" >&5 +echo "configure:533: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -556,7 +558,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:560: checking for $ac_word" >&5 +echo "configure:562: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -606,7 +608,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:610: checking for $ac_word" >&5 +echo "configure:612: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -637,7 +639,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:641: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:643: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -647,11 +649,11 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -671,12 +673,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:675: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:677: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:680: checking whether we are using GNU C" >&5 +echo "configure:682: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -685,7 +687,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:689: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -704,7 +706,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:708: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:710: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -766,7 +768,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:770: checking for a BSD compatible install" >&5 +echo "configure:772: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -823,7 +825,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:827: checking host system type" >&5 +echo "configure:829: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -844,7 +846,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:848: checking build system type" >&5 +echo "configure:850: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -870,7 +872,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:874: checking for $ac_word" >&5 +echo "configure:876: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -901,7 +903,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:905: checking for $ac_word" >&5 +echo "configure:907: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -932,7 +934,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:936: checking for $ac_word" >&5 +echo "configure:938: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1011,7 +1013,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1015: checking host system type" >&5 +echo "configure:1017: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1032,7 +1034,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:1036: checking target system type" >&5 +echo "configure:1038: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -1050,7 +1052,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1054: checking build system type" >&5 +echo "configure:1056: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1094,7 +1096,7 @@ test "$program_transform_name" = "" && program_transform_name="s,x,x," # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1098: checking for $ac_word" >&5 +echo "configure:1100: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1123,7 +1125,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1127: checking for $ac_word" >&5 +echo "configure:1129: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1173,7 +1175,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1177: checking for $ac_word" >&5 +echo "configure:1179: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1204,7 +1206,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1208: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1210: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1214,11 +1216,11 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1238,12 +1240,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1242: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1244: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1247: checking whether we are using GNU C" >&5 +echo "configure:1249: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1252,7 +1254,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1256: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1271,7 +1273,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1275: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1277: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1309,7 +1311,7 @@ AR=${AR-ar} # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1313: checking for $ac_word" >&5 +echo "configure:1315: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1380,6 +1382,7 @@ case "${target}" in fr30-*-*) sim_target=fr30 ;; h8300*-*-*) sim_target=h8300 ;; h8500-*-*) sim_target=h8500 ;; + i960-*-*) sim_target=i960 ;; m32r-*-*) sim_target=m32r ;; mips*-*-*) # The MIPS simulator can only be compiled by gcc. @@ -1418,7 +1421,6 @@ case "${target}" in extra_subdirs="${extra_subdirs} igen" only_if_gcc=yes ;; -# start-sanitize-v850e v850e-*-*) # The V850 simulator can only be compiled by gcc. sim_target=v850 @@ -1431,7 +1433,6 @@ case "${target}" in extra_subdirs="${extra_subdirs} igen" only_if_gcc=yes ;; -# end-sanitize-v850e w65-*-*) sim_target=w65 # The w65 is suffering from gradual decay. @@ -1458,6 +1459,22 @@ case "${target}" in esac +# start-sanitize-gxsim +# Check whether --enable-sim-gx or --disable-sim-gx was given. +if test "${enable_sim_gx+set}" = set; then + enableval="$enable_sim_gx" + case "${enableval}" in + yes) + if test -d ${srcdir}/${sim_target}-gx ; then + extra_subdirs="${sim_target}-gx" + else + echo "configure: warning: GX simulator not available for ${sim_target}" 1>&2 + fi ;; +esac +fi +# end-sanitize-gxsim + + # Is there a testsuite directory for the target? testdir=`echo ${target} | sed -e 's/-.*-/-/'` if test -r ${srcdir}/testsuite/${testdir}/configure ; then diff --git a/sim/configure.in b/sim/configure.in index d5bacf1..9ecd812 100644 --- a/sim/configure.in +++ b/sim/configure.in @@ -97,7 +97,6 @@ case "${target}" in extra_subdirs="${extra_subdirs} igen" only_if_gcc=yes ;; -# start-sanitize-v850e v850e-*-*) # The V850 simulator can only be compiled by gcc. sim_target=v850 @@ -110,7 +109,6 @@ case "${target}" in extra_subdirs="${extra_subdirs} igen" only_if_gcc=yes ;; -# end-sanitize-v850e w65-*-*) sim_target=w65 # The w65 is suffering from gradual decay. diff --git a/sim/v850/.Sanitize b/sim/v850/.Sanitize index cf0debb..211b760 100644 --- a/sim/v850/.Sanitize +++ b/sim/v850/.Sanitize @@ -41,32 +41,4 @@ Things-to-lose: Do-last: -v850e_files="interp.c simops.c v850.igen v850-dc ChangeLog sim-main.h" -if ( echo $* | grep keep\-v850e > /dev/null ) ; then - for i in $v850e_files ; do - if test -r $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Keeping v850e stuff in $i - fi - fi - done -else - for i in $v850e_files ; do - if test -r $i && (grep sanitize-v850e $i > /dev/null) ; then - if [ -n "${verbose}" ] ; then - echo Removing traces of \"v850e\" from $i... - fi - cp $i new - sed '/start\-sanitize\-v850e/,/end-\sanitize\-v850e/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - if [ -n "${verbose}" ] ; then - echo Caching $i in .Recover... - fi - mv $i .Recover - fi - mv new $i - fi - done -fi - # End of file. -- 2.7.4