Sat, 03 Jan 2015 20:18:00 +0100
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
michael@0 | 1 | # |
michael@0 | 2 | # This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | # License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 4 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
michael@0 | 5 | |
michael@0 | 6 | ###################################################################### |
michael@0 | 7 | # HPPA |
michael@0 | 8 | ###################################################################### |
michael@0 | 9 | # |
michael@0 | 10 | # HP-UX/PA32 |
michael@0 | 11 | # |
michael@0 | 12 | # for gas and gcc, check comment in xptcinvoke_asm_pa32.s |
michael@0 | 13 | ifeq ($(OS_ARCH),HP-UX) |
michael@0 | 14 | ifneq ($(CC),gcc) |
michael@0 | 15 | # #18875 Building the CPP's (CXX) optimized causes a crash |
michael@0 | 16 | CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS)) |
michael@0 | 17 | endif |
michael@0 | 18 | endif |
michael@0 | 19 | |
michael@0 | 20 | # |
michael@0 | 21 | # Linux/HPPA/gcc |
michael@0 | 22 | # |
michael@0 | 23 | ifeq ($(OS_ARCH),Linux) |
michael@0 | 24 | ifneq (,$(filter hppa hppa2.0 hppa1.1,$(OS_TEST))) |
michael@0 | 25 | ifndef GNU_CXX |
michael@0 | 26 | else |
michael@0 | 27 | # #434190 optimized builds crash |
michael@0 | 28 | CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS)) |
michael@0 | 29 | endif |
michael@0 | 30 | endif |
michael@0 | 31 | endif |
michael@0 | 32 | |
michael@0 | 33 | |
michael@0 | 34 | ###################################################################### |
michael@0 | 35 | # M68k |
michael@0 | 36 | ###################################################################### |
michael@0 | 37 | |
michael@0 | 38 | ifeq ($(OS_ARCH),Linux) |
michael@0 | 39 | ifneq (,$(findstring mips, $(OS_TEST))) |
michael@0 | 40 | ASFLAGS += -I$(DIST)/include |
michael@0 | 41 | endif |
michael@0 | 42 | endif |
michael@0 | 43 | |
michael@0 | 44 | ###################################################################### |
michael@0 | 45 | # PowerPC |
michael@0 | 46 | ###################################################################### |
michael@0 | 47 | # |
michael@0 | 48 | # AIX/PPC |
michael@0 | 49 | # |
michael@0 | 50 | ifeq ($(OS_ARCH),AIX) |
michael@0 | 51 | # #24617 Building the CPP's (CXX) optimized causes a crash |
michael@0 | 52 | CXXFLAGS := $(filter-out $(MOZ_OPTIMIZE_FLAGS), $(CXXFLAGS)) |
michael@0 | 53 | endif |
michael@0 | 54 | |
michael@0 | 55 | ###################################################################### |
michael@0 | 56 | # SPARC |
michael@0 | 57 | ###################################################################### |
michael@0 | 58 | # |
michael@0 | 59 | # Solaris/SPARC |
michael@0 | 60 | # |
michael@0 | 61 | ifeq ($(OS_ARCH),SunOS) |
michael@0 | 62 | ifneq (86,$(findstring 86,$(OS_TEST))) |
michael@0 | 63 | ifdef HAVE_64BIT_OS |
michael@0 | 64 | ASFLAGS += -xarch=v9 |
michael@0 | 65 | endif |
michael@0 | 66 | endif |
michael@0 | 67 | endif |
michael@0 | 68 | |
michael@0 | 69 | include $(topsrcdir)/config/rules.mk |
michael@0 | 70 | |
michael@0 | 71 | ifeq ($(OS_ARCH),Linux) |
michael@0 | 72 | ifneq (,$(findstring mips, $(OS_TEST))) |
michael@0 | 73 | xptcstubs_asm_mips.o: $(DIST)/include/xptcstubsdef.inc |
michael@0 | 74 | endif |
michael@0 | 75 | endif |
michael@0 | 76 | |
michael@0 | 77 | ifeq ($(OS_ARCH),Darwin) |
michael@0 | 78 | xptcstubs_asm_ppc_darwin.s: xptcstubs_asm_ppc_darwin.s.m4 $(DIST)/include/xptcstubsdef.inc Makefile |
michael@0 | 79 | gm4 $(INCLUDES) $< > $@ |
michael@0 | 80 | endif |
michael@0 | 81 | |
michael@0 | 82 | ifeq ($(OS_ARCH),AIX) |
michael@0 | 83 | ifdef HAVE_64BIT_OS |
michael@0 | 84 | xptcstubs_asm_ppc_aix64.s: xptcstubs_asm_ppc_aix64.s.m4 $(DIST)/include/xptcstubsdef.inc Makefile |
michael@0 | 85 | m4 -DAIX_OBJMODEL=$(AIX_OBJMODEL) $(INCLUDES) -I. $< > $@ |
michael@0 | 86 | else |
michael@0 | 87 | xptcstubs_asm_ppc_aix.s: xptcstubs_asm_ppc_aix.s.m4 $(DIST)/include/xptcstubsdef.inc Makefile |
michael@0 | 88 | m4 -DAIX_OBJMODEL=$(AIX_OBJMODEL) $(INCLUDES) -I. $< > $@ |
michael@0 | 89 | endif |
michael@0 | 90 | endif |
michael@0 | 91 | |
michael@0 | 92 | ifeq ($(OS_ARCH),SunOS) |
michael@0 | 93 | ifeq (86,$(findstring 86,$(OS_TEST))) |
michael@0 | 94 | ifndef GNU_CC |
michael@0 | 95 | xptcstubsdef_asm.solx86: $(DIST)/include/xptcstubsdef.inc |
michael@0 | 96 | sed \ |
michael@0 | 97 | -e 's/^\(STUB_ENTRY\)(\([0-9]\))/\11\(\2\)/' \ |
michael@0 | 98 | -e 's/^\(STUB_ENTRY\)(\([0-9][0-9]\))/\12\(\2\)/' \ |
michael@0 | 99 | -e 's/^\(STUB_ENTRY\)(\([0-9][0-9][0-9]\))/\13\(\2\)/' \ |
michael@0 | 100 | $(DIST)/include/xptcstubsdef.inc > $@ |
michael@0 | 101 | ifeq (x86_64,$(OS_TEST)) |
michael@0 | 102 | ASFLAGS += -xarch=amd64 |
michael@0 | 103 | endif |
michael@0 | 104 | |
michael@0 | 105 | endif |
michael@0 | 106 | endif |
michael@0 | 107 | endif |