Bug 552093 - Remove 32bit launcher code

Drop support in code.

Change-Id: I91823ac9c762b9e4211b3ea5356f54ac56154675
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

4 files changed, 5 insertions, 20 deletions

diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java
index d9edf7f41..1a0a79dd6 100644
--- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java
+++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/internal/launcher/Constants.java
@@ -18,7 +18,6 @@ package org.eclipse.equinox.internal.launcher;
  *
  */
 public class Constants {
-	public static final String INTERNAL_ARCH_I386 = "i386"; //$NON-NLS-1$
 	public static final String INTERNAL_AMD64 = "amd64"; //$NON-NLS-1$
 	public static final String INTERNAL_OS_SUNOS = "SunOS"; //$NON-NLS-1$
 	public static final String INTERNAL_OS_LINUX = "Linux"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
index 034aa4878..19b826085 100644
--- a/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
+++ b/bundles/org.eclipse.equinox.launcher/src/org/eclipse/equinox/launcher/Main.java
@@ -400,11 +400,8 @@ public class Main {
 			return arch;
 		}
 		String name = System.getProperty("os.arch");//$NON-NLS-1$
-		// Map i386 architecture to x86
-		if (name.equalsIgnoreCase(Constants.INTERNAL_ARCH_I386))
-			return Constants.ARCH_X86;
 		// Map amd64 architecture to x86_64
-		else if (name.equalsIgnoreCase(Constants.INTERNAL_AMD64))
+		if (name.equalsIgnoreCase(Constants.INTERNAL_AMD64))
 			return Constants.ARCH_X86_64;
 
 		return name;
@@ -993,9 +990,9 @@ public class Main {
 		URL[] result = getDevPath(url);
 		if (debug) {
 			System.out.println("Framework classpath:"); //$NON-NLS-1$
-		    for (URL devPath : result) {
-			System.out.println("    " + devPath.toExternalForm()); //$NON-NLS-1$
-		    }
+			for (URL devPath : result) {
+				System.out.println("    " + devPath.toExternalForm()); //$NON-NLS-1$
+			}
 		}
 		return result;
 	}
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 */