Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kurtakov2019-10-14 19:53:32 +0000
committerAlexander Kurtakov2019-10-14 19:53:32 +0000
commitb2476dd3863f3bc92dd3fd7a85618488f9356e35 (patch)
treea6bfd6d69df1c6f752617d47ea3c52d4c3c14427 /features
parentb8ae716f906ebbf1990a6f209ed545700a876278 (diff)
downloadrt.equinox.framework-b2476dd3863f3bc92dd3fd7a85618488f9356e35.tar.gz
rt.equinox.framework-b2476dd3863f3bc92dd3fd7a85618488f9356e35.tar.xz
rt.equinox.framework-b2476dd3863f3bc92dd3fd7a85618488f9356e35.zip
Bug 552093 - Remove 32bit launcher code
Drop support in code. Change-Id: I91823ac9c762b9e4211b3ea5356f54ac56154675 Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/eclipse.c4
-rw-r--r--features/org.eclipse.equinox.executable.feature/library/eclipseCommon.c9
2 files changed, 1 insertions, 12 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipse.c b/features/org.eclipse.equinox.executable.feature/library/eclipse.c
index 467ca84d7..d6767b25e 100644
--- a/features/org.eclipse.equinox.executable.feature/library/eclipse.c
+++ b/features/org.eclipse.equinox.executable.feature/library/eclipse.c
@@ -66,7 +66,7 @@
* The options that can be specified by the user to the launcher are:
* -vm <javaVM> the Java VM to be used
* -os <opSys> the operating system being run on
- * -arch <osArch> the hardware architecture of the OS: x86, sparc, hp9000
+ * -arch <osArch> the hardware architecture of the OS: x86_64
* -ws <gui> the window system to be used: win32, gtk, cocoa, ...
* -nosplash do not display the splash screen. The java application will
* not receive the -showsplash command.
@@ -2001,8 +2001,6 @@ _TCHAR ** getVMLibrarySearchPath(_TCHAR * vmLibrary) {
const _TCHAR* getVMArch() {
if (_tcscmp(osArchArg, _T_ECLIPSE("x86_64")) == 0)
return _T_ECLIPSE("amd64");
- else if (_tcscmp(osArchArg, _T_ECLIPSE("x86")) == 0)
- return _T_ECLIPSE("i386");
else
return osArchArg;
}
diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipseCommon.c b/features/org.eclipse.equinox.executable.feature/library/eclipseCommon.c
index 3c09a4e32..9da16644f 100644
--- a/features/org.eclipse.equinox.executable.feature/library/eclipseCommon.c
+++ b/features/org.eclipse.equinox.executable.feature/library/eclipseCommon.c
@@ -33,16 +33,7 @@
/* Global Variables */
_TCHAR* osArg = _T_ECLIPSE(DEFAULT_OS);
-#ifdef MACOSX
- /* on the mac we have a universal binary, decide ppc vs x86 based on endianness */
- #ifdef __BIG_ENDIAN__
- _TCHAR* osArchArg = _T_ECLIPSE("ppc");
- #else
- _TCHAR* osArchArg = _T_ECLIPSE(DEFAULT_OS_ARCH);
- #endif
-#else
_TCHAR* osArchArg = _T_ECLIPSE(DEFAULT_OS_ARCH);
-#endif
_TCHAR* wsArg = _T_ECLIPSE(DEFAULT_WS); /* the SWT supported GUI to be used */
/* Local Variables */

Back to the top