diff --git a/conf/machine/baremetal-riscv32.conf b/conf/machine/baremetal-riscv32.conf
index 381bbe5..d8049d3 100644
--- a/conf/machine/baremetal-riscv32.conf
+++ b/conf/machine/baremetal-riscv32.conf
@@ -17,24 +17,6 @@ QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,id=hd0 -device virtio-blk-devic
 QB_SLIRP_OPT = "-netdev user,id=net0,hostfwd=tcp::22222-:22"
 
 # Prelink does not yet work
-
 USER_CLASSES_remove = "image-prelink"
-# To support baremetal ld complains
-# /opt/riscv32/sysroots/x86_64-becsdk-linux/usr/libexec/riscv32-bec-elf/gcc/riscv32-bec-elf/7.3.0/real-ld: unrecognized option '--hash-style=gnu'
-#TARGET_LINK_HASH_STYLE = ""
-LINKER_HASH_STYLE = ""
 
 TCLIBC = "baremetal"
-
-BAD_RECOMMENDATIONS += "\
-    libcxx-dev \
-    libcxx-staticdev \
-    compiler-rt-dev \
-    compiler-rt-staticdev \
-"
-ASSUME_PROVIDED += "\
-    libcxx-dev \
-    libcxx-staticdev \
-    compiler-rt-dev \
-    compiler-rt-staticdev \
-"
diff --git a/conf/machine/baremetal-riscv64.conf b/conf/machine/baremetal-riscv64.conf
index 0d0b870..990b7a3 100644
--- a/conf/machine/baremetal-riscv64.conf
+++ b/conf/machine/baremetal-riscv64.conf
@@ -17,24 +17,6 @@ QB_ROOTFS_OPT = "-drive file=@ROOTFS@,format=raw,id=hd0 -device virtio-blk-devic
 QB_SLIRP_OPT = "-netdev user,id=net0,hostfwd=tcp::22222-:22"
 
 # Prelink does not yet work
-
 USER_CLASSES_remove = "image-prelink"
-# To support baremetal ld complains
-# /opt/riscv32/sysroots/x86_64-becsdk-linux/usr/libexec/riscv32-bec-elf/gcc/riscv32-bec-elf/7.3.0/real-ld: unrecognized option '--hash-style=gnu'
-#TARGET_LINK_HASH_STYLE = ""
-LINKER_HASH_STYLE = ""
 
 TCLIBC = "baremetal"
-
-BAD_RECOMMENDATIONS += "\
-    libcxx-dev \
-    libcxx-staticdev \
-    compiler-rt-dev \
-    compiler-rt-staticdev \
-"
-ASSUME_PROVIDED += "\
-    libcxx-dev \
-    libcxx-staticdev \
-    compiler-rt-dev \
-    compiler-rt-staticdev \
-"