568648 - Do not define -Di386 or -Dppc in security/coreconf/Darwin.mk

Status: NEW

(NSS :: Libraries, defect, P2)

Description

[Wan-Teh Chang]

This is related to the NSPR patch in bug 417044.

We should not define -Di386 or -Dppc when building on Mac OS X.

This requires inspecting the search results of
http://mxr.mozilla.org/security/search?string=i386
http://mxr.mozilla.org/security/search?string=ppc

Note: these MXR search queries seem to miss mozilla/dbm.  This
should be fixed.

I looked at the search results and concluded that
1. We can remove -Dppc immediately.
2. Before we can remove -Di386, we may need to change the following files:
    mozilla/dbm/include/mcom_db.h
    mozilla/security/coreconf/mkdepend/imakemdep.h
    mozilla/security/nss/lib/freebl/arcfour.c
    mozilla/security/nss/lib/freebl/mpi/mpcpucache.c
    mozilla/security/nss/lib/jar/jzconf.h

I created a patch for mozilla/security/nss/lib/freebl first since it is
part of the FIPS cryptographic module.

The attached patch uses our own macros NSS_X86, NSS_X64, and
NSS_X86_OR_X64 instead of the various compiler predefined macros.
It also adds "i386" to the list of CPU_ARCH values because Darwin.mk
sets CPU_ARCH to i386 instead of x86:
http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/security/coreconf/Darwin.mk&rev=1.24&mark=46-50,52#46

Bob, let me know if you prefer a smaller patch that merely adds
defined(__i386__) to the two .c files.

Comment 1

[BugBot [:suhaib / :marco/ :calixte]]

The bug assignee is inactive on Bugzilla, so the assignee is being reset.