Fixes #1532, SEGV in g_current.

Unfortunately the tool does not do anything useful at this point
in time it seems, it just produces one graph that is non-zero

Change-Id: Ie991b8200628253ab308d36cb5afc80138b1acff
Fix detection of i386 in tmpi

The i386 without underscore is not recommended for new code and is not
defined if -std=... (other than gnu...) is passed on the command line.
__i386__ is already present for GCC 3.2 so there is no need for the old
name. Also we use __i386__ in other places in the code already.
We dont pass such a flag by default for 4.6, but the user could.
In 5.0 this fixes tmpi if the compiler supports c++11 and we pass
std=c++11.

Fixes #1533

Change-Id: I615cb91d3e3196a90fa4ba03fa183bf47af5d444
Merge release-4-6 into release-5-0

Change-Id: I89230f8a117d9636570e573b7b2657c79aea51c0
Merge "Merge release-4-6 into release-5-0" into release-5-0