When creating subprogram metadata, DIBuilder doesn't want a derived type of any
kind, so just use the main variant here.


git-svn-id: https://llvm.org/svn/llvm-project/dragonegg/trunk@182192 91177308-0d34-0410-b5e6-96231b3b80d8
The "was gcc built with C++" flag is no longer set by gcc-4.8 as it is always
built with C++.


git-svn-id: https://llvm.org/svn/llvm-project/dragonegg/trunk@182193 91177308-0d34-0410-b5e6-96231b3b80d8