Back out yesterday's change for using host endian order in 960 bout files.

diff --git a/bfd/targets.c b/bfd/targets.c
index 49a819616bc444f85097f6f0479dca5aaa4e11c0..8cd9ffff812464338a27c1128816b6627889236a 100644 (file)
--- a/bfd/targets.c
+++ b/bfd/targets.c
@@ -401,27 +401,10 @@ extern bfd_target hppa_vec;
 #ifdef DEFAULT_VECTOR
 extern bfd_target DEFAULT_VECTOR;
 #endif
-#ifdef HOST_BIG_ENDIAN_DEFAULT_VECTOR
-extern bfd_target HOST_BIG_ENDIAN_DEFAULT_VECTOR;
-#endif
-#ifdef HOST_LITTLE_ENDIAN_DEFAULT_VECTOR
-extern bfd_target HOST_LITTLE_ENDIAN_DEFAULT_VECTOR;
-#endif
 
 #ifdef SELECT_VECS
 
 bfd_target *target_vector[] = {
-
-  /* 960 bout format depends on the host, so let targets choose a
-     default vector even if the provide SELECT_VECS.  */
-#ifdef HOST_BIG_ENDIAN_DEFAULT_VECTOR
-#ifdef HOST_BIG_ENDIAN_P
-       &HOST_BIG_ENDIAN_DEFAULT_VECTOR,
-#else /* ! defined (HOST_BIG_ENDIAN_P) */
-       &HOST_LITTLE_ENDIAN_DEFAULT_VECTOR,
-#endif /* ! defined (HOST_BIG_ENDIAN_P) */
-#endif /* defined (HOST_BIG_ENDIAN_DEFAULT_VECTOR) */
-
        SELECT_VECS,
        0
 };
@@ -432,15 +415,7 @@ bfd_target *target_vector[] = {
 
 #ifdef DEFAULT_VECTOR
        &DEFAULT_VECTOR,
-#else /* ! defined (DEFAULT_VECTOR) */
-#ifdef HOST_BIG_ENDIAN_DEFAULT_VECTOR
-#ifdef HOST_BIG_ENDIAN_P
-       &HOST_BIG_ENDIAN_DEFAULT_VECTOR,
-#else /* ! defined (HOST_BIG_ENDIAN_P) */
-       &HOST_LITTLE_ENDIAN_DEFAULT_VECTOR,
-#endif /* ! defined (HOST_BIG_ENDIAN_P) */
-#endif /* defined (HOST_BIG_ENDIAN_DEFAULT_VECTOR) */
-#endif /* ! defined (DEFAULT_VECTOR) */
+#endif
 
        &i386coff_vec,
        &i386aout_vec,
@@ -490,15 +465,7 @@ bfd_target *target_vector[] = {
 bfd_target *default_vector[] = {
 #ifdef DEFAULT_VECTOR
        &DEFAULT_VECTOR,
-#else /* ! defined (DEFAULT_VECTOR) */
-#ifdef HOST_BIG_ENDIAN_DEFAULT_VECTOR
-#ifdef HOST_BIG_ENDIAN_P
-       &HOST_BIG_ENDIAN_DEFAULT_VECTOR,
-#else /* ! defined (HOST_BIG_ENDIAN_P) */
-       &HOST_LITTLE_ENDIAN_DEFAULT_VECTOR,
-#endif /* ! defined (HOST_BIG_ENDIAN_P) */
-#endif /* defined (HOST_BIG_ENDIAN_DEFAULT_VECTOR) */
-#endif /* ! defined (DEFAULT_VECTOR) */
+#endif
        0,
 };
 

diff --git a/ld/gld960.em b/ld/gld960.em
index be375d5a8d0c29c481461188db05841cf035ee41..b16c8ff7e42c44c29f2e22d8b8502e09e6fb6dec 100644 (file)
--- a/ld/gld960.em
+++ b/ld/gld960.em
@@ -105,11 +105,7 @@ gld960_choose_target()
   if (from_outside != (char *)NULL)
     return from_outside;
 
-#ifdef HOST_BIG_ENDIAN_P
-  return "b.out.big";
-#else
   return "b.out.little";
-#endif
 
 #endif
 }