diff options
| author | Paul Brook <paul@codesourcery.com> | 2006-08-09 16:29:41 +0000 |
|---|---|---|
| committer | Paul Brook <paul@codesourcery.com> | 2006-08-09 16:29:41 +0000 |
| commit | 13d751eb3df2b44fcd641a06a7efa4296773ab03 (patch) | |
| tree | 4939a8f899ca0010edde53dfb1d760e94fcfc222 | |
| parent | 990fcb542835bd0fe92c0f8a112ffbec595ce380 (diff) | |
2006-08-09 Paul Brook <paul@codesourcery.com>
gcc/
* final.c (final_scan_insn): Clear current_insn_predicate before
outputting inline asm.
gcc/testsuite/
* gcc.target/arm/cond-asm.c: New test.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/csl/sourcerygxx-4_1@116040 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog.csl | 9 | ||||
| -rw-r--r-- | gcc/final.c | 6 |
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index 686732b4499..caf113042a3 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,5 +1,14 @@ 2006-08-09 Paul Brook <paul@codesourcery.com> + gcc/ + * final.c (final_scan_insn): Clear current_insn_predicate before + outputting inline asm. + + gcc/testsuite/ + * gcc.target/arm/cond-asm.c: New test. + +2006-08-09 Paul Brook <paul@codesourcery.com> + PR target/16634 * config/arm/arm.c (use_return_insn): Return 0 for Thumb interrupt functions. diff --git a/gcc/final.c b/gcc/final.c index c5cbd5a4f58..aef324ac611 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -1985,6 +1985,10 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, int insn_code_number; const char *template; +#ifdef HAVE_conditional_execution + /* Reset this early so it is correct for ASM statements. */ + current_insn_predicate = NULL_RTX; +#endif /* An INSN, JUMP_INSN or CALL_INSN. First check for special kinds that recog doesn't recognize. */ @@ -2419,8 +2423,6 @@ final_scan_insn (rtx insn, FILE *file, int optimize ATTRIBUTE_UNUSED, #ifdef HAVE_conditional_execution if (GET_CODE (PATTERN (insn)) == COND_EXEC) current_insn_predicate = COND_EXEC_TEST (PATTERN (insn)); - else - current_insn_predicate = NULL_RTX; #endif #ifdef HAVE_cc0 |