add_thread_local_to_x_error_trap_cc.patch
cherry-pick-06aea31d10f8.patch
