diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4

--- openjdk.orig/common/autoconf/flags.m4

+++ openjdk/common/autoconf/flags.m4

@@ -388,16 +388,8 @@

     CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"

     CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"

   elif test "x$TOOLCHAIN_TYPE" = xgcc; then

-    case $OPENJDK_TARGET_CPU_ARCH in

-    x86 )

-      LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"

-      LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"

-      ;;

-    x86_64 )

-      LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"

-      LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"

-      ;;

-    esac

+    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"

+    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"

     if test "x$OPENJDK_TARGET_OS" != xmacosx; then

       LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"

       LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"

@@ -464,10 +456,6 @@

       ppc )

         # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing

         ;;

-      x86 )

-        CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector"

-        CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector"

-        ;;

       * )

         CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer"

         CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"