#7101 changed some build variables from mips64 to mips64el

Tue, 24 Jul 2018 15:12:39 +0800

author
aoqi
date
Tue, 24 Jul 2018 15:12:39 +0800
changeset 2164
d880fd7491af
parent 2163
6df58ec100b0
child 2165
381d14ae2867

#7101 changed some build variables from mips64 to mips64el
Reviewed-by: zhaixiang

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/platform.m4 file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Tue Jul 24 14:58:25 2018 +0800
     1.2 +++ b/common/autoconf/generated-configure.sh	Tue Jul 24 15:12:39 2018 +0800
     1.3 @@ -7226,7 +7226,7 @@
     1.4    elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
     1.5      # On all platforms except macosx, we replace x86_64 with amd64.
     1.6      OPENJDK_TARGET_CPU_OSARCH="amd64"
     1.7 -  elif test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xmips64; then
     1.8 +  elif test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
     1.9      # Jin: to be exactly same with OpenJDK 6(mips64)
    1.10      # System.getProperty("os.arch"): mips64 -> mips64el
    1.11      OPENJDK_TARGET_CPU_OSARCH="mips64el"
    1.12 @@ -7251,6 +7251,9 @@
    1.13        OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
    1.14      fi
    1.15    fi
    1.16 +  if test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
    1.17 +    OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"mips32el\"' -DLIBARCH64NAME='\"mips64el\"'"
    1.18 +  fi
    1.19  
    1.20  
    1.21    # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.
     2.1 --- a/common/autoconf/platform.m4	Tue Jul 24 14:58:25 2018 +0800
     2.2 +++ b/common/autoconf/platform.m4	Tue Jul 24 15:12:39 2018 +0800
     2.3 @@ -328,7 +328,7 @@
     2.4    elif test "x$OPENJDK_TARGET_OS" != xmacosx && test "x$OPENJDK_TARGET_CPU" = xx86_64; then
     2.5      # On all platforms except macosx, we replace x86_64 with amd64.
     2.6      OPENJDK_TARGET_CPU_OSARCH="amd64"
     2.7 -  elif test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xmips64; then
     2.8 +  elif test "x$OPENJDK_TARGET_OS" = xlinux && test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
     2.9      # Jin: to be exactly same with OpenJDK 6(mips64)
    2.10      # System.getProperty("os.arch"): mips64 -> mips64el
    2.11      OPENJDK_TARGET_CPU_OSARCH="mips64el"
    2.12 @@ -353,6 +353,9 @@
    2.13        OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"i386\"' -DLIBARCH64NAME='\"amd64\"'"
    2.14      fi
    2.15    fi
    2.16 +  if test "x$OPENJDK_TARGET_CPU" = xmips64 && test "x$OPENJDK_TARGET_CPU_ENDIAN" = xlittle; then
    2.17 +    OPENJDK_TARGET_CPU_JLI_CFLAGS="$OPENJDK_TARGET_CPU_JLI_CFLAGS -DLIBARCH32NAME='\"mips32el\"' -DLIBARCH64NAME='\"mips64el\"'"
    2.18 +  fi
    2.19    AC_SUBST(OPENJDK_TARGET_CPU_JLI_CFLAGS)
    2.20  
    2.21    # Setup OPENJDK_TARGET_OS_API_DIR, used in source paths.

mercurial