Index: b/modules/web/src/main/native/Source/ThirdParty/icu/source/aclocal.m4
===================================================================
--- a/modules/web/src/main/native/Source/ThirdParty/icu/source/aclocal.m4
+++ b/modules/web/src/main/native/Source/ThirdParty/icu/source/aclocal.m4
@@ -381,8 +381,6 @@
             # see comment under 'if BITS_CHECK_64', above.
             AC_MSG_CHECKING([how to build 32-bit executables])
             if test "$GCC" = yes; then
-                CFLAGS="${CFLAGS} -m32"
-                CXXFLAGS="${CXXFLAGS} -m32"
                 AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(void) {return (sizeof(void*)*8==32)?0:1;}])],
                    CAN_BUILD_32=yes, CAN_BUILD_32=no)
             fi
Index: b/modules/web/src/main/native/Source/ThirdParty/icu/source/configure
===================================================================
--- a/modules/web/src/main/native/Source/ThirdParty/icu/source/configure
+++ b/modules/web/src/main/native/Source/ThirdParty/icu/source/configure
@@ -4735,8 +4735,6 @@
             { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to build 32-bit executables" >&5
 $as_echo_n "checking how to build 32-bit executables... " >&6; }
             if test "$GCC" = yes; then
-                CFLAGS="${CFLAGS} -m32"
-                CXXFLAGS="${CXXFLAGS} -m32"
                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 int main(void) {return (sizeof(void*)*8==32)?0:1;}
Index: b/modules/web/src/main/native/Source/ThirdParty/icu/source/acinclude.m4
===================================================================
--- a/modules/web/src/main/native/Source/ThirdParty/icu/source/acinclude.m4
+++ b/modules/web/src/main/native/Source/ThirdParty/icu/source/acinclude.m4
@@ -382,8 +382,6 @@
             # see comment under 'if BITS_CHECK_64', above.
             AC_MSG_CHECKING([how to build 32-bit executables])
             if test "$GCC" = yes; then
-                CFLAGS="${CFLAGS} -m32"
-                CXXFLAGS="${CXXFLAGS} -m32"
                 AC_COMPILE_IFELSE([AC_LANG_SOURCE([int main(void) {return (sizeof(void*)*8==32)?0:1;}])],
                    CAN_BUILD_32=yes, CAN_BUILD_32=no)
             fi
Index: b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
===================================================================
--- a/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/avplugin/Makefile
@@ -64,8 +64,6 @@ INCLUDES += $(shell pkg-config --cflags
 endif
 
 ifeq ($(ARCH), x32)
-    CFLAGS += -m32
-    LDFLAGS += -m32
     INCLUDES += -I$(GLIB_DIR)/build/linux/x86
 else
     INCLUDES += -I$(GLIB_DIR)/build/linux/x64
Index: b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
===================================================================
--- a/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/fxplugins/Makefile
@@ -56,8 +56,6 @@ PACKAGES_LIBS := $(shell pkg-config --li
           -static-libgcc -static-libstdc++ -Wl,--gc-sections
 
 ifeq ($(ARCH), x32)
-    CFLAGS += -m32
-    LDFLAGS += -m32
     INCLUDES += -I$(GLIB_DIR)/build/linux/x86
 else
     INCLUDES += -I$(GLIB_DIR)/build/linux/x64
Index: b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile
===================================================================
--- a/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/glib-lite/Makefile
@@ -54,8 +54,6 @@
           -static-libgcc -static-libstdc++ -Wl,--gc-sections
 
 ifeq ($(ARCH), x32)
-    CFLAGS += -m32
-    LDFLAGS += -m32
     INCLUDES += -I$(SRCBASE_DIR)/build/linux/x86 -I$(LIBFFI_DIR)/include/x86
 else
     INCLUDES += -I$(SRCBASE_DIR)/build/linux/x64 -I$(LIBFFI_DIR)/include/x64
Index: b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
===================================================================
--- a/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/gstreamer-lite/Makefile
@@ -86,8 +86,6 @@ PACKAGES_LIBS := $(shell pkg-config --li
           -static-libgcc -static-libstdc++ -Wl,--gc-sections
 
 ifeq ($(ARCH), x32)
-    CFLAGS += -m32
-    LDFLAGS += -m32
     INCLUDES += -I$(GLIB_DIR)/build/linux/x86
 else
     INCLUDES += -I$(GLIB_DIR)/build/linux/x64
Index: b/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile
===================================================================
--- a/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile
+++ b/modules/media/src/main/native/gstreamer/projects/linux/libffi/Makefile
@@ -37,8 +37,6 @@
 ASM_SOURCES = src/x86/unix64.S
 
 ifeq ($(ARCH), x32)
-    CFLAGS += -m32
-    LDFLAGS += -m32
     INCLUDES += -I$(SRCBASE_DIR)/include/x86
 else
     INCLUDES += -I$(SRCBASE_DIR)/include/x64
Index: b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
===================================================================
--- a/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
+++ b/modules/media/src/main/native/jfxmedia/projects/linux/Makefile
@@ -71,8 +71,6 @@ CFLAGS  += -g -Wall -D_DEBUG
 endif
 
 ifeq ($(ARCH), x32)
-    CFLAGS += -m32
-    LDFLAGS += -m32
     INCLUDES += -I$(GLIB_LITE_DIR)/build/linux/x86
 else
     INCLUDES += -I$(GLIB_LITE_DIR)/build/linux/x64
Index: b/buildSrc/linux.gradle
===================================================================
--- a/buildSrc/linux.gradle
+++ b/buildSrc/linux.gradle
@@ -45,10 +45,6 @@ def commonFlags = [
         "-fno-strict-aliasing", "-fPIC", "-fno-omit-frame-pointer", // optimization flags
         "-W", "-Wall", "-Wno-unused", "-Wno-parentheses", "-Werror=implicit-function-declaration"] // warning flags
 
-if (!IS_64) {
-    commonFlags += "-m32"
-}
-
 // Specify the compilation parameters and link parameters
 def ccFlags = [
         commonFlags, "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c",
@@ -176,21 +172,13 @@ LINUX.launcher.compiler = compiler
 LINUX.launcher.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c"]
 LINUX.launcher.linker = linker
 LINUX.launcher.linkFlags = ["-ldl"]
-if (!IS_64) {
-    LINUX.launcher.ccFlags += "-m32"
-    LINUX.launcher.linkFlags += "-m32"
-}
 
 LINUX.launcherlibrary = [:]
 LINUX.launcherlibrary.compiler = compiler
 LINUX.launcherlibrary.ccFlags = ["-DJAVAARCH=\"$OS_ARCH\"", "-I$JDK_HOME/include", "-I$JDK_HOME/include/linux", "-c", "-fPIC",
 "-std=gnu++98", "-ffunction-sections", "-fdata-sections"]
 LINUX.launcherlibrary.linker = linker
 LINUX.launcherlibrary.linkFlags = ["-ldl", "-lpthread", "-shared", "-static-libgcc", "-static-libstdc++", "-Wl,--gc-sections"]
-if (!IS_64) {
-    LINUX.launcherlibrary.ccFlags += "-m32"
-    LINUX.launcherlibrary.linkFlags += "-m32"
-}
 
 LINUX.iio = [:]
 LINUX.iio.javahInclude = ["com/sun/javafx/iio/**/*"]
Index: b/build.gradle
===================================================================
--- a/build.gradle
+++ b/build.gradle
@@ -2591,11 +2591,7 @@
                     cmakeArgs = "-DCMAKE_OSX_DEPLOYMENT_TARGET=$MACOSX_MIN_VERSION -DCMAKE_OSX_SYSROOT=$MACOSX_SDK_PATH"
                 } else if (t.name == "linux") {
                     cmakeArgs = "-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_C_COMPILER=${webkitProperties.compiler}"
-                    if (IS_64) {
-                        cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=x86_64"
-                    } else {
-                        cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=i586"
-                    }
+                    cmakeArgs = "$cmakeArgs -DCMAKE_SYSTEM_PROCESSOR=$OS_ARCH"
                     // TODO: Use cflags and ldflags from all platforms
                     def cFlags = webkitProperties.ccFlags?.join(' ') ?: ''
                     def lFlags = webkitProperties.linkFlags?.join(' ') ?: ''