645 fi
646
647 # setup CPU bit size
648 $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -DARCH='\"$FLAGS_CPU_LEGACY\"' \
649 -D$FLAGS_CPU_LEGACY"
650
651 if test "x$FLAGS_CPU_BITS" = x64; then
652 # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
653 # unpack200.exe.
654 if test "x$FLAGS_OS" = xlinux || test "x$FLAGS_OS" = xmacosx; then
655 $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_LP64=1"
656 fi
657 if test "x$FLAGS_OS" != xaix; then
658 # xlc on AIX defines _LP64=1 by default and issues a warning if we redefine it.
659 $1_DEFINES_CPU_JVM="${$1_DEFINES_CPU_JVM} -D_LP64=1"
660 fi
661 fi
662
663 # toolchain dependend, per-cpu
664 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
665 if test "x$FLAGS_CPU" = xx86_64; then
666 $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_AMD64_ -Damd64"
667 else
668 $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_X86_ -Dx86"
669 fi
670 fi
671
672 # CFLAGS PER CPU
673 if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
674 # COMMON to gcc and clang
675 if test "x$FLAGS_CPU" = xx86; then
676 # Force compatibility with i586 on 32 bit intel platforms.
677 $1_CFLAGS_CPU="-march=i586"
678 fi
679 fi
680
681 if test "x$TOOLCHAIN_TYPE" = xgcc; then
682 if test "x$FLAGS_CPU" = xaarch64; then
683 # -Wno-psabi to get rid of annoying "note: parameter passing for argument of type '<type> changed in GCC 9.1"
684 $1_CFLAGS_CPU="-Wno-psabi"
685 elif test "x$FLAGS_CPU" = xarm; then
|
645 fi
646
647 # setup CPU bit size
648 $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -DARCH='\"$FLAGS_CPU_LEGACY\"' \
649 -D$FLAGS_CPU_LEGACY"
650
651 if test "x$FLAGS_CPU_BITS" = x64; then
652 # -D_LP64=1 is only set on linux and mac. Setting on windows causes diff in
653 # unpack200.exe.
654 if test "x$FLAGS_OS" = xlinux || test "x$FLAGS_OS" = xmacosx; then
655 $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_LP64=1"
656 fi
657 if test "x$FLAGS_OS" != xaix; then
658 # xlc on AIX defines _LP64=1 by default and issues a warning if we redefine it.
659 $1_DEFINES_CPU_JVM="${$1_DEFINES_CPU_JVM} -D_LP64=1"
660 fi
661 fi
662
663 # toolchain dependend, per-cpu
664 if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
665 if test "x$FLAGS_CPU" = xaarch64; then
666 $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_ARM64_ -Darm64"
667 elif test "x$FLAGS_CPU" = xx86_64; then
668 $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_AMD64_ -Damd64"
669 else
670 $1_DEFINES_CPU_JDK="${$1_DEFINES_CPU_JDK} -D_X86_ -Dx86"
671 fi
672 fi
673
674 # CFLAGS PER CPU
675 if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang; then
676 # COMMON to gcc and clang
677 if test "x$FLAGS_CPU" = xx86; then
678 # Force compatibility with i586 on 32 bit intel platforms.
679 $1_CFLAGS_CPU="-march=i586"
680 fi
681 fi
682
683 if test "x$TOOLCHAIN_TYPE" = xgcc; then
684 if test "x$FLAGS_CPU" = xaarch64; then
685 # -Wno-psabi to get rid of annoying "note: parameter passing for argument of type '<type> changed in GCC 9.1"
686 $1_CFLAGS_CPU="-Wno-psabi"
687 elif test "x$FLAGS_CPU" = xarm; then
|