add_thread_local_to_x_error_trap_cc.patch
cherry-pick-eef098d1c7d5.patch
