Fix GAS testsuite failures for COFF/PE based ARM targets.

	PR gas/19276
gas	* config/tc-arm.h (SUB_SEGMENT_ALIGN): Do not define for COFF/PE
	targets.

testsuite	* gas/arm/align64.d: Skip for COFF/PE targets.
	* gas/arm/bundle-lock.d: Adjust for COFF/PE targets.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 25e2bc9f713838f651b3a40a2c562d60a912b9d7..a676b7116cb30bdd04c0637268493fa4fe721a5d 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-04  Nick Clifton  <nickc@redhat.com>
+
+       PR gas/19276
+       * config/tc-arm.h (SUB_SEGMENT_ALIGN): Do not define for COFF/PE
+       targets.
+
 2015-12-04  Claudiu Zissulescu  <claziss@synopsys.com>
 
        * config/tc-arc.c (arc_option): Sets all internal gas options when

diff --git a/gas/config/tc-arm.h b/gas/config/tc-arm.h
index 42f2d90d4e81c010ebf29232fd169ddf1dea1306..a38b8e1a39dc71a233479c8522adac210e227cff 100644 (file)
--- a/gas/config/tc-arm.h
+++ b/gas/config/tc-arm.h
@@ -249,9 +249,12 @@ arm_min (int am_p1, int am_p2)
 #define TC_FRAG_INIT(fragp)    arm_init_frag (fragp, max_chars)
 #define TC_ALIGN_ZERO_IS_DEFAULT 1
 #define HANDLE_ALIGN(fragp)    arm_handle_align (fragp)
-#define SUB_SEGMENT_ALIGN(SEG, FRCHAIN)                        \
+/* PR gas/19276: COFF/PE segment alignment is already handled in coff_frob_section().  */
+#ifndef TE_PE
+#define SUB_SEGMENT_ALIGN(SEG, FRCHAIN)                                \
   ((!(FRCHAIN)->frch_next && subseg_text_p (SEG))              \
    ? arm_min (2, get_recorded_alignment (SEG)) : 0)
+#endif
 
 #define md_do_align(N, FILL, LEN, MAX, LABEL)                                  \
   if (FILL == NULL && (N) != 0 && ! need_pass_2 && subseg_text_p (now_seg))    \

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index eb2b4d74f63ac2fd04c467796c4f3428fa3628e0..c514be7bb51942508971475ebe8cdfbb5e769cf0 100644 (file)
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-12-04  Nick Clifton  <nickc@redhat.com>
+
+       PR gas/19276
+       * gas/arm/align64.d: Skip for COFF/PE targets.
+       * gas/arm/bundle-lock.d: Adjust for COFF/PE targets.
+
 2015-12-04  Claudiu Zissulescu  <claziss@synopsys.com>
 
        * gas/arc/bic.d: Update test.

diff --git a/gas/testsuite/gas/arm/align64.d b/gas/testsuite/gas/arm/align64.d
index ee67c820b8d01a280e7134a7ad217ad68b3b1bc0..8c99ab7ff2dd18050ffe5c039f3383861259a8c6 100644 (file)
--- a/gas/testsuite/gas/arm/align64.d
+++ b/gas/testsuite/gas/arm/align64.d
@@ -1,5 +1,6 @@
 # name: 64 Bytes alignment test
 # objdump: -dr --prefix-addresses --show-raw-insn
+#skip: *-*-*coff *-*-pe *-*-wince
 
 .*: +file format .*arm.*
 

diff --git a/gas/testsuite/gas/arm/bundle-lock.d b/gas/testsuite/gas/arm/bundle-lock.d
index d335833ae63a39b7f63c1b4715fce09adc625e39..31e3be2411a9c377975aa62508bf53467c340d69 100644 (file)
--- a/gas/testsuite/gas/arm/bundle-lock.d
+++ b/gas/testsuite/gas/arm/bundle-lock.d
@@ -243,5 +243,3 @@ Disassembly of section \.text:
 #...
  *710:\s+(be00\s+bkpt|1840\s+adds)\s+.+
 #...
- *720:\s+e1200070\s+bkpt\s+.+
-#...