Changeset 584

Timestamp:

Jul 3, 2015, 12:15:08 PM (9 years ago)

Author:

guerin

Message:

ocean: fix compilation

File:

• soft/giet_vm/applications/ocean/Makefile.config.giet (modified) (4 diffs)

soft/giet_vm/applications/ocean/Makefile.config.giet

@@ -3 +3 @@
 # Default plateform architecture and default CPU
 #------------------------------------------------------------------------------
-CPU         = mipsel
-CCTOOLS     = /opt/mipsel-toolchain
 GIET_DISTRIB= $(PWD)/../..
 
@@ -12 +10 @@
 DIR_INC  = $(GIET_DISTRIB)/giet_libs
 DIR_LIB  = $(GIET_DISTRIB)/build/libs
-GCC_LIB  = $(CCTOOLS)/lib
-CC       = $(CCTOOLS)/bin/$(CPU)-unknown-elf-gcc
-AR       = $(CCTOOLS)/bin/$(CPU)-unknown-elf-ar
-AS       = $(CCTOOLS)/bin/$(CPU)-unknown-elf-as
-OD       = $(CCTOOLS)/bin/$(CPU)-unknown-elf-objdump
-OCPY     = $(CCTOOLS)/bin/$(CPU)-unknown-elf-objcopy
-LD       = $(CCTOOLS)/bin/$(CPU)-unknown-elfld
-NM       = $(CCTOOLS)/bin/$(CPU)-unknown-elf-nm
 
 OBJ=$(DIR_LIB)/malloc.o $(DIR_LIB)/stdio.o $(DIR_LIB)/user_barrier.o $(DIR_LIB)/user_lock.o $(DIR_LIB)/stdlib.o $(DIR_LIB)/user_sqt_lock.o
@@ -39 +29 @@
 endif
 
-#LDFLAGS := $(LDFLAGS) -L$(DIR_LIB) -L$(GCC_LIB) $(CPU-LFLAGS) -T$(LDSCRIPT) $(OBJ) $(ADD-LIBS) \
-#       -lpthread -lgomp -lc $(ADD-LIBS) -lgomp -lpthread -lm -lc -lgcc --hash-style=sysv
-LDFLAGS := $(LDFLAGS) -L$(DIR_LIB) -L$(GCC_LIB) $(CPU-LFLAGS) -T$(LDSCRIPT) -lmath $(OBJ) $(ADD-LIBS)
+LDFLAGS := $(LDFLAGS) -L$(DIR_LIB) $(CPU-LFLAGS) -T$(LDSCRIPT) -lmath $(OBJ) $(ADD-LIBS)
 
 
@@ -52 +40 @@
 ifeq ($(OBJS),)
         $(error *** Error: Variable OBJS must be defined before calling Makefile.config)
-endif
-
-ifneq ($(CPU),mipsel)
-        $(error *** Error: Variable CPU must be equal to \'mipsel\' when calling this Makefile)
 endif