From owner-freebsd-gecko@FreeBSD.ORG  Wed Aug  1 18:25:12 2012
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 8A7291065672
	for <freebsd-gecko@freebsd.org>; Wed,  1 Aug 2012 18:25:12 +0000 (UTC)
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
	[217.150.245.56])
	by mx1.freebsd.org (Postfix) with ESMTP id 15CC78FC1A
	for <freebsd-gecko@freebsd.org>; Wed,  1 Aug 2012 18:25:11 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
	by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q71IP8vd015567
	for <freebsd-gecko@freebsd.org>; Wed, 1 Aug 2012 18:25:08 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q71IP3P5015168
	for freebsd-gecko@freebsd.org; Wed, 1 Aug 2012 18:25:03 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Wed, 1 Aug 2012 18:25:03 GMT
Message-Id: <201208011825.q71IP3P5015168@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
	svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [SVN-Commit] r907 - branches/experimental/security/nss/files
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 01 Aug 2012 18:25:12 -0000

Author: jbeich
Date: Wed Aug  1 18:25:03 2012
New Revision: 907

Log:
- simplify arch detection, no need to duplicate CPU_ARCH = $(OS_TEST)
- rename powerpc to ppc, that's what everyone else uses

Modified:
   branches/experimental/security/nss/files/patch-..::coreconf::FreeBSD.mk

Modified: branches/experimental/security/nss/files/patch-..::coreconf::FreeBSD.mk
==============================================================================
--- branches/experimental/security/nss/files/patch-..::coreconf::FreeBSD.mk	Wed Aug  1 16:12:38 2012	(r906)
+++ branches/experimental/security/nss/files/patch-..::coreconf::FreeBSD.mk	Wed Aug  1 18:25:03 2012	(r907)
@@ -13,33 +13,19 @@
  RANLIB			= ranlib
  
  CPU_ARCH		= $(OS_TEST)
-@@ -50,7 +50,26 @@
- CPU_ARCH		= x86
- endif
+@@ -52,6 +52,12 @@ endif
  ifeq ($(CPU_ARCH),amd64)
  CPU_ARCH		= x86_64
-+USE_64			= 1
-+endif
-+ifeq ($(OS_TEST),alpha)
-+CPU_ARCH		= alpha
-+endif
-+ifeq ($(OS_TEST),powerpc64)
-+CPU_ARCH		= powerpc
-+USE_64			= 1
-+endif
-+ifeq ($(OS_TEST),powerpc)
-+CPU_ARCH		= powerpc
+ endif
++ifneq (,$(filter powerpc%, $(CPU_ARCH)))
++CPU_ARCH		= ppc
 +endif
-+ifeq ($(OS_TEST),sparc64)
-+CPU_ARCH		= sparc64
++ifneq (,$(filter %64, $(CPU_ARCH)))
 +USE_64			= 1
 +endif
-+ifeq ($(OS_TEST),ia64)
-+CPU_ARCH		= ia64
-+USE_64			= 1
- endif
  
  OS_CFLAGS		= $(DSO_CFLAGS) -ansi -Wall -Wno-switch -DFREEBSD -DHAVE_STRERROR -DHAVE_BSD_FLOCK
+ 
 @@ -65,20 +80,18 @@
  USE_PTHREADS		= 1
  DEFINES			+= -D_THREAD_SAFE -D_REENTRANT