PARALLEL.
* config/arm/arm.md (pic_add_dot_plus_four, pic_add_dot_plus_eight)
(tls_load_dot_plus_eight): Move the label number into the unspec.
* config/arm/thumb2.md (pic_load_dot_plus_four): Likewise.
* gcc.dg/tls/opt-14.c: New.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126178
138bc75d-0d04-0410-961f-
82ee72b054a4
+2007-07-01 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * config/arm/arm.c (arm_cannot_copy_insn_p): Do not expect a
+ PARALLEL.
+ * config/arm/arm.md (pic_add_dot_plus_four, pic_add_dot_plus_eight)
+ (tls_load_dot_plus_eight): Move the label number into the unspec.
+ * config/arm/thumb2.md (pic_load_dot_plus_four): Likewise.
+
2007-07-01 Andreas Schwab <schwab@suse.de>
* dwarf2out.c (initial_return_save): Define only if used.
{
rtx pat = PATTERN (insn);
- if (GET_CODE (pat) == PARALLEL
- && GET_CODE (XVECEXP (pat, 0, 0)) == SET)
+ if (GET_CODE (pat) == SET)
{
- rtx rhs = SET_SRC (XVECEXP (pat, 0, 0));
+ rtx rhs = SET_SRC (pat);
if (GET_CODE (rhs) == UNSPEC
&& XINT (rhs, 1) == UNSPEC_PIC_BASE)
(define_insn "pic_add_dot_plus_four"
[(set (match_operand:SI 0 "register_operand" "=r")
(unspec:SI [(plus:SI (match_operand:SI 1 "register_operand" "0")
- (const (plus:SI (pc) (const_int 4))))]
- UNSPEC_PIC_BASE))
- (use (match_operand 2 "" ""))]
+ (const (plus:SI (pc) (const_int 4))))
+ (match_operand 2 "" "")]
+ UNSPEC_PIC_BASE))]
"TARGET_THUMB1"
"*
(*targetm.asm_out.internal_label) (asm_out_file, \"LPIC\",
(define_insn "pic_add_dot_plus_eight"
[(set (match_operand:SI 0 "register_operand" "=r")
(unspec:SI [(plus:SI (match_operand:SI 1 "register_operand" "r")
- (const (plus:SI (pc) (const_int 8))))]
- UNSPEC_PIC_BASE))
- (use (match_operand 2 "" ""))]
+ (const (plus:SI (pc) (const_int 8))))
+ (match_operand 2 "" "")]
+ UNSPEC_PIC_BASE))]
"TARGET_ARM"
"*
(*targetm.asm_out.internal_label) (asm_out_file, \"LPIC\",
(define_insn "tls_load_dot_plus_eight"
[(set (match_operand:SI 0 "register_operand" "+r")
(mem:SI (unspec:SI [(plus:SI (match_operand:SI 1 "register_operand" "r")
- (const (plus:SI (pc) (const_int 8))))]
- UNSPEC_PIC_BASE)))
- (use (match_operand 2 "" ""))]
+ (const (plus:SI (pc) (const_int 8))))
+ (match_operand 2 "" "")]
+ UNSPEC_PIC_BASE)))]
"TARGET_ARM"
"*
(*targetm.asm_out.internal_label) (asm_out_file, \"LPIC\",
;; word aligned.
(define_insn "pic_load_dot_plus_four"
[(set (match_operand:SI 0 "register_operand" "=r")
- (unspec:SI [(const (plus:SI (pc) (const_int 4)))]
- UNSPEC_PIC_BASE))
- (use (match_operand 1 "" ""))]
+ (unspec:SI [(const (plus:SI (pc) (const_int 4)))
+ (use (match_operand 1 "" ""))]
+ UNSPEC_PIC_BASE))]
"TARGET_THUMB2"
"*
assemble_align(BITS_PER_WORD);
+2007-07-01 Daniel Jacobowitz <dan@codesourcery.com>
+
+ * gcc.dg/tls/opt-14.c: New.
+
2007-07-01 Ollie Wild <aaw@google.com>
* g++.dg/lookup/using16.C: New test.
--- /dev/null
+/* This testcase generated invalid assembly on ARM Thumb-2. Two
+ PIC additions of pc were combined, but the deleted label was still
+ used. */
+/* { dg-do assemble } */
+/* { dg-options "-O2" } */
+/* { dg-require-effective-target tls } */
+
+struct __res_state
+{
+ int options;
+};
+extern __thread struct __res_state *__resp
+ __attribute__ ((tls_model ("initial-exec")));
+
+void foo (void);
+
+int main(void)
+{
+ int count, total = 0;
+
+ for (count = 0; count < 10; count++)
+ {
+ if (((*__resp).options & 0x00000001) == 0)
+ foo ();
+ (*__resp).options &= ~((0x00000002 | 0x00000200 | 0x00000080));
+ }
+ return 0;
+}