diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index 61fd3182b1..28199e1399 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -304,7 +304,7 @@ if $(HOST_ARCH) = m68k {
 
 if $(HOST_PLATFORM) != darwin {
 	# fix for new changes to DSO linking policies
-	HOST_LINKFLAGS += -Xlinker --no-as-needed ;
+	HOST_LINKFLAGS += -Xlinker --no-as-needed -Wl,--copy-dt-needed-entries ;
 }
 
 
diff --git a/headers/os/BeBuild.h b/headers/os/BeBuild.h
index 4ead4ce86a..02ba4b64a4 100644
--- a/headers/os/BeBuild.h
+++ b/headers/os/BeBuild.h
@@ -49,7 +49,7 @@
 
 #if __GNUC__ == 2
 #	define B_HAIKU_ABI					B_HAIKU_ABI_GCC_2_HAIKU
-#elif (__GNUC__ >= 4 && __GNUC__ <= 9) || defined(__TINYC__)
+#elif (__GNUC__ >= 4 && __GNUC__ <= 10) || defined(__TINYC__)
 #	define B_HAIKU_ABI					B_HAIKU_ABI_GCC_4
 #else
 #	error Unsupported compiler!