* ld-sh/sh64/shmix-1.s: Add align to match data alignment.

	* ld-sh/sh64/shmix-3.s: Likewise.
	* ld-sh/sh64/mix1.sd: Update.
	* ld-sh/sh64/mix1.xd: Likewise.
	* ld-sh/sh64/mix1-noexp.sd: Likewise.
	* ld-sh/sh64/mix2.sd: Likewise.
	* ld-sh/sh64/mix2.xd: Likewise.
	* ld-sh/sh64/mix2-noexp.sd: Likewise.

8 files changed, 26 insertions, 24 deletions

diff --git a/ld/testsuite/ld-sh/sh64/mix1-noexp.sd b/ld/testsuite/ld-sh/sh64/mix1-noexp.sd
index 71824b3..fe73136 100644
--- a/ld/testsuite/ld-sh/sh64/mix1-noexp.sd
+++ b/ld/testsuite/ld-sh/sh64/mix1-noexp.sd
@@ -2,13 +2,13 @@
 .*:     file format .*-sh64
 
 Contents of section \.text:
- 1000 8902c700 00090009 00090000 100a0000  .*
- 1010 10040000 10210000 effff240 efffea50  .*
+ 1000 8902c700 00090009 00090009 0000100c  .*
+ 1010 00001004 00001021 effff240 efffea50  .*
  1020 cc401360 cc4086d0 ebfffa70 6ff0fff0  .*
 Contents of section \.data:
  10b0 000010b0 00001004 00001021           .*
 Contents of section \.stack:
  80000 deaddead                            .*
 Contents of section \.cranges:
- 0000 00001000 00000016 00020000 10180000  .*
+ 0000 00001000 00000018 00020000 10180000  .*
  0010 00180003                             .*
diff --git a/ld/testsuite/ld-sh/sh64/mix1.sd b/ld/testsuite/ld-sh/sh64/mix1.sd
index b884013..c5cc4b1 100644
--- a/ld/testsuite/ld-sh/sh64/mix1.sd
+++ b/ld/testsuite/ld-sh/sh64/mix1.sd
@@ -2,8 +2,8 @@
 .*:     file format .*-sh64
 
 Contents of section \.text:
- 1000 8902c700 00090009 00090000 100a0000  .*
- 1010 10040000 10310000 cffffd90 cbffa190  .*
+ 1000 8902c700 00090009 00090009 0000100c  .*
+ 1010 00001004 00001031 cffffd90 cbffa190  .*
  1020 6bf56640 cffffd90 cbff6190 6bf56650  .*
  1030 cc000360 c8401360 cc0002d0 c840c6d0  .*
  1040 ebfff270 6ff0fff0                    .*
@@ -12,5 +12,5 @@ Contents of section \.data:
 Contents of section \.stack:
  80000 deaddead                            .*
 Contents of section \.cranges:
- 0000 00001000 00000016 00020000 10180000  .*
+ 0000 00001000 00000018 00020000 10180000  .*
  0010 00300003                             .*
diff --git a/ld/testsuite/ld-sh/sh64/mix1.xd b/ld/testsuite/ld-sh/sh64/mix1.xd
index 9beb969..1ee9c8c 100644
--- a/ld/testsuite/ld-sh/sh64/mix1.xd
+++ b/ld/testsuite/ld-sh/sh64/mix1.xd
@@ -16,7 +16,7 @@ Sections:
 Idx Name          Size      VMA       LMA       File off  Algn
   0 \.text         00000048  0+1000  0+1000  00000100  2\*\*2
                   CONTENTS, ALLOC, LOAD, READONLY, CODE
-  1 \.data         0000000c  0+10c8  0+10c8  00000148  2\*\*0
+  1 \.data         0000000c  0+10c8  0+10c8  00000148  2\*\*2
                   CONTENTS, ALLOC, LOAD, DATA
   2 \.ctors        00000000  0+10d4  0+10d4  00000184  2\*\*0
                   CONTENTS
diff --git a/ld/testsuite/ld-sh/sh64/mix2-noexp.sd b/ld/testsuite/ld-sh/sh64/mix2-noexp.sd
index b12f6b0..9112cfc 100644
--- a/ld/testsuite/ld-sh/sh64/mix2-noexp.sd
+++ b/ld/testsuite/ld-sh/sh64/mix2-noexp.sd
@@ -2,15 +2,15 @@
 .*:     file format .*-sh64
 
 Contents of section \.text:
- 1000 cc4048e0 cc40b8e0 ec000e60 6ff0fff0  .*
- 1010 0009c700 c7000009 00090000 10090000  .*
- 1020 10bc                                 .*
+ 1000 cc4048e0 cc40c0e0 ec000e60 6ff0fff0  .*
+ 1010 0009c700 c7000009 00090009 00001009  .*
+ 1020 000010bc                             .*
 Contents of section \.rodata:
- 1022 00001018 000010c4 0000100d 00001026  .*
+ 1024 00001018 000010c4 0000100d 00001028  .*
 Contents of section \.data:
  10b8 00000000 00001014 00000000 000010bc  .*
 Contents of section \.stack:
  80000 deaddead                            .*
 Contents of section \.cranges:
  0000 00001000 00000010 00030000 10100000  .*
- 0010 00120002                             .*
+ 0010 00140002                             .*
diff --git a/ld/testsuite/ld-sh/sh64/mix2.sd b/ld/testsuite/ld-sh/sh64/mix2.sd
index 4ae984c..122a472 100644
--- a/ld/testsuite/ld-sh/sh64/mix2.sd
+++ b/ld/testsuite/ld-sh/sh64/mix2.sd
@@ -2,16 +2,16 @@
 .*:     file format .*-sh64
 
 Contents of section \.text:
- 1000 cc0000e0 c84088e0 cc0000e0 c840f8e0  .*
+ 1000 cc0000e0 c84088e0 cc0000e0 c84100e0  .*
  1010 cc000190 c8003190 6bf56660 6ff0fff0  .*
- 1020 0009c700 c7000009 00090000 10110000  .*
- 1030 10cc                                 .*
+ 1020 0009c700 c7000009 00090009 00001011  .*
+ 1030 000010cc                             .*
 Contents of section \.rodata:
- 1032 00001028 000010d4 0000101d 00001036  .*
+ 1034 00001028 000010d4 0000101d 00001038  .*
 Contents of section \.data:
  10c8 00000000 00001024 00000000 000010cc  .*
 Contents of section \.stack:
  80000 deaddead                            .*
 Contents of section \.cranges:
  0000 00001000 00000020 00030000 10200000  .*
- 0010 00120002                             .*
+ 0010 00140002                             .*
diff --git a/ld/testsuite/ld-sh/sh64/mix2.xd b/ld/testsuite/ld-sh/sh64/mix2.xd
index 8137521..f5b099f 100644
--- a/ld/testsuite/ld-sh/sh64/mix2.xd
+++ b/ld/testsuite/ld-sh/sh64/mix2.xd
@@ -7,7 +7,7 @@ start address 0x0+1001
 
 Program Header:
     LOAD off    0x0+100 vaddr 0x0+1000 paddr 0x0+1000 align 2\*\*7
-         filesz 0x0+42 memsz 0x0+42 flags r-x
+         filesz 0x0+44 memsz 0x0+44 flags r-x
     LOAD off    0x0+148 vaddr 0x0+10c8 paddr 0x0+10c8 align 2\*\*7
          filesz 0x0+10 memsz 0x0+10 flags rw-
     LOAD off    0x0+180 vaddr 0x0+80000 paddr 0x0+80000 align 2\*\*7
@@ -15,11 +15,11 @@ Program Header:
 
 Sections:
 Idx Name          Size      VMA       LMA       File off  Algn
-  0 \.text         00000032  0+1000  0+1000  00000100  2\*\*0
+  0 \.text         00000034  0+1000  0+1000  00000100  2\*\*2
                   CONTENTS, ALLOC, LOAD, READONLY, CODE
-  1 \.rodata       00000010  0+1032  0+1032  00000132  2\*\*0
+  1 \.rodata       00000010  0+1034  0+1034  00000134  2\*\*2
                   CONTENTS, ALLOC, LOAD, READONLY, DATA
-  2 \.data         00000010  0+10c8  0+10c8  00000148  2\*\*0
+  2 \.data         00000010  0+10c8  0+10c8  00000148  2\*\*2
                   CONTENTS, ALLOC, LOAD, DATA
   3 \.ctors        00000000  0+10d8  0+10d8  00000184  2\*\*0
                   CONTENTS
@@ -35,7 +35,7 @@ Idx Name          Size      VMA       LMA       File off  Algn
                   CONTENTS, DEBUGGING, SORT_ENTRIES
 SYMBOL TABLE:
 0+1000 l    d  \.text	0+ 
-0+1032 l    d  \.rodata	0+ 
+0+1034 l    d  \.rodata	0+ 
 0+10c8 l    d  \.data	0+ 
 0+10d8 l    d  \.ctors	0+ 
 0+10d8 l    d  \.dtors	0+ 
@@ -47,9 +47,9 @@ SYMBOL TABLE:
 0+ l    d  \*ABS\*	0+ 
 0+ l    d  \*ABS\*	0+ 
 0+1020 l       \.text	0+ locallabel
-0+103e g       \.rodata	0+ compactlabel4
+0+1040 g       \.rodata	0+ compactlabel4
 0+101c g       \.text	0+ 0x04 medialabel2
-0+1036 g       \.rodata	0+ medialabel3
+0+1038 g       \.rodata	0+ medialabel3
 0+1022 g       \.text	0+ compactlabel1
 0+1024 g       \.text	0+ compactlabel2
 0+1028 g       \.text	0+ compactlabel3
diff --git a/ld/testsuite/ld-sh/sh64/shmix-1.s b/ld/testsuite/ld-sh/sh64/shmix-1.s
index 0320b62..e078ac2 100644
--- a/ld/testsuite/ld-sh/sh64/shmix-1.s
+++ b/ld/testsuite/ld-sh/sh64/shmix-1.s
@@ -10,6 +10,7 @@ start2:
 	nop
 forw:
 	nop
+	.align 2
 	.long $
 	.long start2
 	.long mediacode2
diff --git a/ld/testsuite/ld-sh/sh64/shmix-3.s b/ld/testsuite/ld-sh/sh64/shmix-3.s
index 637a982..42d1212 100644
--- a/ld/testsuite/ld-sh/sh64/shmix-3.s
+++ b/ld/testsuite/ld-sh/sh64/shmix-3.s
@@ -17,6 +17,7 @@ compactlabel2:
 	nop
 compactlabel3:
 	nop
+	.align 2
 	.long medialabel1
 	.long medialabel4