add_thread_local_to_x_error_trap_cc.patch
cherry-pick-a18fddcb53e6.patch
