software: use gnu99 standard for GCC and revert liballoc changes

m-labs · Mar 5, 2016 · 78ce2d6 · 78ce2d6
1 parent 0f14dbe
commit 78ce2d6
Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/misoc/software/common.mak b/misoc/software/common.mak
@@ -7,7 +7,7 @@ ifeq ($(CLANG),1)
 CC_normal      := clang -target $(TRIPLE) -integrated-as
 CX_normal      := clang++ -target $(TRIPLE) -integrated-as
 else
-CC_normal      := $(TARGET_PREFIX)gcc
+CC_normal      := $(TARGET_PREFIX)gcc -std=gnu99
 CX_normal      := $(TARGET_PREFIX)g++
 endif
 AR_normal      := $(TARGET_PREFIX)ar

diff --git a/misoc/software/liballoc/alloc.c b/misoc/software/liballoc/alloc.c
@@ -20,10 +20,9 @@ static struct meta *root;
 
 void *malloc(size_t size)
 {
-    struct meta *list;
     size += FILL - (size % FILL); /* round up */
 
-    for(list = root; list; list = list->next) {
+    for(struct meta *list = root; list; list = list->next) {
         if(list->magi == BUSY) {
             continue;
         } else if(list->magi == IDLE) {
@@ -119,12 +118,11 @@ void alloc_give(void *area, size_t size)
 
 void alloc_show()
 {
-    struct meta *list;
     size_t busy = 0, idle = 0, meta = 0;
 
     printf("Heap view:\n");
 
-    for(list = root; list; list = list->next) {
+    for(struct meta *list = root; list; list = list->next) {
         meta += sizeof(struct meta);
 
         const char *magi;