386 elif test "x$TOOLCHAIN_TYPE" = xxlc; then |
386 elif test "x$TOOLCHAIN_TYPE" = xxlc; then |
387 LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall" |
387 LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall" |
388 CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" |
388 CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" |
389 CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" |
389 CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" |
390 elif test "x$TOOLCHAIN_TYPE" = xgcc; then |
390 elif test "x$TOOLCHAIN_TYPE" = xgcc; then |
|
391 case $OPENJDK_TARGET_CPU_ARCH in |
|
392 x86 ) |
|
393 LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" |
|
394 LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" |
|
395 ;; |
|
396 x86_64 ) |
|
397 LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" |
|
398 LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" |
|
399 ;; |
|
400 esac |
|
401 if test "x$OPENJDK_TARGET_OS" != xmacosx; then |
|
402 LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" |
|
403 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" |
|
404 fi |
391 $2CXXSTD_CXXFLAG="-std=gnu++98" |
405 $2CXXSTD_CXXFLAG="-std=gnu++98" |
392 FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]$2CXXSTD_CXXFLAG -Werror], |
406 FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]$2CXXSTD_CXXFLAG -Werror], |
393 [], [$2CXXSTD_CXXFLAG=""]) |
407 [], [$2CXXSTD_CXXFLAG=""]) |
394 $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} ${$2CXXSTD_CXXFLAG}" |
408 $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} ${$2CXXSTD_CXXFLAG}" |
395 $2JVM_CFLAGS="${$2JVM_CFLAGS} ${$2CXXSTD_CXXFLAG}" |
409 $2JVM_CFLAGS="${$2JVM_CFLAGS} ${$2CXXSTD_CXXFLAG}" |
447 # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing |
461 # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing |
448 CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" |
462 CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" |
449 ;; |
463 ;; |
450 ppc ) |
464 ppc ) |
451 # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing |
465 # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing |
|
466 ;; |
|
467 x86 ) |
|
468 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector" |
|
469 CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector" |
452 ;; |
470 ;; |
453 * ) |
471 * ) |
454 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer" |
472 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer" |
455 CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" |
473 CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" |
456 ;; |
474 ;; |