[RFR]: 8186723: Add SuperH as new architecture for linux

John Paul Adrian Glaubitz glaubitz at physik.fu-berlin.de
Thu Aug 24 10:05:12 UTC 2017


On 08/24/2017 11:57 AM, Thomas Stüfe wrote:
> Ah, I see it. "sh" was introduced by you in JDK-8186313 in platform.m4 (VAR_CPU).
> I just wondered why this macro was so shortish and whether we would risk potential
> name clashes with other macros.

There are actually name clashes, both on alpha and sh because of this:

   # Setup target CPU
   $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
       $OPENJDK_$1_ADD_LP64 \
       -DARCH='\"$OPENJDK_$1_CPU_LEGACY\"' -D$OPENJDK_$1_CPU_LEGACY"

There are two instances in the JDK code where variables have the names "alpha"
and "sh". In Debian, we work around this issue with the following change:

--- jdk9/common/autoconf/flags.m4~      2017-05-16 14:14:26.000000000 +0200
+++ jdk9/common/autoconf/flags.m4       2017-06-19 16:00:14.998979413 +0200
@@ -967,9 +967,12 @@
    $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK -D$OPENJDK_$1_OS_UPPERCASE"
  
    # Setup target CPU
+  case "$OPENJDK_TARGET_CPU_LEGACY" in
+      alpha*|sh*) uscore=_
+  esac
    $2COMMON_CCXXFLAGS_JDK="[$]$2COMMON_CCXXFLAGS_JDK \
        $OPENJDK_$1_ADD_LP64 \
-      -DARCH='\"$OPENJDK_$1_CPU_LEGACY\"' -D$OPENJDK_$1_CPU_LEGACY"
+      -DARCH='\"$OPENJDK_$1_CPU_LEGACY\"' -D${uscore}$OPENJDK_$1_CPU_LEGACY${uscore}"
  
    # Setup debug/release defines
    if test "x$DEBUG_LEVEL" = xrelease; then

I wanted to discuss this in a separate issue.

Adrian

-- 
  .''`.  John Paul Adrian Glaubitz
: :' :  Debian Developer - glaubitz at debian.org
`. `'   Freie Universitaet Berlin - glaubitz at physik.fu-berlin.de
   `-    GPG: 62FF 8A75 84E0 2956 9546  0006 7426 3B37 F5B5 F913


More information about the hotspot-dev mailing list