* elf32-h8300.c (R_H8_DIR32A16): Fix name field.

(elf32_h8_relax_section) <R_H8_DIR16A8>: Adjust position of relocation.
<R_H8_DIR32A16>: Fix type of relocation.

* ld-h8300/h8300.exp: Replace loop with explicit list.  Run relax.d
unconditionally.  Run relax-2.d for *-elf targets.
* ld-h8300/relax.d: Fix typo.
* ld-h8300/relax.s: Add 0x prefixes.
* ld-h8300/relad-2.[sd]: New test.

ld/testsuite/ld-h8300/h8300.exp

@@ -1,5 +1,5 @@
 # Expect script for ld-h8300 tests
-# Copyright 2002 Free Software Foundation, Inc.
+# Copyright 2002, 2003 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -24,9 +24,8 @@ if ![istarget h8300-*-*] {
     return
 }
 
-set test_list [lsort [glob -nocomplain $srcdir/$subdir/*.d]]
-foreach test $test_list {
-    # We need to strip the ".d", but can leave the dirname.
-    verbose [file rootname $test]
-    run_dump_test [file rootname $test]
+run_dump_test relax
+
+if {[istarget *-elf]} {
+    run_dump_test relax-2
 }

ld/testsuite/ld-h8300/relax-2.d

@@ -0,0 +1,11 @@
+# name: H8300 Relaxation Test 2
+# ld: --relax -m h8300helf
+# objdump: -d --no-show-raw-insn
+
+.*:     file format .*-h8300
+
+Disassembly of section .text:
+
+00000100 <_start>:
+ *100:	28 67       * mov.b	@0x67:8,r0l
+ *102:	6a 08 43 21 * mov.b	@0x4321:16,r0l

ld/testsuite/ld-h8300/relax-2.s

@@ -0,0 +1,8 @@
+	.h8300h
+	.globl	_start
+_start:
+	mov.b	@foo:16,r0l
+	mov.b	@bar:32,r0l
+
+	.equ	foo,0xffff67
+	.equ	bar,0x4321

ld/testsuite/ld-h8300/relax.d

@@ -1,4 +1,4 @@
-# name: H8300 Relxation Test
+# name: H8300 Relaxation Test
 # ld: --relax
 # objdump: -d --no-show-raw-insn
 
@@ -11,8 +11,8 @@ Disassembly of section .text:
 
 00000100 <_start>:
  100:	0d 00             mov.w	r0,r0
- 102:	47 02             beq	.+2 \(106\)
- 104:	55 02             bsr	.+2 \(108\)
+ 102:	47 02             beq	.+2 \(0x106\)
+ 104:	55 02             bsr	.+2 \(0x108\)
 
 00000106 <.L1>:
  106:	54 70             rts