From: Piotr Fusik <fox@scene.pl>
Date: Wed, 15 Feb 2017 17:51:27 +0000 (+0100)
Subject: Revert "Disallow global variable declarations with an initializer."
X-Git-Tag: V2.16~29^2~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=5988ec37cdce1655b14159a3a20a5493ba5459fd;p=cc65

Revert "Disallow global variable declarations with an initializer."

This reverts commit 1f12a06f7cc2ae79a800fe3faed727513364091b.
---

diff --git a/src/cc65/compile.c b/src/cc65/compile.c
index 9cdeaf7e5..48a5c29d3 100644
--- a/src/cc65/compile.c
+++ b/src/cc65/compile.c
@@ -144,14 +144,17 @@ static void Parse (void)
             **
             **   - if it is not a typedef or function,
             **   - if we don't had a storage class given ("int i")
-            **     or the storage class is explicitly specified as static.
+            **   - if the storage class is explicitly specified as static,
+            **   - or if there is an initialization.
             **
             ** This means that "extern int i;" will not get storage allocated.
             */
             if ((Decl.StorageClass & SC_FUNC) != SC_FUNC          &&
                 (Decl.StorageClass & SC_TYPEMASK) != SC_TYPEDEF    &&
                 ((Spec.Flags & DS_DEF_STORAGE) != 0         ||
-                 (Decl.StorageClass & (SC_EXTERN|SC_STATIC)) == SC_STATIC)) {
+                 (Decl.StorageClass & (SC_EXTERN|SC_STATIC)) == SC_STATIC ||
+                 ((Decl.StorageClass & SC_EXTERN) != 0 &&
+                  CurTok.Tok == TOK_ASSIGN))) {
 
                 /* We will allocate storage */
                 Decl.StorageClass |= SC_STORAGE;