2 files changed, 8 insertions, 14 deletions
diff --git a/ld/testsuite/ld-scripts/empty-aligned.d b/ld/testsuite/ld-scripts/empty-aligned.d
index d9916dd..ff131eb 100644
--- a/ld/testsuite/ld-scripts/empty-aligned.d
+++ b/ld/testsuite/ld-scripts/empty-aligned.d
@@ -1,14 +1,8 @@
 #source: empty-aligned.s
 #ld: -T empty-aligned.t
-#readelf: -l --wide
-#xfail: "hppa64-*-*"
-#notarget: frv-*-*linux*
+#readelf: -S --wide
 
 #...
-Program Headers:
- +Type +Offset +VirtAddr +PhysAddr +FileSiz +MemSiz +Flg +Align
- +LOAD +0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ 0x[0-9a-f]+ [RWE ]+ +0x[0-9a-f]+
-! +LOAD .*
-#...
- +Segment Sections\.\.\.
- +00 +.text 
+.* .text .*
+!.* .text[234] .*
+#pass
diff --git a/ld/testsuite/ld-scripts/empty-aligned.t b/ld/testsuite/ld-scripts/empty-aligned.t
index e59bc20..5f6a38d 100644
--- a/ld/testsuite/ld-scripts/empty-aligned.t
+++ b/ld/testsuite/ld-scripts/empty-aligned.t
@@ -6,14 +6,14 @@ SECTIONS
   {
     *(.text1)
   }
-  /* Same for alignment at beginning and end.  */
+  /* Same for alignment at beginning and end, although we need to be
+     careful in the expression used to align.  */
   .text2 ALIGN (4096) :
   {
     *(.text2)
-    . = ALIGN (4096);
+    . = ALIGN (. != 0 ? 4096 : 1);
   }
-  /* Same for alignment just at end, although we need to be careful in
-     the expression used to align.  */
+  /* Same for alignment just at end.  */
   .text3 :
   {
     *(.text3)