Bug 1235132 - Convert sqlite and nss to SYMBOLS_FILE. r=gps

--HG--
rename : config/external/nss/nss.def => config/external/nss/nss.symbols
rename : db/sqlite3/src/sqlite.def => db/sqlite3/src/sqlite.symbols

config/external/nss/Makefile.in

@@ -344,31 +344,6 @@ ifdef MOZ_FOLD_LIBS
 # Add all static libraries for nss, smime, ssl and nssutil
 STATIC_LIBS += $(addprefix $(DEPTH)/security/,$(NSS_STATIC_LIBS))
 
-nss_def_file := $(srcdir)/nss.def
-
-ifeq (WINNT,$(OS_TARGET))
-# Create a .def file based on the various .def files for nss, smime, ssl and
-# nssutil.
-nss3.def: $(nss_def_file) $(DEPTH)/db/sqlite3/src/sqlite-processed.def $(NSS_EXTRA_SYMBOLS_FILE)
-	echo LIBRARY nss3$(DLL_SUFFIX) > $@.tmp
-	echo EXPORTS >> $@.tmp
-	grep -v -h -e ^LIBRARY -e ^EXPORTS -e ^\; $^ >> $@.tmp
-	mv $@.tmp $@
-else
-ifdef GCC_USE_GNU_LD
-sqlite_def_file := $(topsrcdir)/db/sqlite3/src/sqlite.def
-nspr_def_file := $(srcdir)/nspr-dummy.def
-
-nss3.def: $(nss_def_file) $(sqlite_def_file) $(nspr_def_file) $(NSS_EXTRA_SYMBOLS_FILE)
-	@$(call py_action,convert_def_file, \
-	  $(DEFINES) $(ACDEFINES) $(MOZ_DEBUG_DEFINES) -o $@ $^)
-
-GARBAGE += \
-  nss3.def \
-  $(NULL)
-endif # GCC_USE_GNU_LD
-endif # WINNT
-
 IMPORT_LIB_FILES = $(IMPORT_LIBRARY)
 IMPORT_LIB_DEST ?= $(DIST)/lib
 IMPORT_LIB_TARGET = target

config/external/nss/moz.build

@@ -31,11 +31,7 @@ elif CONFIG['MOZ_FOLD_LIBS']:
 
     OS_LIBS += CONFIG['REALTIME_LIBS']
 
-    if CONFIG['OS_TARGET'] == 'WINNT':
+    SYMBOLS_FILE = 'nss.symbols'
-        DEFFILE = 'nss3.def'
-
-    if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['GCC_USE_GNU_LD']:
-        LD_VERSION_SCRIPT = 'nss3.def'
 else:
     Library('nss')
     USE_LIBS += [

config/external/nss/nspr-dummy.def

@@ -1,15 +0,0 @@
-; This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
-; This is a fake .def file, to be used for generating linker scripts
-; for our folded libnss when MOZ_FOLD_LIBS.  NSPR, unlike NSS, exports
-; symbols with symbol visibility (Unix) or __declspec (Windows).  When
-; using a linker script, however, we need to explicitly specify that
-; NSPR's symbols should be globally visible.  Otherwise, NSPR's exported
-; symbols would match the |local: *| rule and be hidden.
-LIBRARY libnsprdummy
-EXPORTS
-PR_* ; Actual .def files don't allow wildcards, of course.
-_PR_*
-PL_*

config/external/nss/nss.symbols

@@ -1,11 +1,20 @@
-; This Source Code Form is subject to the terms of the Mozilla Public
+# This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;
+
-; This is a fake .def file, to be used for generating linker scripts
+#ifndef XP_WIN
-; for our folded libnss when MOZ_FOLD_LIBS.
+# NSPR, unlike NSS, exports symbols with symbol visibility (Unix) or __declspec
-LIBRARY nss3
+# (Windows).  When using a linker script, however, we need to explicitly
-EXPORTS
+# specify that NSPR's symbols should be globally visible.  Otherwise, NSPR's
+# exported symbols would be hidden.
+# .def files on Windows don't allow wildcards, of course, which is why this is
+# excluded on Windows, but it doesn't matter because the symbols are already
+# exported in NSPR (Windows peculiarity).
+PR_*
+_PR_*
+PL_*
+#endif
+#include ../../../db/sqlite3/src/sqlite.symbols
 ATOB_AsciiToData
 ATOB_AsciiToData_Util
 ATOB_ConvertAsciiToItem
@@ -21,8 +30,8 @@ __CERT_AddTempCertToPerm
 CERT_AsciiToName
 CERT_CacheOCSPResponseFromSideChannel
 CERT_CertChainFromCert
-CERT_CertificateRequestTemplate DATA
+CERT_CertificateRequestTemplate @DATA@
-CERT_CertificateTemplate DATA
+CERT_CertificateTemplate @DATA@
 CERT_CertListFromCert
 CERT_ChangeCertTrust
 CERT_CheckCertUsage
@@ -38,7 +47,7 @@ CERT_CreateCertificate
 CERT_CreateCertificateRequest
 CERT_CreateSubjectCertList
 CERT_CreateValidity
-CERT_CrlTemplate DATA
+CERT_CrlTemplate @DATA@
 CERT_DecodeAltNameExtension
 CERT_DecodeAuthInfoAccessExtension
 CERT_DecodeAuthKeyID
@@ -128,7 +137,7 @@ CERT_IsCACert
 CERT_IsUserCert
 CERT_MakeCANickname
 CERT_MergeExtensions
-CERT_NameTemplate DATA
+CERT_NameTemplate @DATA@
 CERT_NameToAscii
 CERT_NewCertList
 CERT_NewTempCertificate
@@ -138,15 +147,15 @@ CERT_PKIXVerifyCert
 CERT_RemoveCertListNode
 CERT_RFC1485_EscapeAndQuote
 CERT_SaveSMimeProfile
-CERT_SequenceOfCertExtensionTemplate DATA
+CERT_SequenceOfCertExtensionTemplate @DATA@
 CERT_SetOCSPFailureMode
 CERT_SetOCSPTimeout
-CERT_SignedCrlTemplate DATA
+CERT_SignedCrlTemplate @DATA@
-CERT_SignedDataTemplate DATA
+CERT_SignedDataTemplate @DATA@
 CERT_StartCertExtensions
 CERT_StartCertificateRequestAttributes
-CERT_SubjectPublicKeyInfoTemplate DATA
+CERT_SubjectPublicKeyInfoTemplate @DATA@
-CERT_TimeChoiceTemplate DATA
+CERT_TimeChoiceTemplate @DATA@
 CERT_VerifyCertificate
 CERT_VerifySignedDataWithPublicKeyInfo
 DER_AsciiToTime_Util
@@ -462,7 +471,7 @@ PORT_UCS2_UTF8Conversion_Util
 PORT_ZAlloc
 PORT_ZAlloc_Util
 PORT_ZFree_Util
-SEC_AnyTemplate_Util DATA
+SEC_AnyTemplate_Util @DATA@
 SEC_ASN1Decode
 SEC_ASN1DecodeInteger
 SEC_ASN1DecodeItem
@@ -473,20 +482,20 @@ SEC_ASN1EncodeItem
 SEC_ASN1EncodeItem_Util
 SEC_ASN1EncodeUnsignedInteger_Util
 SEC_ASN1Encode_Util
-SEC_BitStringTemplate DATA
+SEC_BitStringTemplate @DATA@
-SEC_BitStringTemplate_Util DATA
+SEC_BitStringTemplate_Util @DATA@
-SEC_BMPStringTemplate DATA
+SEC_BMPStringTemplate @DATA@
-SEC_BooleanTemplate_Util DATA
+SEC_BooleanTemplate_Util @DATA@
 SEC_CertNicknameConflict
 SEC_DeletePermCertificate
 SEC_DerSignData
 SEC_DestroyCrl
-SEC_GeneralizedTimeTemplate_Util DATA
+SEC_GeneralizedTimeTemplate_Util @DATA@
 SEC_GetSignatureAlgorithmOidTag
-SEC_IA5StringTemplate DATA
+SEC_IA5StringTemplate @DATA@
-SEC_IA5StringTemplate_Util DATA
+SEC_IA5StringTemplate_Util @DATA@
-SEC_IntegerTemplate DATA
+SEC_IntegerTemplate @DATA@
-SEC_IntegerTemplate_Util DATA
+SEC_IntegerTemplate_Util @DATA@
 SECITEM_AllocArray
 SECITEM_AllocItem
 SECITEM_AllocItem_Util
@@ -524,7 +533,7 @@ SECKEY_ExtractPublicKey
 SECKEY_GetPublicKeyType
 SECKEY_ImportDERPublicKey
 SECKEY_PublicKeyStrength
-SECKEY_RSAPSSParamsTemplate DATA
+SECKEY_RSAPSSParamsTemplate @DATA@
 SECKEY_SignatureLen
 SECMIME_DecryptionAllowed
 SECMOD_AddNewModule
@@ -555,14 +564,14 @@ SECMOD_ReleaseReadLock
 SECMOD_UnloadUserModule
 SECMOD_UpdateModule
 SECMOD_WaitForAnyTokenEvent
-SEC_NullTemplate_Util DATA
+SEC_NullTemplate_Util @DATA@
-SEC_ObjectIDTemplate_Util DATA
+SEC_ObjectIDTemplate_Util @DATA@
-SEC_OctetStringTemplate DATA
+SEC_OctetStringTemplate @DATA@
-SEC_OctetStringTemplate_Util DATA
+SEC_OctetStringTemplate_Util @DATA@
 SECOID_AddEntry
 SECOID_AddEntry_Util
-SECOID_AlgorithmIDTemplate DATA
+SECOID_AlgorithmIDTemplate @DATA@
-SECOID_AlgorithmIDTemplate_Util DATA
+SECOID_AlgorithmIDTemplate_Util @DATA@
 SECOID_CopyAlgorithmID_Util
 SECOID_DestroyAlgorithmID
 SECOID_DestroyAlgorithmID_Util
@@ -618,10 +627,10 @@ SEC_QuickDERDecodeItem
 SEC_QuickDERDecodeItem_Util
 SEC_RegisterDefaultHttpClient
 SEC_SignData
-SEC_SignedCertificateTemplate DATA
+SEC_SignedCertificateTemplate @DATA@
 SEC_StringToOID
-SEC_UTF8StringTemplate DATA
+SEC_UTF8StringTemplate @DATA@
-SEC_UTF8StringTemplate_Util DATA
+SEC_UTF8StringTemplate_Util @DATA@
 SGN_Begin
 SGN_CreateDigestInfo_Util
 SGN_DecodeDigestInfo
@@ -650,9 +659,9 @@ SSL_GetNumImplementedCiphers
 SSL_GetSRTPCipher
 SSL_HandshakeCallback
 SSL_HandshakeNegotiatedExtension
-SSL_ImplementedCiphers DATA
+SSL_ImplementedCiphers @DATA@
 SSL_ImportFD
-SSL_NumImplementedCiphers DATA
+SSL_NumImplementedCiphers @DATA@
 SSL_OptionSet
 SSL_OptionSetDefault
 SSL_PeerCertificate
@@ -684,3 +693,6 @@ VFY_VerifyDataWithAlgorithmID
 VFY_VerifyDigestDirect
 _SGN_VerifyPKCS1DigestInfo
 __PK11_SetCertificateNickname
+#ifdef NSS_EXTRA_SYMBOLS_FILE
+#include @NSS_EXTRA_SYMBOLS_FILE@
+#endif

config/external/sqlite/Makefile.in

@@ -3,26 +3,3 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 LIB_IS_C_ONLY    = 1
-
-include $(topsrcdir)/config/config.mk
-
-ifeq ($(OS_ARCH),WINNT)
-# This needs to stay there for now
-DEFFILE = $(DEPTH)/db/sqlite3/src/sqlite-processed.def
-
-else
-ifndef MOZ_FOLD_LIBS
-ifdef GCC_USE_GNU_LD
-
-GARBAGE += \
-  $(LD_VERSION_SCRIPT) \
-  $(NULL)
-
-# Convert to the format we need for ld.
-$(LD_VERSION_SCRIPT): $(topsrcdir)/db/sqlite3/src/sqlite.def
-	@$(call py_action,convert_def_file, \
-	  $(DEFINES) $(ACDEFINES) $(MOZ_DEBUG_DEFINES) -o $@ $^)
-
-endif
-endif
-endif

config/external/sqlite/moz.build

@@ -19,5 +19,4 @@ else:
         SharedLibrary('sqlite')
         SHARED_LIBRARY_NAME = 'mozsqlite3'
 
-        if CONFIG['OS_ARCH'] == 'Linux' and CONFIG['GCC_USE_GNU_LD']:
+        SYMBOLS_FILE = '/db/sqlite3/src/sqlite.symbols'
-            LD_VERSION_SCRIPT = 'sqlite-processed.def'

db/sqlite3/src/Makefile.in

@@ -1,20 +0,0 @@
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-include $(topsrcdir)/config/config.mk
-
-ifeq ($(OS_ARCH),WINNT)
-DEFFILE = $(CURDIR)/sqlite-processed.def
-
-GARBAGE += \
-  $(DEFFILE) \
-  $(NULL)
-
-# We have to preprocess our def file because we need different symbols in debug
-# builds exposed that are not built in non-debug builds.
-$(DEFFILE): sqlite.def
-	@$(call py_action,preprocessor,$(DEFINES) $(MOZ_DEBUG_DEFINES) \
-	  $(srcdir)/sqlite.def -o $(DEFFILE))
-endif

db/sqlite3/src/sqlite.symbols

@@ -1,10 +1,7 @@
-; This Source Code Form is subject to the terms of the Mozilla Public
+# This Source Code Form is subject to the terms of the Mozilla Public
-; License, v. 2.0. If a copy of the MPL was not distributed with this
+# License, v. 2.0. If a copy of the MPL was not distributed with this
-; file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-LIBRARY mozsqlite3.dll
-
-EXPORTS
         sqlite3_aggregate_context
         sqlite3_aggregate_count
         sqlite3_auto_extension