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