diff options
| author | nelson%bolyard.com <devnull@localhost> | 2009-05-01 22:14:48 +0000 |
|---|---|---|
| committer | nelson%bolyard.com <devnull@localhost> | 2009-05-01 22:14:48 +0000 |
| commit | 7537a4ce3f7afbe019ded1d7f45da630721c1bc2 (patch) | |
| tree | 53dcda0edf5f6a19a8041a45240c7e45f7bf3530 | |
| parent | ad463def6f6147f1e72c51a743e0a140ca09ea93 (diff) | |
| download | nss-hg-7537a4ce3f7afbe019ded1d7f45da630721c1bc2.tar.gz | |
Bug 427135: Add super-H(sh3,4) architecture support. r=christophe.ravel
| -rw-r--r-- | security/coreconf/Linux.mk | 46 |
1 files changed, 6 insertions, 40 deletions
diff --git a/security/coreconf/Linux.mk b/security/coreconf/Linux.mk index 7725a97cc..835e8827e 100644 --- a/security/coreconf/Linux.mk +++ b/security/coreconf/Linux.mk @@ -52,10 +52,6 @@ RANLIB = ranlib DEFAULT_COMPILER = gcc -ifeq ($(OS_TEST),m68k) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = m68k -else ifeq ($(OS_TEST),ppc64) OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE CPU_ARCH = ppc @@ -63,18 +59,10 @@ ifeq ($(USE_64),1) ARCHFLAG = -m64 endif else -ifeq ($(OS_TEST),ppc) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = ppc -else ifeq ($(OS_TEST),alpha) OS_REL_CFLAGS = -D_ALPHA_ -DLINUX1_2 -D_XOPEN_SOURCE CPU_ARCH = alpha else -ifeq ($(OS_TEST),ia64) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = ia64 -else ifeq ($(OS_TEST),x86_64) ifeq ($(USE_64),1) OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE @@ -85,10 +73,6 @@ else ARCHFLAG = -m32 endif else -ifeq ($(OS_TEST),sparc) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = sparc -else ifeq ($(OS_TEST),sparc64) OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE CPU_ARCH = sparc @@ -97,30 +81,19 @@ ifeq (,$(filter-out arm% sa110,$(OS_TEST))) OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE CPU_ARCH = arm else -ifeq ($(OS_TEST),parisc) +ifeq (,$(filter-out parisc%,$(OS_TEST))) OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE CPU_ARCH = hppa else -ifeq ($(OS_TEST),parisc64) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = hppa -else -ifeq ($(OS_TEST),s390) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = s390 -else -ifeq ($(OS_TEST),s390x) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = s390x -else -ifeq ($(OS_TEST),mips) - OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE - CPU_ARCH = mips -else ifeq (,$(filter-out i%86,$(OS_TEST))) OS_REL_CFLAGS = -DLINUX1_2 -Di386 -D_XOPEN_SOURCE CPU_ARCH = x86 else +ifeq ($(OS_TEST),sh4a) + OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE + CPU_ARCH = sh4 +else +# $(OS_TEST) == m68k, ppc, ia64, sparc, s390, s390x, mips, sh3, sh4 OS_REL_CFLAGS = -DLINUX1_2 -D_XOPEN_SOURCE CPU_ARCH = $(OS_TEST) endif @@ -131,13 +104,6 @@ endif endif endif endif -endif -endif -endif -endif -endif -endif -endif LIBC_TAG = _glibc |