core: Makefile.defs - renamed var CPU to CPUTYPE

- some operating systems (e.g., suse), sets the CPU in the environment
  to the cpu architecture, while the makefile uses it for cpu type
  provided to -mtune parameter of gcc

Makefile.defs

@@ -6,7 +6,7 @@
 # Environment variables:
 #   PREFIX, LOCALBASE, BASEDIR
 #   INSTALL, TAR , CC, LEX, YACC,
-#   CPU, CC_EXTRA_OPTS, LD_EXTRA_OPTS
+#   CPUTYPE, CC_EXTRA_OPTS, LD_EXTRA_OPTS
 #   exclude_modules, skip_modules, include_modules
 #   extra_defs
 #
@@ -836,37 +836,37 @@ ifeq		($(CC_NAME), gcc)
 				CFLAGS=-g $(CC_OPT) -funroll-loops  -Wcast-align $(PROFILE)
 			#if gcc 5.0+, 4.5+ or 4.2+
 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+,$(CC_SHORTVER))))
-$(call				set_if_empty,CPU,athlon64)
+$(call				set_if_empty,CPUTYPE,athlon64)
 					CFLAGS+=-m32 -minline-all-stringops \
 							-falign-loops \
 							-ftree-vectorize \
 							-fno-strict-overflow \
-							-mtune=$(CPU)
+							-mtune=$(CPUTYPE)
 					LDFLAGS+=-m32
 else
 			#if gcc 4.0+
 ifeq			($(CC_SHORTVER), 4.x)
-$(call				set_if_empty,CPU,athlon64)
+$(call				set_if_empty,CPUTYPE,athlon64)
 					CFLAGS+=-m32 -minline-all-stringops \
 							-falign-loops \
 							-ftree-vectorize \
-							-mtune=$(CPU) 
+							-mtune=$(CPUTYPE) 
 					LDFLAGS+=-m32
 else
 			#if gcc 3.4+
 ifeq			($(CC_SHORTVER), 3.4)
-$(call				set_if_empty,CPU,athlon)
+$(call				set_if_empty,CPUTYPE,athlon)
 					CFLAGS+=-m32 -minline-all-stringops \
 							-falign-loops \
-							-mtune=$(CPU) 
+							-mtune=$(CPUTYPE) 
 					LDFLAGS+=-m32
 else
 			#if gcc 3.0+
 ifeq			($(CC_SHORTVER), 3.0)
-$(call				set_if_empty,CPU,athlon)
+$(call				set_if_empty,CPUTYPE,athlon)
 					CFLAGS+=-minline-all-stringops \
 							-falign-loops \
-							-mcpu=$(CPU)
+							-mcpu=$(CPUTYPE)
 					# -m32 supported since gcc 3.2
 else
 ifeq			($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5])
@@ -888,9 +888,9 @@ endif			# CC_SHORTVER, 5.0+, 4.5+ or 4.2+
 
 else		# CC_NAME, gcc
 ifeq		($(CC_NAME), clang)
-$(call                          set_if_empty,CPU,athlon64)
+$(call                          set_if_empty,CPUTYPE,athlon64)
 					C_DEFS+=-DCC_GCC_LIKE_ASM
-					CFLAGS+=-g -m32 $(CC_OPT) -mtune=$(CPU)
+					CFLAGS+=-g -m32 $(CC_OPT) -mtune=$(CPUTYPE)
 					LDFLAGS+=-m32
 else			# CC_NAME, clang
 ifeq		($(CC_NAME), icc)
@@ -917,9 +917,9 @@ ifeq		($(CC_NAME), gcc)
 				#common stuff
 				CFLAGS=-g $(CC_OPT) -funroll-loops  -Wcast-align $(PROFILE)
 			#if gcc 4.5+
-			# don't add '-mtune=$(CPU)' - gcc failure
+			# don't add '-mtune=$(CPUTYPE)' - gcc failure
 ifeq			($(CC_SHORTVER),$(filter $(CC_SHORTVER),4.5+ 5.0+))
-$(call				set_if_empty,CPU,opteron)
+$(call				set_if_empty,CPUTYPE,opteron)
 					CFLAGS+=-m64 -minline-all-stringops \
 							-falign-loops \
 							-ftree-vectorize \
@@ -928,36 +928,36 @@ $(call				set_if_empty,CPU,opteron)
 else
 			#if gcc 4.2+
 ifeq			($(CC_SHORTVER), 4.2+)
-$(call				set_if_empty,CPU,opteron)
+$(call				set_if_empty,CPUTYPE,opteron)
 					CFLAGS+=-m64 -minline-all-stringops \
 							-falign-loops \
 							-ftree-vectorize \
 							-fno-strict-overflow \
-							-mtune=$(CPU)
+							-mtune=$(CPUTYPE)
 					LDFLAGS+=-m64
 else
 			#if gcc 4.0+
 ifeq			($(CC_SHORTVER), 4.x)
-$(call				set_if_empty,CPU,opteron)
+$(call				set_if_empty,CPUTYPE,opteron)
 					CFLAGS+=-m64 -minline-all-stringops \
 							-falign-loops \
 							-ftree-vectorize \
-							-mtune=$(CPU) 
+							-mtune=$(CPUTYPE) 
 					LDFLAGS+=-m64
 else
 			#if gcc 3.4
 ifeq			($(CC_SHORTVER), 3.4)
-$(call				set_if_empty,CPU,athlon64)
+$(call				set_if_empty,CPUTYPE,athlon64)
 					CFLAGS+=-m64 -minline-all-stringops \
 							-falign-loops 
 					LDFLAGS+=-m64
 else
 			#if gcc 3.0
 ifeq			($(CC_SHORTVER), 3.0)
-$(call				set_if_empty,CPU,athlon64)
+$(call				set_if_empty,CPUTYPE,athlon64)
 					CFLAGS+=-minline-all-stringops \
 							-falign-loops 
-							#-mcpu=$(CPU) \ # not working on all x86_64 gccs
+							#-mcpu=$(CPUTYPE) \ # not working on all x86_64 gccs
 							#-mcpu=athlon
 					#-m64 on x86_64/x86 works starting with gcc 3.2
 else
@@ -981,7 +981,7 @@ endif			# CC_SHORTVER, 5.0+, 4.5+
 
 else		# CC_NAME, gcc
 ifeq            ($(CC_NAME), clang)
-$(call                          set_if_empty,CPU,opteron)
+$(call                          set_if_empty,CPUTYPE,opteron)
 					C_DEFS+=-DCC_GCC_LIKE_ASM
                                         CFLAGS+=-g -m64 \
                                                 $(CC_OPT)        
@@ -1014,10 +1014,10 @@ ifeq		($(CC_NAME), gcc)
 					#-Wmissing-prototypes 
 				#if gcc 5.0+, 4.5+ or 4.2+
 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+,$(CC_SHORTVER))))
-$(call				set_if_empty,CPU,ultrasparc)
+$(call				set_if_empty,CPUTYPE,ultrasparc)
 					#use 32bit for now
 					CFLAGS+=-m64 -mcpu=ultrasparc  \
-							-mtune=$(CPU) \
+							-mtune=$(CPUTYPE) \
 							-fno-strict-overflow \
 							-ftree-vectorize
 					# use -m64 to force 64 bit (but add it also to LDFLAGS and
@@ -1028,25 +1028,25 @@ $(call				set_if_empty,CPU,ultrasparc)
 else
 				#if gcc 4.x
 ifeq			($(CC_SHORTVER), 4.x)
-$(call				set_if_empty,CPU,ultrasparc)
+$(call				set_if_empty,CPUTYPE,ultrasparc)
 					#use 32bit for now
 					CFLAGS+=-m64 -mcpu=ultrasparc  \
-							-mtune=$(CPU) \
+							-mtune=$(CPUTYPE) \
 							-ftree-vectorize
 					LDFLAGS+=-m64
 else
 				#if gcc 3.4
 ifeq			($(CC_SHORTVER), 3.4)
-$(call				set_if_empty,CPU,ultrasparc)
+$(call				set_if_empty,CPUTYPE,ultrasparc)
 					#use 32bit for now
-					CFLAGS+=-m64 -mcpu=ultrasparc -mtune=$(CPU)
+					CFLAGS+=-m64 -mcpu=ultrasparc -mtune=$(CPUTYPE)
 					LDFLAGS+=-m64
 else
 				#if gcc 3.0
 ifeq			($(CC_SHORTVER), 3.0)
-$(call				set_if_empty,CPU,ultrasparc)
+$(call				set_if_empty,CPUTYPE,ultrasparc)
 					#use 32bit for now
-					CFLAGS+=-m64 -mcpu=ultrasparc -mtune=$(CPU)   \
+					CFLAGS+=-m64 -mcpu=ultrasparc -mtune=$(CPUTYPE)   \
 					# -mcpu=v9 or ultrasparc? # -mtune implied by -mcpu
 					#-mno-epilogue #try to inline function exit code
 					#-mflat # omit save/restore
@@ -1105,30 +1105,30 @@ ifeq		($(CC_NAME), gcc)
 					#-Wmissing-prototypes 
 				#if gcc 5.0+, 4.5+ or 4.2+
 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+,$(CC_SHORTVER))))
-$(call				set_if_empty,CPU,v8)
+$(call				set_if_empty,CPUTYPE,v8)
 					#use 32bit for now
-					CFLAGS+= -mtune=$(CPU) \
+					CFLAGS+= -mtune=$(CPUTYPE) \
 							-fno-strict-overflow \
 							-ftree-vectorize
 else
 				#if gcc 4.x
 ifeq			($(CC_SHORTVER), 4.x)
-$(call				set_if_empty,CPU,v8)
+$(call				set_if_empty,CPUTYPE,v8)
 					#use 32bit for now
-					CFLAGS+= -mtune=$(CPU) \
+					CFLAGS+= -mtune=$(CPUTYPE) \
 							-ftree-vectorize
 else
 				#if gcc 3.4
 ifeq			($(CC_SHORTVER), 3.4)
-$(call				set_if_empty,CPU,v8)
+$(call				set_if_empty,CPUTYPE,v8)
 					#use 32bit for now
-					CFLAGS+= -mtune=$(CPU)
+					CFLAGS+= -mtune=$(CPUTYPE)
 else
 				#if gcc 3.0
 ifeq			($(CC_SHORTVER), 3.0)
-$(call				set_if_empty,CPU,v8)
+$(call				set_if_empty,CPUTYPE,v8)
 					#use 32bit for now
-					CFLAGS+= -mtune=$(CPU)   \
+					CFLAGS+= -mtune=$(CPUTYPE)   \
 					#-mno-epilogue #try to inline function exit code
 					#-mflat # omit save/restore
 					#-,faster-structs #faster non Sparc ABI structure copy ops
@@ -1451,23 +1451,23 @@ ifeq		($(CC_NAME), gcc)
 				CFLAGS=
 			#if gcc 5.0+, 4.5+ or 4.2+
 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+,$(CC_SHORTVER))))
-$(call				set_if_empty,CPU,powerpc)
+$(call				set_if_empty,CPUTYPE,powerpc)
 ifeq 				($(NOALTIVEC),)
 						CFLAGS += $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE)
 						CFLAGS += -ftree-vectorize
 						CFLAGS += -maltivec
 						CFLAGS += -fno-strict-overflow
-						CFLAGS += -mtune=$(CPU)
+						CFLAGS += -mtune=$(CPUTYPE)
 endif
 else
 			#if gcc 4.0+
 ifeq			($(CC_SHORTVER), 4.x)
-$(call				set_if_empty,CPU,powerpc)
+$(call				set_if_empty,CPUTYPE,powerpc)
 ifeq 				($(NOALTIVEC),)
 						CFLAGS += $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE)
 						CFLAGS += -ftree-vectorize
 						CFLAGS += -maltivec
-						CFLAGS += -mtune=$(CPU)
+						CFLAGS += -mtune=$(CPUTYPE)
 endif
 else
 			#if gcc 3.4+
@@ -1508,16 +1508,16 @@ ifeq		($(CC_NAME), gcc)
 				CFLAGS= $(CC_OPT) -funroll-loops -fsigned-char $(PROFILE)
 			#if gcc 5.0+, 4.5+ or 4.2+
 ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+,$(CC_SHORTVER))))
-$(call				set_if_empty,CPU,powerpc64)
+$(call				set_if_empty,CPUTYPE,powerpc64)
 					CFLAGS+=-ftree-vectorize \
 							-fno-strict-overflow \
-							-mtune=$(CPU) -maltivec
+							-mtune=$(CPUTYPE) -maltivec
 else
 			#if gcc 4.0+
 ifeq			($(CC_SHORTVER), 4.x)
-$(call				set_if_empty,CPU,powerpc64)
+$(call				set_if_empty,CPUTYPE,powerpc64)
 					CFLAGS+=-ftree-vectorize \
-							-mtune=$(CPU) -maltivec
+							-mtune=$(CPUTYPE) -maltivec
 else
 			#if gcc 3.4+
 ifeq			($(CC_SHORTVER), 3.4)
@@ -2019,7 +2019,7 @@ saved_fixed_vars:=	MAIN_NAME  CFG_NAME SCR_NAME FLAVOUR INSTALL_FLAVOUR \
 # variable changeable at compile time
 # extra: prefix DESTDIR BASEDIR basedirt
 saved_chg_vars:=\
-		CC_EXTRA_OPTS CPU CFLAGS_RM CFLAGS MOD_CFLAGS LIB_CFLAGS UTILS_CFLAGS \
+		CC_EXTRA_OPTS CPUTYPE CFLAGS_RM CFLAGS MOD_CFLAGS LIB_CFLAGS UTILS_CFLAGS \
 		BASEDIR basedir DESTDIR LIBDIR RUNBASEDIR runbasedir \
 		PREFIX prefix \
 		cfg_prefix cfg_dir bin_prefix bin_dir modules_prefix modules_dir \