um: merge tls_{32,64}.h