diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c
index bc1e607..911c272 100644
--- a/gcc/config/arm/arm.c
+++ b/gcc/config/arm/arm.c
@@ -3471,7 +3471,18 @@ arm_option_override (void)
     }
   else
     {
-      if (arm_structure_size_boundary != 8
+      /* Do not allow structure size boundary to be overridden for netbsd.  */
+
+      if ((arm_abi == ARM_ABI_ATPCS)
+	  && (arm_structure_size_boundary != DEFAULT_STRUCTURE_SIZE_BOUNDARY))
+	{
+	  warning (0,
+		   "option %<-mstructure-size-boundary%> is deprecated for netbsd; "
+		   "defaulting to %d",
+		   DEFAULT_STRUCTURE_SIZE_BOUNDARY);
+	  arm_structure_size_boundary = DEFAULT_STRUCTURE_SIZE_BOUNDARY;
+	}
+      else if (arm_structure_size_boundary != 8
 	  && arm_structure_size_boundary != 32
 	  && !(ARM_DOUBLEWORD_ALIGN && arm_structure_size_boundary == 64))
 	{
-- 
1.9.1