Merge branch 'loongson3a' into develop
authorZhang Xianyi <traits.zhang@gmail.com>
Sat, 20 Jul 2013 14:32:38 +0000 (22:32 +0800)
committerZhang Xianyi <traits.zhang@gmail.com>
Sat, 20 Jul 2013 14:33:17 +0000 (22:33 +0800)
Conflicts:
Makefile.system

1  2 
Makefile.system
README.md

diff --cc Makefile.system
@@@ -69,14 -65,10 +69,19 @@@ ifeq ($(DEBUG), 1
  GETARCH_FLAGS += -g
  endif
  
 +ifeq ($(QUIET_MAKE), 1)
 +MAKE += -s
 +endif
 +
 +ifndef NO_PARALLEL_MAKE
 +NO_PARALLEL_MAKE=0
 +endif
 +GETARCH_FLAGS += -DNO_PARALLEL_MAKE=$(NO_PARALLEL_MAKE)
++
+ ifeq ($(HOSTCC), loongcc)
+ GETARCH_FLAGS  += -static
+ endif
  # This operation is expensive, so execution should be once.
  ifndef GOTOBLAS_MAKEFILE
  export GOTOBLAS_MAKEFILE = 1
diff --cc README.md
Simple merge