I thought I had already fixed this, but clearly if I did, I didn't 
include it in any upstream commits.

With -Og the optimizers are hindered in various ways and this prevents 
using zicond.  So skip this test with -Og (it was already being skipped 
at -O0).

Pushed to the trunk.

Jeff