[patch] gas/configure.in: Use right string inequality operator and set right file

[patch] gas/configure.in: Use right string inequality operator and set right file

[Hans-Peter Nilsson]

One bug cancelled the other for a recent change.  An invalid
operator was used for string compare, so te_file was never set
to the wrong value.  Setting te_file to multi would cause
te-multi.h to be referenced, but it does not exist anymore;
te-generic.h is the one to use (identical contents).

An alternative approach would be to delete the whole "if", since
it would never be executed; I'm not really sure why te_file is
set here at all.  Note also that te-tmips.h is effectively the
same as te-generic.h anyway.  A comment from Koundinya or Alan
would be helpful.

Or, Ok to commit?

2000-07-12  Hans-Peter Nilsson  <hp@axis.com>

	* configure.in (DEFAULT_EMULATION setting): Use operator != for
	string inequality test, not -ne.  Set te_file to generic, not
	multi.
	* configure: Regenerate.

Index: configure.in
===================================================================
RCS file: /cvs/src/src/gas/configure.in,v
retrieving revision 1.34
diff -p -c -r1.34 configure.in
*** configure.in	2000/07/09 08:16:21	1.34
--- configure.in	2000/07/12 15:22:33
*************** if test `set . $emfiles ; shift ; echo $
*** 736,744 ****
    case "${obj_format}${emfiles}" in
      multi* | *mips*)
    # if te_file is tmips, that means the target is mips-*-sysv4*MP* and we do
!   # not set it to multi.
!       if [[ $te_file -ne "tmips" ]]; then
!         te_file=multi
        fi
        extra_objects="$extra_objects $emfiles"
        AC_DEFINE(USE_EMULATIONS, 1, [Use emulation support?]) ;;
--- 741,749 ----
    case "${obj_format}${emfiles}" in
      multi* | *mips*)
    # if te_file is tmips, that means the target is mips-*-sysv4*MP* and we do
!   # not set it to generic.
!       if [[ $te_file != "tmips" ]]; then
!         te_file=generic
        fi
        extra_objects="$extra_objects $emfiles"
        AC_DEFINE(USE_EMULATIONS, 1, [Use emulation support?]) ;;

brgds, H-P

Re: [patch] gas/configure.in: Use right string inequality operatorand set right file

[Alan Modra]

On Wed, 12 Jul 2000, Hans-Peter Nilsson wrote:

> An alternative approach would be to delete the whole "if", since
> it would never be executed; I'm not really sure why te_file is
> set here at all.  Note also that te-tmips.h is effectively the
> same as te-generic.h anyway.

Please delete the "if".  I'm guessing this patch came from an old tree
when we still used te-multi.h.  The changes I made in this area on
2000-01-27 were to make these sort of hacks unnecessary.

Regards, Alan Modra
-- 
Linuxcare.  Support for the Revolution.

Re: [patch] gas/configure.in: Use right string inequality operatorand set right file

[Hans-Peter Nilsson]

> Date: Thu, 13 Jul 2000 12:11:45 +1000 (EST)
> From: Alan Modra <alan@linuxcare.com.au>

> On Wed, 12 Jul 2000, Hans-Peter Nilsson wrote:
> 
> > An alternative approach would be to delete the whole "if", since
> > it would never be executed; I'm not really sure why te_file is
> > set here at all.  Note also that te-tmips.h is effectively the
> > same as te-generic.h anyway.
> 
> Please delete the "if".  I'm guessing this patch came from an old tree
> when we still used te-multi.h.  The changes I made in this area on
> 2000-01-27 were to make these sort of hacks unnecessary.

Right.  Ok to commit this?

2000-07-13  Hans-Peter Nilsson  <hp@axis.com>

	* configure.in (DEFAULT_EMULATION setting): Revert part of
	2000-07-01 change that set te_multi=multi unless set to tmips.
	* configure: Regenerate.

Index: configure.in
===================================================================
RCS file: /cvs/src/src/gas/configure.in,v
retrieving revision 1.34
diff -p -c -r1.34 configure.in
*** configure.in	2000/07/09 08:16:21	1.34
--- configure.in	2000/07/13 10:48:24
*************** if test `set . $emfiles ; shift ; echo $
*** 735,745 ****
    # USE_EMULATIONS or include any of the e-files as they will only be bloat.
    case "${obj_format}${emfiles}" in
      multi* | *mips*)
-   # if te_file is tmips, that means the target is mips-*-sysv4*MP* and we do
-   # not set it to multi.
-       if [[ $te_file -ne "tmips" ]]; then
-         te_file=multi
-       fi
        extra_objects="$extra_objects $emfiles"
        AC_DEFINE(USE_EMULATIONS, 1, [Use emulation support?]) ;;
    esac
--- 735,740 ----

brgds, H-P

Re: [patch] gas/configure.in: Use right string inequality operatorand set right file

[Alan Modra]

On Thu, 13 Jul 2000, Hans-Peter Nilsson wrote:

> Right.  Ok to commit this?

I checked it in for you, along with kk's removal of "test -d /usr/dde"
Thanks.

Alan Modra
-- 
Linuxcare.  Support for the Revolution.