diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dc23b90d278..76c6d55f03c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-07  Ilya Enkovich  <ilya.enkovich@intel.com>
+
+	* config/elfos.h (ASM_DECLARE_OBJECT_NAME): Use decl size
+	instead of type size.
+	(ASM_FINISH_DECLARE_OBJECT): Likewise.
+
 2014-08-07  Marat Zakirov  <m.zakirov@samsung.com>
 
 	* config/arm/thumb1.md (*thumb1_movhi_insn): Handle stack pointer.
diff --git a/gcc/config/elfos.h b/gcc/config/elfos.h
index c1d5553123d..7929708cbef 100644
--- a/gcc/config/elfos.h
+++ b/gcc/config/elfos.h
@@ -313,7 +313,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 	  && (DECL) && DECL_SIZE (DECL))				\
 	{								\
 	  size_directive_output = 1;					\
-	  size = int_size_in_bytes (TREE_TYPE (DECL));			\
+	  size = tree_to_uhwi (DECL_SIZE_UNIT (DECL));			\
 	  ASM_OUTPUT_SIZE_DIRECTIVE (FILE, NAME, size);			\
 	}								\
 									\
@@ -341,7 +341,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 	  && !size_directive_output)				\
 	{							\
 	  size_directive_output = 1;				\
-	  size = int_size_in_bytes (TREE_TYPE (DECL));		\
+	  size = tree_to_uhwi (DECL_SIZE_UNIT (DECL));		\
 	  ASM_OUTPUT_SIZE_DIRECTIVE (FILE, name, size);		\
 	}							\
     }								\
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1270a357798..248a3cc701e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2013-08-07  Ilya Enkovich  <ilya.enkovich@intel.com>
+
+	* gcc.target/i386/struct-size.c: New.
+
 2014-08-07  Tom de Vries  <tom@codesourcery.com>
 
 	* gcc.dg/cproj-fails-with-broken-glibc.c: Remove test.