use -D$(CPUNAME) for all platforms also in gbuild

19 files changed, 7 insertions, 25 deletions

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 012915a73479..48bebebb57e3 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -197,6 +197,8 @@ ifneq ($(strip gb__ENV_CXXFLAGS),)
 gb_LinkTarget_CXXFLAGS += $(gb__ENV_CXXFLAGS)
 endif
 
+gb_CPUDEFS += -D$(CPUNAME)
+
 gb_GLOBALDEFS := \
 	-D_REENTRANT \
 	-DCUI \
diff --git a/solenv/gbuild/platform/dragonfly.mk b/solenv/gbuild/platform/dragonfly.mk
index a06e6a91109b..05a013fd8bdc 100644
--- a/solenv/gbuild/platform/dragonfly.mk
+++ b/solenv/gbuild/platform/dragonfly.mk
@@ -32,8 +32,6 @@
 
 ifeq ($(CPUNAME),INTEL)
 gb_CPUDEFS := -DX86
-else
-gb_CPUDEFS := -D$(CPUNAME)
 endif
 
 gb_COMPILERDEFAULTOPTFLAGS := -O -g
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
index 218f6210042d..73dd7dda29b2 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -32,8 +32,6 @@
 
 ifeq ($(CPUNAME),INTEL)
 gb_CPUDEFS := -DX86
-else
-gb_CPUDEFS := -D$(CPUNAME)
 endif
 
 gb_COMPILERDEFAULTOPTFLAGS := -O2
diff --git a/solenv/gbuild/platform/linux-AXP.mk b/solenv/gbuild/platform/linux-AXP.mk
index f7c8a593ffa2..b550995df59d 100644
--- a/solenv/gbuild/platform/linux-AXP.mk
+++ b/solenv/gbuild/platform/linux-AXP.mk
@@ -29,7 +29,6 @@
 #*************************************************************************
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -D$(CPUNAME)
 gb_COMPILERDEFAULTOPTFLAGS := -Os
 gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
 gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
diff --git a/solenv/gbuild/platform/linux-HPPA.mk b/solenv/gbuild/platform/linux-HPPA.mk
index 26a1ef23a378..ac21c9088c44 100644
--- a/solenv/gbuild/platform/linux-HPPA.mk
+++ b/solenv/gbuild/platform/linux-HPPA.mk
@@ -29,7 +29,6 @@
 #*************************************************************************
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -D$(CPUNAME)
 gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/linux.mk
diff --git a/solenv/gbuild/platform/linux-IA64.mk b/solenv/gbuild/platform/linux-IA64.mk
index 3994cbf836f0..ac21c9088c44 100644
--- a/solenv/gbuild/platform/linux-IA64.mk
+++ b/solenv/gbuild/platform/linux-IA64.mk
@@ -29,7 +29,6 @@
 #*************************************************************************
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS := -D$(CPUNAME)
 gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/linux.mk
diff --git a/solenv/gbuild/platform/linux-M68K.mk b/solenv/gbuild/platform/linux-M68K.mk
index d5e9088fb75c..d7c0de18f74c 100644
--- a/solenv/gbuild/platform/linux-M68K.mk
+++ b/solenv/gbuild/platform/linux-M68K.mk
@@ -29,7 +29,6 @@
 #*************************************************************************
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -D$(CPUNAME)
 gb_COMPILERDEFAULTOPTFLAGS := -Os
 gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
 gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
diff --git a/solenv/gbuild/platform/linux-POWERPC.mk b/solenv/gbuild/platform/linux-POWERPC.mk
index 495efb49bee8..2ac40285f018 100644
--- a/solenv/gbuild/platform/linux-POWERPC.mk
+++ b/solenv/gbuild/platform/linux-POWERPC.mk
@@ -29,7 +29,7 @@
 #*************************************************************************
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -DPOWERPC -DPPC
+gb_CPUDEFS += -DPPC
 gb_COMPILERDEFAULTOPTFLAGS := -O2
 gb_CXXFLAGS += -fsigned-char
 gb_CFLAGS += -fsigned-char
diff --git a/solenv/gbuild/platform/linux-POWERPC64.mk b/solenv/gbuild/platform/linux-POWERPC64.mk
index 5b46a6226725..e48979b18bba 100644
--- a/solenv/gbuild/platform/linux-POWERPC64.mk
+++ b/solenv/gbuild/platform/linux-POWERPC64.mk
@@ -29,7 +29,6 @@
 #*************************************************************************
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS := -D$(CPUNAME)
 gb_CXXFLAGS += -mminimal-toc
 gb_CFLAGS += -fsigned-char
 
diff --git a/solenv/gbuild/platform/linux-S390.mk b/solenv/gbuild/platform/linux-S390.mk
index 79689f7e1d33..6f5fec935ff1 100644
--- a/solenv/gbuild/platform/linux-S390.mk
+++ b/solenv/gbuild/platform/linux-S390.mk
@@ -29,7 +29,6 @@
 #*************************************************************************
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS += -D$(CPUNAME)
 gb_COMPILERDEFAULTOPTFLAGS := -O2
 gb_CXXFLAGS += -fsigned-char -fno-omit-frame-pointer
 gb_CFLAGS += -fsigned-char -fno-omit-frame-pointer
diff --git a/solenv/gbuild/platform/linux-S390X.mk b/solenv/gbuild/platform/linux-S390X.mk
index 5e4a81ed5943..e50579e2d419 100644
--- a/solenv/gbuild/platform/linux-S390X.mk
+++ b/solenv/gbuild/platform/linux-S390X.mk
@@ -29,7 +29,6 @@
 #*************************************************************************
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS := -D$(CPUNAME)
 
 include $(GBUILDDIR)/platform/linux-S390.mk
 
diff --git a/solenv/gbuild/platform/linux-SPARC.mk b/solenv/gbuild/platform/linux-SPARC.mk
index b10a2dff7f69..bfb3ad4d4a78 100644
--- a/solenv/gbuild/platform/linux-SPARC.mk
+++ b/solenv/gbuild/platform/linux-SPARC.mk
@@ -29,7 +29,6 @@
 #*************************************************************************
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS := -D$(CPUNAME)
 gb_COMPILERDEFAULTOPTFLAGS := -Os
 
 include $(GBUILDDIR)/platform/linux.mk
diff --git a/solenv/gbuild/platform/linux-X86_64.mk b/solenv/gbuild/platform/linux-X86_64.mk
index 3994cbf836f0..ac21c9088c44 100644
--- a/solenv/gbuild/platform/linux-X86_64.mk
+++ b/solenv/gbuild/platform/linux-X86_64.mk
@@ -29,7 +29,6 @@
 #*************************************************************************
 
 #please make generic modifications to unxgcc.mk or linux.mk
-gb_CPUDEFS := -D$(CPUNAME)
 gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/linux.mk
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 5cc070dfc3e9..f32ddee4372e 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -68,7 +68,7 @@ gb_COMPILERDEFS := \
 	-DGXX_INCLUDE_PATH=$(GXX_INCLUDE_PATH) \
 
 ifeq ($(CPUNAME),POWERPC)
-gb_CPUDEFS := -DPOWERPC -DPPC
+gb_CPUDEFS := -DPPC
 else
 gb_CPUDEFS := -DX86
 endif
diff --git a/solenv/gbuild/platform/netbsd.mk b/solenv/gbuild/platform/netbsd.mk
index 744c5d10e957..8dc3794295da 100644
--- a/solenv/gbuild/platform/netbsd.mk
+++ b/solenv/gbuild/platform/netbsd.mk
@@ -32,8 +32,6 @@
 
 ifeq ($(CPUNAME),INTEL)
 gb_CPUDEFS := -DX86
-else
-gb_CPUDEFS := -D$(CPUNAME)
 endif
 
 gb_COMPILERDEFAULTOPTFLAGS := -O2
diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk
index 2e7100dfe7b5..a8380eee965b 100644
--- a/solenv/gbuild/platform/openbsd.mk
+++ b/solenv/gbuild/platform/openbsd.mk
@@ -32,8 +32,6 @@
 
 ifeq ($(CPUNAME),INTEL)
 gb_CPUDEFS := -DX86
-else
-gb_CPUDEFS := -D$(CPUNAME)
 endif
 
 gb_COMPILERDEFAULTOPTFLAGS := -O2
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 90fadba9f9ac..81148a9edc6c 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -62,9 +62,8 @@ gb_COMPILERDEFS := \
 	-D$(COM) \
 	-DCPPU_ENV=sunpro5 \
 
-gb_CPUDEFS := -D$(CPUNAME)
 ifeq ($(CPUNAME),SPARC)
-gb_CPUDEFS += -D__sparcv8plus
+gb_CPUDEFS := -D__sparcv8plus
 endif
 
 gb_CFLAGS := \
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index 73cfd3ada4a5..795b42f8adbe 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -68,7 +68,7 @@ gb_COMPILERDEFS := \
 	-DCPPU_ENV=msci \
 	-DM1500 \
 
-gb_CPUDEFS := -DINTEL -D_X86_=1
+gb_CPUDEFS := -D_X86_=1
 
 gb_RCDEFS := \
 	 -DWINVER=0x0400 \
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index 518ff944b970..8c056393c16f 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -85,9 +85,7 @@ gb_COMPILERDEFS := \
 	-D_MSC_EXTENSIONS \
 	-D_FORCENAMELESSUNION \
 
-gb_CPUDEFS := \
-	-DINTEL \
-	-D_M_IX86 \
+gb_CPUDEFS := -D_M_IX86
 
 gb_RCDEFS := \
 	 -DWINVER=0x0400 \