From 0c92ba5f58ea1b2c2ee6401419899883b726b39e Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Fri, 1 Dec 2000 19:11:20 +0000
Subject: [PATCH] Fix testcase and test results

---
 gas/testsuite/ChangeLog        |  6 ++++++
 gas/testsuite/gas/mips/empic.d | 14 +++++---------
 gas/testsuite/gas/mips/empic.s | 11 +++++------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index ece202257a9..1ee4fe7ea81 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -3,6 +3,12 @@
         * gas/mips/mips16.d: Expect mips16 nops to be used for padding
         when mips16 code generation is enabled.
 
+	* gas/mips/empic.d: Adjust for the fact that the difference
+	between two symbols in the same section are not expected to
+	generate a reloc.
+	* gas/mips/empic.s: Likewise.  Also, correct typo in comment
+	about expected relocs.
+	
 2000-11-30  Diego Novillo  <dnovillo@redhat.com>
 
 	* intel.s, intel.d: New test for @GOT references.
diff --git a/gas/testsuite/gas/mips/empic.d b/gas/testsuite/gas/mips/empic.d
index 3c6b4d43bfd..bf8c6372924 100644
--- a/gas/testsuite/gas/mips/empic.d
+++ b/gas/testsuite/gas/mips/empic.d
@@ -55,12 +55,8 @@ OFFSET           TYPE              VALUE
 0+00000b8 R_MIPS_64         \.text
 0+00000cc R_MIPS_GNU_REL16_S2  \.text
 0+00000d0 R_MIPS_GNU_REL16_S2  \.text
-0+00000d4 R_MIPS_GNU_REL_HI16  \.text
-0+00000d8 R_MIPS_GNU_REL_LO16  \.text
-0+00000dc R_MIPS_GNU_REL_HI16  \.text
-0+00000e0 R_MIPS_GNU_REL_LO16  \.text
-0+00000e4 R_MIPS_32         \.text
-0+00000f0 R_MIPS_64         \.text
+0+00000dc R_MIPS_32         \.text
+0+00000e8 R_MIPS_64         \.text
 
 
 RELOCATION RECORDS FOR \[\.foo\]:
@@ -126,9 +122,9 @@ Contents of section \.text:
  00a0 3c030000 [26]46300d8 3c030000 [26]46300e8  .*
  00b0 000000cc 00000034 00000000 000000cc  .*
  00c0 00000000 00000034 00000000 10000032  .*
- 00d0 10000033 3c030000 [26]463010c 3c030000  .*
- 00e0 [26]463011c 000000cc 00000034 00000000  .*
- 00f0 00000000 000000cc 00000000 00000034  .*
+ 00d0 10000033 24030034 2403003c 000000cc  .*
+ 00e0 00000034 00000000 00000000 000000cc  .*
+ 00f0 00000000 00000034                    .*
 Contents of section \.data:
 Contents of section \.reginfo:
  0000 80000008 00000000 00000000 00000000  .*
diff --git a/gas/testsuite/gas/mips/empic.s b/gas/testsuite/gas/mips/empic.s
index 2c485b3568a..2f273df97fd 100644
--- a/gas/testsuite/gas/mips/empic.s
+++ b/gas/testsuite/gas/mips/empic.s
@@ -40,9 +40,10 @@ l5:
 	b	2f		# R_MIPS_GNU_REL16_S2	.text 32
 	b	2f+4		# R_MIPS_GNU_REL16_S2	.text 33
 	la	$3,2f-l5	# R_MIPS_GNU_REL_HI16	.text 0
-				# R_MIPS_GNU_REL_HI16	.text D8
+	                        # R_MIPS_GNU_REL_LO16   .text D8
 	la	$3,2f+8-l5	# R_MIPS_GNU_REL_HI16	.text 0
-				# R_MIPS_GNU_REL_HI16	.text E8
+	                        # R_MIPS_GNU_REL_LO16   .text E8
+
 
 	.word	2f		# R_MIPS_32	.text CC
 	.word	2f-l5		# R_MIPS_PC32	.text EC  or 34
@@ -52,10 +53,8 @@ l5:
 2:				# at address 0xCC.
 	b	2b		# R_MIPS_GNU_REL16_S2	.text 32
 	b	2b+4		# R_MIPS_GNU_REL16_S2	.text 33
-	la	$3,2b-l5	# R_MIPS_GNU_REL_HI16	.text 0
-				# R_MIPS_GNU_REL_HI16	.text 10C
-	la	$3,2b+8-l5	# R_MIPS_GNU_REL_HI16	.text 0
-				# R_MIPS_GNU_REL_HI16	.text 11C
+	la      $3,2b-l5        # 34
+	la      $3,2b+8-l5      # 3C
 	.word	2b		# R_MIPS_32	.text CC
 	.word	2b-l5		# R_MIPS_PC32	.text 11C  or 34
 	nop
-- 
2.30.2