diff --git a/config/arch.arm b/config/arch.arm
index 1c2d4c2f15..371306ed1a 100644
--- a/config/arch.arm
+++ b/config/arch.arm
@@ -49,6 +49,10 @@
       ;;
   esac
 
+  if [ "${TARGET_FLOAT}" = "hard" ]; then
+    TARGET_ABI+="hf"
+  fi
+
   TARGET_VARIANT="${TARGET_SUBARCH}${TARGET_CPU_FLAGS}"
   TARGET_GCC_ARCH=${TARGET_SUBARCH/-}
   TARGET_KERNEL_ARCH=${TARGET_KERNEL_ARCH:-arm}
diff --git a/packages/security/libgpg-error/package.mk b/packages/security/libgpg-error/package.mk
index 2f47d337c0..58257afcf1 100644
--- a/packages/security/libgpg-error/package.mk
+++ b/packages/security/libgpg-error/package.mk
@@ -18,11 +18,11 @@ pre_configure_target() {
   case ${TARGET_ARCH} in
     aarch64)
       GPGERROR_TUPLE=aarch64-unknown-linux-gnu
-      GPGERROR_TARGET=linux-gnueabi
+      GPGERROR_TARGET=linux-gnu${TARGET_ABI}
       ;;
     arm)
       GPGERROR_TUPLE=arm-unknown-linux-gnueabi
-      GPGERROR_TARGET=linux-gnueabi
+      GPGERROR_TARGET=linux-gnu${TARGET_ABI}
       ;;
     x86_64)
       GPGERROR_TUPLE=x86_64-unknown-linux-gnu