From c178e8fb56000f36e107dcf9355c2ce2572c07aa Mon Sep 17 00:00:00 2001 From: "wtchang%redhat.com" Date: Fri, 5 Jan 2007 22:12:14 +0000 Subject: [PATCH] Bugzilla Bug 351246: Load memory into Highmem on OS/2. The patch is contributed by Peter Weilbacher . r=wtc,kaply Tag: NSS_3_11_BRANCH git-svn-id: svn://10.0.0.236/branches/NSS_3_11_BRANCH@217854 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/coreconf/OS2.mk | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/mozilla/security/coreconf/OS2.mk b/mozilla/security/coreconf/OS2.mk index a5776937e58..507ebd1ae09 100644 --- a/mozilla/security/coreconf/OS2.mk +++ b/mozilla/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