avr.c (avr_insert_attributes): In diagnostic essage: Multiply argument avr_n_flash...

	* config/avr/avr.c (avr_insert_attributes): In diagnostic essage:
	Multiply argument avr_n_flash by 64 to match unit of "KiB".
	(avr_pgm_check_var_decl): Same.

From-SVN: r227035

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index be061308a562ba7aa1caba82444b4d61a1b3e5ce..17855584dfbaee7cea375320e3bda7483f701d02 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-08-20  Georg-Johann Lay  <avr@gjlay.de>
+
+       * config/avr/avr.c (avr_insert_attributes): In diagnostic essage:
+       Multiply argument avr_n_flash by 64 to match unit of "KiB".
+       (avr_pgm_check_var_decl): Same.
+
 2015-08-20  Alan Lawrence  <alan.lawrence@arm.com>
 
        * config/arm/arm-builtins.c (arm_init_simd_builtin_types): Move

diff --git a/gcc/config/avr/avr.c b/gcc/config/avr/avr.c
index 3c477bc8eeef110806a875a84dd982805af730ba..bec9a8bb788e7646553134ff7b08a8617afa0025 100644 (file)
--- a/gcc/config/avr/avr.c
+++ b/gcc/config/avr/avr.c
@@ -9255,10 +9255,10 @@ avr_pgm_check_var_decl (tree node)
         {
           if (TYPE_P (node))
             error ("%qT uses address space %qs beyond flash of %d KiB",
-                   node, avr_addrspace[as].name, avr_n_flash);
+                   node, avr_addrspace[as].name, 64 * avr_n_flash);
           else
             error ("%s %q+D uses address space %qs beyond flash of %d KiB",
-                   reason, node, avr_addrspace[as].name, avr_n_flash);
+                   reason, node, avr_addrspace[as].name, 64 * avr_n_flash);
         }
       else
         {
@@ -9305,7 +9305,7 @@ avr_insert_attributes (tree node, tree *attributes)
       if (avr_addrspace[as].segment >= avr_n_flash)
         {
           error ("variable %q+D located in address space %qs beyond flash "
-                 "of %d KiB", node, avr_addrspace[as].name, avr_n_flash);
+                 "of %d KiB", node, avr_addrspace[as].name, 64 * avr_n_flash);
         }
       else if (!AVR_HAVE_LPM && avr_addrspace[as].pointer_size > 2)
        {