diff --git a/samples/xtensa-esp32s3-linux-uclibcfdpic/crosstool.config b/samples/xtensa-esp32s3-linux-uclibcfdpic/crosstool.config
index 9ee30fada..caf8c1021 100644
--- a/samples/xtensa-esp32s3-linux-uclibcfdpic/crosstool.config
+++ b/samples/xtensa-esp32s3-linux-uclibcfdpic/crosstool.config
@@ -4,6 +4,7 @@ CT_ARCH_XTENSA=y
 # CT_DEMULTILIB is not set
 # CT_ARCH_USE_MMU is not set
 CT_TARGET_CFLAGS="-mauto-litpools -mfdpic -Os"
+CT_TARGET_LDFLAGS="-mfdpic"
 CT_TARGET_VENDOR="esp32s3"
 CT_KERNEL_LINUX=y
 CT_ARCH_BINFMT_FDPIC=y
@@ -14,13 +15,14 @@ CT_BINUTILS_PLUGINS=y
 CT_LIBC_UCLIBC_NG=y
 CT_UCLIBC_NG_SRC_DEVEL=y
 CT_UCLIBC_NG_DEVEL_URL="/~https://github.com/jcmvbkbc/uclibc-ng-xtensa.git"
-CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-fdpic"
+CT_UCLIBC_NG_DEVEL_BRANCH="xtensa-1.0.44-fdpic"
 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_LIB_DIR}/samples/xtensa-esp32s3-linux-uclibcfdpic/uclibc.config"
 CT_LIBC_UCLIBC_IPV6=y
 CT_LIBC_UCLIBC_WCHAR=y
 CT_THREADS_LT=y
 CT_GCC_SRC_DEVEL=y
 CT_GCC_DEVEL_URL="/~https://github.com/jcmvbkbc/gcc-xtensa.git"
-CT_GCC_DEVEL_BRANCH="xtensa-14-fdpic"
+CT_GCC_DEVEL_BRANCH="xtensa-14-4992-fdpic"
 # CT_CC_GCC_CONFIG_TLS is not set
 # CT_CC_GCC_SJLJ_EXCEPTIONS is not set
+CT_CC_LANG_CXX=y