From aeb8b4e96cbe526eb810794568909659d73b16dd Mon Sep 17 00:00:00 2001
From: Georg-Johann Lay <avr@gjlay.de>
Date: Mon, 14 Jan 2013 18:28:24 +0000
Subject: [PATCH] re PR target/55974 ([avr] Wrong suffix for built-in defines
__INT24_MAX__ and __UINT24_MAX__ with -mint8)
PR target/55974
* config/avr/avr-c.c (avr_cpu_cpp_builtins): Define __FLASH
etc. to 1 and not to __flash.
Use LL suffix for __INT24_MAX__ with -mint8.
Use ULL suffix for __UINT24_MAX__ with -mint8.
From-SVN: r195169
---
gcc/ChangeLog | 8 ++++++++
gcc/config/avr/avr-c.c | 9 +++++----
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eeb6c0bcdb6d..975b878ae7a5 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2013-01-14 Georg-Johann Lay <avr@gjlay.de>
+
+ PR target/55974
+ * config/avr/avr-c.c (avr_cpu_cpp_builtins): Define __FLASH
+ etc. to 1 and not to __flash.
+ Use LL suffix for __INT24_MAX__ with -mint8.
+ Use ULL suffix for __UINT24_MAX__ with -mint8.
+
2013-01-14 Georg-Johann Lay <avr@gjlay.de>
* config/avr/avr-arch.h
diff --git a/gcc/config/avr/avr-c.c b/gcc/config/avr/avr-c.c
index f8b2b200e0b1..2685f4b3d730 100644
--- a/gcc/config/avr/avr-c.c
+++ b/gcc/config/avr/avr-c.c
@@ -169,8 +169,7 @@ avr_cpu_cpp_builtins (struct cpp_reader *pfile)
const char *name = avr_addrspace[i].name;
char *Name = (char*) alloca (1 + strlen (name));
- cpp_define_formatted (pfile, "%s=%s",
- avr_toupper (Name, name), name);
+ cpp_define (pfile, avr_toupper (Name, name));
}
}
@@ -187,7 +186,9 @@ avr_cpu_cpp_builtins (struct cpp_reader *pfile)
/* Builtin macros for the __int24 and __uint24 type. */
- cpp_define (pfile, "__INT24_MAX__=8388607L");
+ cpp_define_formatted (pfile, "__INT24_MAX__=8388607%s",
+ INT_TYPE_SIZE == 8 ? "LL" : "L");
cpp_define (pfile, "__INT24_MIN__=(-__INT24_MAX__-1)");
- cpp_define (pfile, "__UINT24_MAX__=16777215UL");
+ cpp_define_formatted (pfile, "__UINT24_MAX__=16777215%s",
+ INT_TYPE_SIZE == 8 ? "ULL" : "UL");
}
--
GitLab