Changeset 389 for soft/giet_vm/Makefile

Timestamp:

Aug 7, 2014, 12:42:16 PM (10 years ago)

Author:

alain

Message:

Bloup

File:

• soft/giet_vm/Makefile (modified) (4 diffs)

soft/giet_vm/Makefile

@@ -9 +9 @@
 
 ARCH ?= ../tsar-trunk-svn-2013/platforms/tsar_generic_iob
-X    ?= 16
-Y    ?= 8
-P    ?= 4
+X    ?= 2
+Y    ?= 2
+P    ?= 2
 APP  ?= convol
 
@@ -81 +81 @@
 
 ### Objects to be linked for game.elf
-GAMEOFLIFE_OBJS = build/gameoflife/main.o    \
-                  build/libs/stdio.o         \
-                  build/libs/barrier.o       \
-                  build/libs/remote_malloc.o \
+GAMEOFLIFE_OBJS = build/gameoflife/main.o \
+                  build/libs/stdio.o      \
+                  build/libs/barrier.o    \
+                  build/libs/malloc.o     \
                   build/libs/spin_lock.o
                  
@@ -101 +101 @@
               build/libs/stdio.o         \
               build/libs/barrier.o       \
-              build/libs/remote_malloc.o \
+              build/libs/malloc.o        \
               build/libs/spin_lock.o
 
 ### Objects to be linked for transpose.elf
-TRANSPOSE_OBJS = build/transpose/main.o     \
-                 build/libs/stdio.o         \
-                 build/libs/barrier.o       \
-                 build/libs/remote_malloc.o \
+TRANSPOSE_OBJS = build/transpose/main.o  \
+                 build/libs/stdio.o      \
+                 build/libs/barrier.o    \
+                 build/libs/malloc.o     \
                  build/libs/spin_lock.o
 
 ### Objects to be linked for convol.elf
-CONVOL_OBJS  = build/convol/main.o        \
-               build/libs/stdio.o         \
-               build/libs/stdlib.o        \
-               build/libs/barrier.o       \
-               build/libs/remote_malloc.o \
+CONVOL_OBJS  = build/convol/main.o       \
+               build/libs/stdio.o        \
+               build/libs/stdlib.o       \
+               build/libs/barrier.o      \
+               build/libs/malloc.o       \
                build/libs/spin_lock.o
 
@@ -414 +414 @@
         $(CC) $(CFLAGS) $(USER_INCLUDE) -c -o $@ $<
 
-build/libs/remote_malloc.o: giet_libs/remote_malloc.c \
-                            giet_libs/spin_lock.h \
-                            hard_config.h         \
-                            giet_config.h
-        $(CC) $(CFLAGS) $(USER_INCLUDE) -c -o $@ $<
-
 build/libs/sbt_barrier.o: giet_libs/sbt_barrier.c \
                           hard_config.h         \