diff options
| author | Sravan Kumar Lakkimsetti | 2015-05-19 17:39:47 +0000 |
|---|---|---|
| committer | Sravan Kumar Lakkimsetti | 2015-05-19 17:39:47 +0000 |
| commit | 0f1c189fab479fe03b2c0942cf057b7a2e36f118 (patch) | |
| tree | b062795a936f786b0044e77d43e0963e63599236 /features/org.eclipse.equinox.executable.feature/library | |
| parent | e14ce86cf0819d0635c29fe2e9e85a35a972a72f (diff) | |
| download | rt.equinox.framework-0f1c189fab479fe03b2c0942cf057b7a2e36f118.tar.gz rt.equinox.framework-0f1c189fab479fe03b2c0942cf057b7a2e36f118.tar.xz rt.equinox.framework-0f1c189fab479fe03b2c0942cf057b7a2e36f118.zip | |
Bug 441421 - Eclipse crashes with UnsatisfiedLinkError on ppc64le
The code change is to set SWT_GTK3 environment variable to 0 in case of
linux on ppc64le architecture.
Since this change is required only on linux and ppc64le platform, the
code changes are under LINUX and __ppc64le__ preprocessor macros.
Added a new preprocessor macro __$(architecture)__ to make_linux.mak so
that it can be used in the compilation of eclipse.c
Please note: __ppc64le__ is not available as predefined macro in gcc
that we are using for build
Change-Id: I9748254e6ebdb9bd49f88726657171f338c6dc1a
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature/library')
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/eclipse.c | 7 | ||||
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/eclipse.c b/features/org.eclipse.equinox.executable.feature/library/eclipse.c index 444c89b88..c7663665e 100644 --- a/features/org.eclipse.equinox.executable.feature/library/eclipse.c +++ b/features/org.eclipse.equinox.executable.feature/library/eclipse.c @@ -527,6 +527,13 @@ static int _run(int argc, _TCHAR* argv[], _TCHAR* vmArgs[]) #endif #endif +#ifdef LINUX +#ifdef __ppc64le__ + /* set the swt gtk3 flag to 0 so that we use only GTK2 on ppc64le platform */ + setenv("SWT_GTK3","0",1); +#endif +#endif + /* try to open the specified file in an already running eclipse */ /* on Mac we are only registering an event handler here, always do this */ #ifndef MACOSX diff --git a/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak b/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak index 6abe01702..0bf14ffbf 100644 --- a/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak +++ b/features/org.eclipse.equinox.executable.feature/library/gtk/make_linux.mak @@ -52,6 +52,7 @@ CFLAGS = ${M_ARCH} -g -s -Wall\ -fpic \ -DLINUX \ -DMOZILLA_FIX \ + -D__$(DEFAULT_OS_ARCH)__ \ -DDEFAULT_OS="\"$(DEFAULT_OS)\"" \ -DDEFAULT_OS_ARCH="\"$(DEFAULT_OS_ARCH)\"" \ -DDEFAULT_WS="\"$(DEFAULT_WS)\"" \ |