diff --git a/ld/ChangeLog b/ld/ChangeLog
index eb0c3096de..df8bb32932 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2017-03-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* ldlang.c (lang_check_section_addresses): Use addr_mask to
+	check VMA and LMA.
+
 2017-03-13  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/21202
diff --git a/ld/ldlang.c b/ld/ldlang.c
index a0638eae23..8c1d8299c3 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -4783,13 +4783,13 @@ lang_check_section_addresses (void)
   for (s = link_info.output_bfd->sections; s != NULL; s = s->next)
     {
       s_end = (s->vma + s->size) & addr_mask;
-      if (s_end != 0 && s_end < s->vma)
+      if (s_end != 0 && s_end < (s->vma & addr_mask))
 	einfo (_("%X%P: section %s VMA wraps around address space\n"),
 	       s->name);
       else
 	{
 	  s_end = (s->lma + s->size) & addr_mask;
-	  if (s_end != 0 && s_end < s->lma)
+	  if (s_end != 0 && s_end < (s->lma & addr_mask))
 	    einfo (_("%X%P: section %s LMA wraps around address space\n"),
 		   s->name);
 	}