diff options
| author | wtchang%redhat.com <devnull@localhost> | 2007-01-05 22:12:14 +0000 |
|---|---|---|
| committer | wtchang%redhat.com <devnull@localhost> | 2007-01-05 22:12:14 +0000 |
| commit | 98ae0e50e19b6a0d3f9848eaa382a3d7699cf6fb (patch) | |
| tree | d86e24421e840ccb584e8397aeb585acb1ff300d | |
| parent | f2205a2e36f3d39dbea94b035f698834efecd86f (diff) | |
| download | nss-hg-98ae0e50e19b6a0d3f9848eaa382a3d7699cf6fb.tar.gz | |
Bugzilla Bug 351246: Load memory into Highmem on OS/2. The patch isNSS_3_11_5_BETA1
contributed by Peter Weilbacher <mozilla@Weilbacher.org>. r=wtc,kaply
Tag: NSS_3_11_BRANCH
| -rw-r--r-- | security/coreconf/OS2.mk | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/security/coreconf/OS2.mk b/security/coreconf/OS2.mk index a5776937e..507ebd1ae 100644 --- a/security/coreconf/OS2.mk +++ b/security/coreconf/OS2.mk @@ -80,6 +80,10 @@ DEFINES += -Uunix -U__unix -U__unix__ DEFINES += -DXP_OS2_EMX -DTCPV40HDRS +ifeq ($(MOZ_OS2_HIGH_MEMORY),1) +HIGHMEM_LDFLAG = -Zhigh-mem +endif + ifndef NO_SHARED_LIB WRAP_MALLOC_LIB = WRAP_MALLOC_CFLAGS = @@ -89,7 +93,7 @@ MKSHLIB = $(CXX) $(CXXFLAGS) $(DSO_LDOPTS) -o $@ MKCSHLIB = $(CC) $(CFLAGS) $(DSO_LDOPTS) -o $@ MKSHLIB_FORCE_ALL = MKSHLIB_UNFORCE_ALL = -DSO_LDOPTS = -Zomf -Zdll -Zmap +DSO_LDOPTS = -Zomf -Zdll -Zmap $(HIGHMEM_LDFLAG) SHLIB_LDSTARTFILE = SHLIB_LDENDFILE = ifdef MAPFILE @@ -112,16 +116,16 @@ OS_CFLAGS = -Wall -W -Wno-unused -Wpointer-arith -Wcast-align -Zomf -DD ifdef BUILD_OPT OPTIMIZER = -O2 -s DEFINES += -UDEBUG -U_DEBUG -DNDEBUG -DLLFLAGS = -DLL -OUT:$@ -MAP:$(@:.dll=.map) -EXEFLAGS = -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE +DLLFLAGS = -DLL -OUT:$@ -MAP:$(@:.dll=.map) $(HIGHMEM_LDFLAG) +EXEFLAGS = -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE $(HIGHMEM_LDFLAG) OBJDIR_TAG = _OPT else #OPTIMIZER = -O+ -Oi DEFINES += -DDEBUG -D_DEBUG -DDEBUGPRINTS #HCT Need += to avoid overidding manifest.mn -DLLFLAGS = -DEBUG -DLL -OUT:$@ -MAP:$(@:.dll=.map) -EXEFLAGS = -DEBUG -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE +DLLFLAGS = -DEBUG -DLL -OUT:$@ -MAP:$(@:.dll=.map) $(HIGHMEM_LDFLAG) +EXEFLAGS = -DEBUG -PMTYPE:VIO -OUT:$@ -MAP:$(@:.exe=.map) -nologo -NOE $(HIGHMEM_LDFLAG) OBJDIR_TAG = _DBG -LDFLAGS = -DEBUG +LDFLAGS = -DEBUG $(HIGHMEM_LDFLAG) endif # BUILD_OPT else # XP_OS2_VACPP |