update cond_ld_st test and expected outputs

Line numbers are off by one in some outputs since it differs on GCC version
how it will map source code to line number for the ternary operator written
in multiple lines.
This is small fix that replaces one occurrence of ternary operator with
if-then-else. The excepted outputs have been changed accordingly.

This fixes the test memcheck/tests/cond_ld_st for different platforms with
different GCC versions.

Tested on x86, i386, ARM, MIPS32, and MIPS64.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@13415 a5019735-40e9-0310-863c-91ae7b9d1cf9