comparison common/autoconf/flags.m4 @ 2345:5d868c42d888

8151619: genSocketOptionRegistry.exe always relinked on Windows Reviewed-by: tbell
author erikj
date Mon, 14 Mar 2016 12:00:24 +0100
parents 900e2e405414
children 9d77f922d694
comparison
equal deleted inserted replaced
136:a57bcc7e758c 142:2ead4815b5fa
425 # -g0 enables debug symbols without disabling inlining. 425 # -g0 enables debug symbols without disabling inlining.
426 CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs" 426 CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
427 elif test "x$TOOLCHAIN_TYPE" = xxlc; then 427 elif test "x$TOOLCHAIN_TYPE" = xxlc; then
428 CFLAGS_DEBUG_SYMBOLS="-g" 428 CFLAGS_DEBUG_SYMBOLS="-g"
429 CXXFLAGS_DEBUG_SYMBOLS="-g" 429 CXXFLAGS_DEBUG_SYMBOLS="-g"
430 elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
431 CFLAGS_DEBUG_SYMBOLS="-Zi"
432 CXXFLAGS_DEBUG_SYMBOLS="-Zi"
430 fi 433 fi
431 AC_SUBST(CFLAGS_DEBUG_SYMBOLS) 434 AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
432 AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS) 435 AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
433 436
434 # bounds, memory and behavior checking options 437 # bounds, memory and behavior checking options
652 elif test "x$TOOLCHAIN_TYPE" = xxlc; then 655 elif test "x$TOOLCHAIN_TYPE" = xxlc; then
653 CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC" 656 CFLAGS_JDK="$CFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
654 CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC" 657 CXXFLAGS_JDK="$CXXFLAGS_JDK -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE -DSTDC"
655 elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then 658 elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
656 COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK \ 659 COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK \
657 -Zi -MD -Zc:wchar_t- -W3 -wd4800 \ 660 -MD -Zc:wchar_t- -W3 -wd4800 \
658 -DWIN32_LEAN_AND_MEAN \ 661 -DWIN32_LEAN_AND_MEAN \
659 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \ 662 -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE \
660 -D_WINSOCK_DEPRECATED_NO_WARNINGS \ 663 -D_WINSOCK_DEPRECATED_NO_WARNINGS \
661 -DWIN32 -DIAL" 664 -DWIN32 -DIAL"
662 if test "x$OPENJDK_TARGET_CPU" = xx86_64; then 665 if test "x$OPENJDK_TARGET_CPU" = xx86_64; then
799 LDFLAGS_JDK="$LDFLAGS_JDK $LDFLAGS_MICROSOFT -incremental:no" 802 LDFLAGS_JDK="$LDFLAGS_JDK $LDFLAGS_MICROSOFT -incremental:no"
800 if test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then 803 if test "x$OPENJDK_TARGET_CPU_BITS" = "x32"; then
801 LDFLAGS_SAFESH="-safeseh" 804 LDFLAGS_SAFESH="-safeseh"
802 LDFLAGS_JDK="$LDFLAGS_JDK $LDFLAGS_SAFESH" 805 LDFLAGS_JDK="$LDFLAGS_JDK $LDFLAGS_SAFESH"
803 fi 806 fi
804 # TODO: make -debug optional "--disable-full-debug-symbols"
805 LDFLAGS_MICROSOFT_DEBUG="-debug"
806 LDFLAGS_JDK="$LDFLAGS_JDK $LDFLAGS_MICROSOFT_DEBUG"
807 elif test "x$TOOLCHAIN_TYPE" = xgcc; then 807 elif test "x$TOOLCHAIN_TYPE" = xgcc; then
808 # If this is a --hash-style=gnu system, use --hash-style=both, why? 808 # If this is a --hash-style=gnu system, use --hash-style=both, why?
809 # We have previously set HAS_GNU_HASH if this is the case 809 # We have previously set HAS_GNU_HASH if this is the case
810 if test -n "$HAS_GNU_HASH"; then 810 if test -n "$HAS_GNU_HASH"; then
811 LDFLAGS_HASH_STYLE="-Wl,--hash-style=both" 811 LDFLAGS_HASH_STYLE="-Wl,--hash-style=both"