Fix For TARGET_ARCH haida

Fix For TARGET_ARCH haida