820374 - undefined symbol _OSAtomicCompareAndSwapPtrBarrier on OSX 10.4

Status: RESOLVED FIXED

(NSS :: Libraries, defect, P2)

Description

[Kai Engert [:KaiE:]]

Since the upgrade of NSS in bug 818771, our OSX PowerPC machine reports an error:

sqlite3.c:15552: warning: implicit declaration of function `OSAtomicCompareAndSwapPtrBarrier'
ld: Undefined symbols:
_OSAtomicCompareAndSwapPtrBarrier

Base on the discussion found at
http://www.mail-archive.com/[e-mail]/msg67035.html
I made a patch that can keep our OSX PowerPC testing alive a little longer.

Comment 1

[Kai Engert [:KaiE:]]

Attachment: Patch v1

Comment 2

[Kai Engert [:KaiE:]]

Checked in early, because of bustage.

Checking in config.mk;
/cvsroot/mozilla/security/nss/lib/sqlite/config.mk,v  <--  config.mk
new revision: 1.9; previous revision: 1.8
done

Comment 3

[Wan-Teh Chang]

Comment on attachment 690865 [details] [diff] [review]
Patch v1

Review of attachment 690865 [details] [diff] [review]:
-----------------------------------------------------------------

r=wtc. Thanks for the patch.

Before I saw your patch, I also looked into the build error and
thought about how to patch SQLite to make it work. But I think
your solution is better. I suggest some comment changes.

::: mozilla/security/nss/lib/sqlite/config.mk
@@ +34,5 @@
>  # to the linker.)  Apple builds the system libsqlite3.dylib with these
>  # version numbers, so we use the same to be compatible.
>  DARWIN_DYLIB_VERSIONS = -compatibility_version 9 -current_version 9.6
> +
> +# Required for Mac OSX 10.4 PowerPC, see bug 820374

Please remove "PowerPC" because this problem is specific to the OS version.
I suggest saying more in this comment:
  # The SQLite code that uses the Apple zone allocator calls OSAtomicCompareAndSwapPtrBarrier,
  # which is only available on Mac OS X 10.5 (Darwin 9.0) and later. Define
  # SQLITE_WITHOUT_ZONEMALLOC to disable that code for older versions of
  # Mac OS X. See bug 820374.

@@ +45,1 @@
>  endif

Delete the blank line before the final "endif". We probably should add
a comment to the final endif because this conditional block is quite
long:
  endif # Darwin

Comment 4

[Wan-Teh Chang]

This bug was introduced in NSS 3.14.2 (pre-release) in bug 818771.
(Next time this happens, we should just deal with it in bug 818771.)
This bug affects both PowerPC and Intel CPUs. Only the OS X version
is important.

Comment 5

[Kai Engert [:KaiE:]]

Attachment: incremental patch v2

thanks for the review. I'm attaching an incremental patch for the comment and the cleanup that you have suggested.

Comment 6

[Kai Engert [:KaiE:]]

Checking in config.mk;
/cvsroot/mozilla/security/nss/lib/sqlite/config.mk,v  <--  config.mk
new revision: 1.10; previous revision: 1.9
done