Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugzilla bug 128955: support Netscape's uname, MKS's uname, and Cygwin's

Browse Source 
uname.  Since CPU_ARCH is already defined in arch.mk, removed the redundant
definition in WIN*.mk.  Removed the unnecessary internal variable
PROCESSOR.  r=cls.
Modified Files: WIN954.0.mk WINNT3.51.mk WINNT4.0.mk WINNT5.0.mk
                WINNT5.1.mk arch.mk


git-svn-id: svn://10.0.0.236/trunk@117311 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
wtc%netscape.com
2002-03-23 15:06:02 +00:00
parent 5472be58bb
commit 8b9811c7b3
6 changed files with 21 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
mozilla/security/coreconf/WIN954.0.mk
View File

@@ -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

14
mozilla/security/coreconf/WINNT3.51.mk
View File

@@ -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

15
mozilla/security/coreconf/WINNT4.0.mk
View File

@@ -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

15
mozilla/security/coreconf/WINNT5.0.mk
View File

@@ -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

15
mozilla/security/coreconf/WINNT5.1.mk
View File

@@ -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

2
mozilla/security/coreconf/arch.mk
View File

@@ -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