From 645dc66c72dd0a380df64a988c0e599e5bcfd39c Mon Sep 17 00:00:00 2001
From: Thiemo Seufer <ths@networkno.de>
Date: Thu, 15 Nov 2001 09:50:00 +0000
Subject: [PATCH] 	* config/tc-mips.c (mips_ip): Re-allow %hi() op for
 non-ELF assembler.

---
 gas/ChangeLog        | 4 ++++
 gas/config/tc-mips.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4a2ed826300..2eaa5fd91e1 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2001-11-15  Thiemo Seufer <seufer@csv.ica.uni-stuttgart.de>
+
+	* config/tc-mips.c (mips_ip): Re-allow %hi() op for non-ELF assembler.
+
 2001-11-15  Alan Modra  <amodra@bigpond.net.au>
 
 	* frags.c (frag_grow): Revert last change.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 7f20c65bd1b..2e4a89034d0 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -8374,14 +8374,14 @@ mips_ip (str, ip)
 		      if (imm_expr.X_op == O_constant)
 			imm_expr.X_add_number =
 			  (imm_expr.X_add_number >> 16) & 0xffff;
-#ifdef OBJ_ELF
-		      else if (c == S_EX_HIGHEST)
-			  *imm_reloc = BFD_RELOC_MIPS_HIGHEST;
 		      else if (c == S_EX_HI)
 			{
 			  *imm_reloc = BFD_RELOC_HI16_S;
 			  imm_unmatched_hi = true;
 			}
+#ifdef OBJ_ELF
+		      else if (c == S_EX_HIGHEST)
+			  *imm_reloc = BFD_RELOC_MIPS_HIGHEST;
 		      else if (c == S_EX_GP_REL)
 			{
 			  /* This occurs in NewABI only.  */