diff options
author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-29 09:07:42 +0200 |
---|---|---|
committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-29 09:07:42 +0200 |
commit | aff03b0a67c41cf7af5df9c9eef715a8b27a2667 (patch) | |
tree | aa2909ae4718f81c83c8cfb68c1f5a23485b3173 /config | |
parent | bdb4ff581677ad1cd411b55a68c87534f9a64882 (diff) | |
parent | 11caf6ecb3cb8c84d2355a6c6e9580a290147e92 (diff) | |
download | UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.gz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.lz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.tar.xz UXP-aff03b0a67c41cf7af5df9c9eef715a8b27a2667.zip |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into js_dom_performance-resource-timing_1
Diffstat (limited to 'config')
-rw-r--r-- | config/external/nss/Makefile.in | 11 | ||||
-rw-r--r-- | config/external/nss/nss.symbols | 8 | ||||
-rw-r--r-- | config/rules.mk | 20 |
3 files changed, 0 insertions, 39 deletions
diff --git a/config/external/nss/Makefile.in b/config/external/nss/Makefile.in index 4b95a32bd..861b7d07d 100644 --- a/config/external/nss/Makefile.in +++ b/config/external/nss/Makefile.in @@ -43,17 +43,6 @@ endif # Default HAVE_FREEBL_LIBS = 1 -# 32-bit HP-UX PA-RISC -ifeq ($(OS_ARCH), HP-UX) -ifneq ($(OS_TEST), ia64) -ifndef HAVE_64BIT_BUILD -HAVE_FREEBL_LIBS = -HAVE_FREEBL_LIBS_32INT32 = 1 -HAVE_FREEBL_LIBS_32FPU = 1 -endif -endif -endif - # SunOS SPARC ifeq ($(OS_ARCH), SunOS) ifneq (86,$(findstring 86,$(OS_TEST))) diff --git a/config/external/nss/nss.symbols b/config/external/nss/nss.symbols index ba5492c37..41f8ee7a9 100644 --- a/config/external/nss/nss.symbols +++ b/config/external/nss/nss.symbols @@ -271,7 +271,6 @@ NSS_IsInitialized NSS_OptionSet NSS_NoDB_Init NSS_SecureMemcmp -NSS_SecureMemcmpZero NSS_SetAlgorithmPolicy NSS_SetDomesticPolicy NSS_Shutdown @@ -279,9 +278,6 @@ NSSSMIME_GetVersion NSS_SMIMESignerInfo_SaveSMIMEProfile NSS_SMIMEUtil_FindBulkAlgForRecipients NSSSSL_GetVersion -#ifdef XP_WIN -_NSSUTIL_Access -#endif NSSUTIL_ArgDecodeNumber NSSUTIL_ArgFetchValue NSSUTIL_ArgGetLabel @@ -303,9 +299,6 @@ NSSUTIL_MkModuleSpec NSSUTIL_MkNSSString NSSUTIL_MkSlotString NSSUTIL_Quote -#ifdef XP_WIN -_NSSUTIL_UTF8ToWide -#endif PK11_AlgtagToMechanism PK11_Authenticate PK11_ChangePW @@ -490,7 +483,6 @@ PORT_UCS2_ASCIIConversion_Util PORT_UCS2_UTF8Conversion PORT_UCS2_UTF8Conversion_Util PORT_ZAlloc -PORT_ZAllocAlignedOffset_Util PORT_ZAlloc_Util PORT_ZFree_Util SEC_AnyTemplate_Util @DATA@ diff --git a/config/rules.mk b/config/rules.mk index a6bd45d11..9a8f61c2d 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -386,26 +386,6 @@ endif endif endif -# -# HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag -# which uses internal symbols first -# -ifeq ($(OS_ARCH),HP-UX) -ifdef IS_COMPONENT -ifeq ($(GNU_CC)$(GNU_CXX),) -EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -ifneq ($(HAS_EXTRAEXPORTS),1) -MKSHLIB += -Wl,+eNSGetModule -Wl,+eerrno -MKCSHLIB += +eNSGetModule +eerrno -ifneq ($(OS_TEST),ia64) -MKSHLIB += -Wl,+e_shlInit -MKCSHLIB += +e_shlInit -endif # !ia64 -endif # !HAS_EXTRAEXPORTS -endif # non-gnu compilers -endif # IS_COMPONENT -endif # HP-UX - ifeq ($(OS_ARCH),AIX) ifdef IS_COMPONENT ifneq ($(HAS_EXTRAEXPORTS),1) |