I think this can basically be just reverting this commit. Could also use __has_attribute(__cold__) to directly test for it.

Reference: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-cold-function-attribute