diff options
author | Nick Clifton <nickc@redhat.com> | 2015-12-04 15:07:10 +0000 |
---|---|---|
committer | Nick Clifton <nickc@redhat.com> | 2015-12-04 15:07:10 +0000 |
commit | f27c5390b2fcff06b1e2199a4f051d543670aa03 (patch) | |
tree | abdbd2855f3c39d419e999132e3dd6dadf4d45e8 | |
parent | 461c4b2edee2f0a4ee7dec0001a6fabf46454a24 (diff) | |
download | gdb-f27c5390b2fcff06b1e2199a4f051d543670aa03.zip gdb-f27c5390b2fcff06b1e2199a4f051d543670aa03.tar.gz gdb-f27c5390b2fcff06b1e2199a4f051d543670aa03.tar.bz2 |
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.
-rw-r--r-- | gas/ChangeLog | 6 | ||||
-rw-r--r-- | gas/config/tc-arm.h | 5 | ||||
-rw-r--r-- | gas/testsuite/ChangeLog | 6 | ||||
-rw-r--r-- | gas/testsuite/gas/arm/align64.d | 1 | ||||
-rw-r--r-- | gas/testsuite/gas/arm/bundle-lock.d | 2 |
5 files changed, 17 insertions, 3 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 25e2bc9..a676b71 100644 --- 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 42f2d90..a38b8e1 100644 --- 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 eb2b4d7..c514be7 100644 --- 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 ee67c82..8c99ab7 100644 --- 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 d335833a..31e3be2 100644 --- 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+.+ -#... |