Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2011-09-01 17:50:35 +0000
committerAndrew Niefer2011-09-01 17:50:35 +0000
commite4ebd58e7fea6e631d969b3f4aa2d15e261144b7 (patch)
tree849481a303a4839353a9e4c1875f0cf3290e8e66 /bundles/org.eclipse.equinox.executable/library
parent675b8a97deb87f47b02c2d6b55b824e589b47b36 (diff)
downloadrt.equinox.framework-e4ebd58e7fea6e631d969b3f4aa2d15e261144b7.tar.gz
rt.equinox.framework-e4ebd58e7fea6e631d969b3f4aa2d15e261144b7.tar.xz
rt.equinox.framework-e4ebd58e7fea6e631d969b3f4aa2d15e261144b7.zip
Bug 356354 - revert the /LARGEADDRESSAWARE change on 64bit platforms
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/win32/make_win64.mak8
-rw-r--r--bundles/org.eclipse.equinox.executable/library/win32/make_win64_ia64.mak6
2 files changed, 7 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/win32/make_win64.mak b/bundles/org.eclipse.equinox.executable/library/win32/make_win64.mak
index 4a0bd8da6..f1faaabca 100644
--- a/bundles/org.eclipse.equinox.executable/library/win32/make_win64.mak
+++ b/bundles/org.eclipse.equinox.executable/library/win32/make_win64.mak
@@ -41,10 +41,10 @@ DLL_OBJS = eclipse.obj eclipseWin.obj eclipseUtil.obj eclipseJNI.obj eclipseS
LIBS = kernel32.lib user32.lib comctl32.lib msvcrt.lib bufferoverflowU.lib
DLL_LIBS = kernel32.lib user32.lib comctl32.lib gdi32.lib Advapi32.lib msvcrt.lib version.lib bufferoverflowU.lib
-LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /LARGEADDRESSAWARE /RELEASE /NOLOGO -subsystem:windows -entry:wmainCRTStartup
-CONSOLEFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /LARGEADDRESSAWARE /RELEASE /NOLOGO -subsystem:console -entry:wmainCRTStartup
-#DLL_LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /LARGEADDRESSAWARE /PDB:NONE /RELEASE /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x72000000 /DLL
-DLL_LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /LARGEADDRESSAWARE /PDB:NONE /RELEASE /NOLOGO -dll /BASE:0x72000000 /DLL
+LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:windows -entry:wmainCRTStartup
+CONSOLEFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:console -entry:wmainCRTStartup
+#DLL_LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /PDB:NONE /RELEASE /NOLOGO -entry:_DllMainCRTStartup@12 -dll /BASE:0x72000000 /DLL
+DLL_LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /PDB:NONE /RELEASE /NOLOGO -dll /BASE:0x72000000 /DLL
RES = $(PROGRAM_NAME).res
EXEC = $(PROGRAM_OUTPUT)
CONSOLE = $(PROGRAM_NAME)c.exe
diff --git a/bundles/org.eclipse.equinox.executable/library/win32/make_win64_ia64.mak b/bundles/org.eclipse.equinox.executable/library/win32/make_win64_ia64.mak
index 95966e0cc..5d9ff5c86 100644
--- a/bundles/org.eclipse.equinox.executable/library/win32/make_win64_ia64.mak
+++ b/bundles/org.eclipse.equinox.executable/library/win32/make_win64_ia64.mak
@@ -41,9 +41,9 @@ DLL_LIBS = kernel32.lib user32.lib comctl32.lib gdi32.lib Advapi32.lib libcmt.li
# LFLAGS = /INCREMENTAL:NO /NOLOGO -subsystem:windows -entry:wmainCRTStartup -machine:IA64
# was: windows
-LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO /LARGEADDRESSAWARE -subsystem:windows -entry:wmainCRTStartup -machine:IA64
-CONSOLEFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO /LARGEADDRESSAWARE -subsystem:console -entry:wmainCRTStartup -machine:IA64
-DLL_LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO /LARGEADDRESSAWARE /PDB:NONE -entry:_DllMainCRTStartup -dll /BASE:0x72000000 /DLL -machine:IA64
+LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:windows -entry:wmainCRTStartup -machine:IA64
+CONSOLEFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO -subsystem:console -entry:wmainCRTStartup -machine:IA64
+DLL_LFLAGS = /NODEFAULTLIB /INCREMENTAL:NO /RELEASE /NOLOGO /PDB:NONE -entry:_DllMainCRTStartup -dll /BASE:0x72000000 /DLL -machine:IA64
RES = eclipse.res
EXEC = eclipse.exe
CONSOLE = eclipsec.exe

Back to the top