diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 529ac73cf9b5c5fbafe2e5bc529a3c24742414d4..de44928162c9e1470261723dbd5a27edfb3182cb 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2019-01-16  Kito Cheng  <kito@andestech.com>
+
+	* elf-attrs.c (vendor_obj_attr_size): Return 0 if size is 0 even
+	for OBJ_ATTR_PROC.
+
 2019-01-16  Kito Cheng  <kito@andestech.com>
 	    Nelson Chu  <nelson@andestech.com>
 
diff --git a/bfd/elf-attrs.c b/bfd/elf-attrs.c
index d238112c49b49a4bd049e3f205669192911f1293..bfe135e7fbb6179b6d4c28436f31dcbd4a36de01 100644
--- a/bfd/elf-attrs.c
+++ b/bfd/elf-attrs.c
@@ -106,7 +106,7 @@ vendor_obj_attr_size (bfd *abfd, int vendor)
     size += obj_attr_size (list->tag, &list->attr);
 
   /* <size> <vendor_name> NUL 0x1 <size> */
-  return ((size || vendor == OBJ_ATTR_PROC)
+  return (size
 	  ? size + 10 + strlen (vendor_name)
 	  : 0);
 }
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3228342d4b789318ae890768ee65c099ad8d2096..cd80c48673c5b251b5be5d44558990981c59900c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2019-01-16  Kito Cheng  <kito@andestech.com>
+
+	* testsuite/gas/riscv/attribute-empty.d: New.
+
 2019-01-16  Kito Cheng  <kito@andestech.com>
 	    Nelson Chu  <nelson@andestech.com>
 
diff --git a/gas/testsuite/gas/riscv/attribute-empty.d b/gas/testsuite/gas/riscv/attribute-empty.d
new file mode 100644
index 0000000000000000000000000000000000000000..4f0982a470b9a09f3a5910bcf7b22aaeb2fed8d8
--- /dev/null
+++ b/gas/testsuite/gas/riscv/attribute-empty.d
@@ -0,0 +1,3 @@
+#as: -mno-arch-attr
+#readelf: -A
+#source: empty.s