diff --git a/mozilla/security/coreconf/WIN954.0.mk b/mozilla/security/coreconf/WIN954.0.mk
index 8b99703fe31..24a44c1ffa0 100644
--- a/mozilla/security/coreconf/WIN954.0.mk
+++ b/mozilla/security/coreconf/WIN954.0.mk
@@ -35,29 +35,22 @@
 # Config stuff for WIN95
 #
 # This makefile defines the following variables:
-# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS.
-# PROCESSOR is an internal variable.
+# OS_CFLAGS and OS_DLLFLAGS.
 
 include $(CORE_DEPTH)/coreconf/WIN32.mk
 
-PROCESSOR := $(shell uname -p)
-ifeq ($(PROCESSOR), I386)
-	CPU_ARCH   = x386
+ifeq ($(CPU_ARCH), x386)
 	OS_CFLAGS += -W3 -nologo
 	DEFINES += -D_X86_
 else 
-	ifeq ($(PROCESSOR), MIPS)
-		CPU_ARCH    = MIPS
+	ifeq ($(CPU_ARCH), MIPS)
 		#OS_CFLAGS += -W3 -nologo
 		#DEFINES += -D_MIPS_
 		OS_CFLAGS  += -W3 -nologo
 	else 
-		ifeq ($(PROCESSOR), ALPHA)
-			CPU_ARCH  = ALPHA
+		ifeq ($(CPU_ARCH), ALPHA)
 			OS_CFLAGS += -W3 -nologo
 			DEFINES += -D_ALPHA_=1
-		else 
-			CPU_ARCH  = processor_is_undefined
 		endif
 	endif
 endif
diff --git a/mozilla/security/coreconf/WINNT3.51.mk b/mozilla/security/coreconf/WINNT3.51.mk
index 606e7a3b1cd..b422b2b566b 100644
--- a/mozilla/security/coreconf/WINNT3.51.mk
+++ b/mozilla/security/coreconf/WINNT3.51.mk
@@ -35,26 +35,20 @@
 # Config stuff for WINNT 3.51
 #
 # This makefile defines the following variables:
-# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS.
+# OS_CFLAGS and OS_DLLFLAGS.
 # It has the following internal variables:
 # OS_PROC_CFLAGS and OS_WIN_CFLAGS.
 
 include $(CORE_DEPTH)/coreconf/WIN32.mk
 
-PROCESSOR := $(shell uname -p)
-ifeq ($(PROCESSOR), I386)
-	CPU_ARCH        = x386
+ifeq ($(CPU_ARCH), x386)
 	OS_PROC_CFLAGS += -D_X86_
 else 
-	ifeq ($(PROCESSOR), MIPS)
-		CPU_ARCH        = MIPS
+	ifeq ($(CPU_ARCH), MIPS)
 		OS_PROC_CFLAGS += -D_MIPS_
 	else 
-		ifeq ($(PROCESSOR), ALPHA)
-			CPU_ARCH        = ALPHA
+		ifeq ($(CPU_ARCH), ALPHA)
 			OS_PROC_CFLAGS += -D_ALPHA_
-		else 
-			CPU_ARCH  = processor_is_undefined
 		endif
 	endif
 endif
diff --git a/mozilla/security/coreconf/WINNT4.0.mk b/mozilla/security/coreconf/WINNT4.0.mk
index c760bb4fb34..7fc5a54d617 100644
--- a/mozilla/security/coreconf/WINNT4.0.mk
+++ b/mozilla/security/coreconf/WINNT4.0.mk
@@ -35,29 +35,22 @@
 # Config stuff for WINNT 4.0
 #
 # This makefile defines the following variables:
-# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS.
-# PROCESSOR is an internal variable.
+# OS_CFLAGS and OS_DLLFLAGS.
 
 include $(CORE_DEPTH)/coreconf/WIN32.mk
 
-PROCESSOR := $(shell uname -p)
-ifeq ($(PROCESSOR), I386)
-	CPU_ARCH   = x386
+ifeq ($(CPU_ARCH), x386)
 	OS_CFLAGS += -W3 -nologo
 	DEFINES += -D_X86_
 else 
-	ifeq ($(PROCESSOR), MIPS)
-		CPU_ARCH  = MIPS
+	ifeq ($(CPU_ARCH), MIPS)
 		#OS_CFLAGS += -W3 -nologo
 		#DEFINES += -D_MIPS_
 		OS_CFLAGS += -W3 -nologo
 	else 
-		ifeq ($(PROCESSOR), ALPHA)
-			CPU_ARCH  = ALPHA
+		ifeq ($(CPU_ARCH), ALPHA)
 			OS_CFLAGS += -W3 -nologo
 			DEFINES += -D_ALPHA_=1
-		else 
-			CPU_ARCH  = processor_is_undefined
 		endif
 	endif
 endif
diff --git a/mozilla/security/coreconf/WINNT5.0.mk b/mozilla/security/coreconf/WINNT5.0.mk
index 844e7c04866..303b98007b7 100644
--- a/mozilla/security/coreconf/WINNT5.0.mk
+++ b/mozilla/security/coreconf/WINNT5.0.mk
@@ -35,29 +35,22 @@
 # Config stuff for WINNT 5.0 (Windows 2000)
 #
 # This makefile defines the following variables:
-# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS.
-# PROCESSOR is an internal variable.
+# OS_CFLAGS and OS_DLLFLAGS.
 
 include $(CORE_DEPTH)/coreconf/WIN32.mk
 
-PROCESSOR := $(shell uname -p)
-ifeq ($(PROCESSOR), I386)
-	CPU_ARCH   = x386
+ifeq ($(CPU_ARCH), x386)
 	OS_CFLAGS += -W3 -nologo
 	DEFINES += -D_X86_
 else 
-	ifeq ($(PROCESSOR), MIPS)
-		CPU_ARCH  = MIPS
+	ifeq ($(CPU_ARCH), MIPS)
 		#OS_CFLAGS += -W3 -nologo
 		#DEFINES += -D_MIPS_
 		OS_CFLAGS += -W3 -nologo
 	else 
-		ifeq ($(PROCESSOR), ALPHA)
-			CPU_ARCH  = ALPHA
+		ifeq ($(CPU_ARCH), ALPHA)
 			OS_CFLAGS += -W3 -nologo
 			DEFINES += -D_ALPHA_=1
-		else 
-			CPU_ARCH  = processor_is_undefined
 		endif
 	endif
 endif
diff --git a/mozilla/security/coreconf/WINNT5.1.mk b/mozilla/security/coreconf/WINNT5.1.mk
index 90b5a546a38..f9c7ed1c8d1 100644
--- a/mozilla/security/coreconf/WINNT5.1.mk
+++ b/mozilla/security/coreconf/WINNT5.1.mk
@@ -35,29 +35,22 @@
 # Config stuff for WINNT 5.1 (Windows XP)
 #
 # This makefile defines the following variables:
-# CPU_ARCH, OS_CFLAGS, and OS_DLLFLAGS.
-# PROCESSOR is an internal variable.
+# OS_CFLAGS and OS_DLLFLAGS.
 
 include $(CORE_DEPTH)/coreconf/WIN32.mk
 
-PROCESSOR := $(shell uname -p)
-ifeq ($(PROCESSOR), I386)
-	CPU_ARCH   = x386
+ifeq ($(CPU_ARCH), x386)
 	OS_CFLAGS += -W3 -nologo
 	DEFINES += -D_X86_
 else 
-	ifeq ($(PROCESSOR), MIPS)
-		CPU_ARCH  = MIPS
+	ifeq ($(CPU_ARCH), MIPS)
 		#OS_CFLAGS += -W3 -nologo
 		#DEFINES += -D_MIPS_
 		OS_CFLAGS += -W3 -nologo
 	else 
-		ifeq ($(PROCESSOR), ALPHA)
-			CPU_ARCH  = ALPHA
+		ifeq ($(CPU_ARCH), ALPHA)
 			OS_CFLAGS += -W3 -nologo
 			DEFINES += -D_ALPHA_=1
-		else 
-			CPU_ARCH  = processor_is_undefined
 		endif
 	endif
 endif
diff --git a/mozilla/security/coreconf/arch.mk b/mozilla/security/coreconf/arch.mk
index b5c4f7d0a31..277232c0c6d 100644
--- a/mozilla/security/coreconf/arch.mk
+++ b/mozilla/security/coreconf/arch.mk
@@ -252,7 +252,7 @@ ifeq (CYGWIN_NT,$(findstring CYGWIN_NT,$(OS_ARCH)))
 	# Cygwin's uname -m returns "i686" on a Pentium Pro machine.
 	#
 	ifneq (,$(findstring 86,$(CPU_ARCH)))
-	    CPU_ARCH = x86
+	    CPU_ARCH = x386
 	endif
     endif
 endif