RFR: Fix tiny diff vs upstream

[Aleksey Shipilev]

Yup, let's do it.

-Aleksey

On 1/14/19 12:00 PM, Roman Kennke wrote:
> And there is another one:
> 
> diff -r 7d6955d6d501 src/hotspot/share/opto/node.cpp
> --- a/src/hotspot/share/opto/node.cpp   Tue Jan 08 14:53:11 2019 +0100
> +++ b/src/hotspot/share/opto/node.cpp   Mon Jan 14 11:59:09 2019 +0100
> @@ -1,5 +1,5 @@
>  /*
> - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights
> reserved.
> + * Copyright (c) 1997, 2016, Oracle and/or its affiliates. All rights
> reserved.
>   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
>   *
>   * This code is free software; you can redistribute it and/or modify it
> 
> 
> While upstream is probably wrong there, it doesn't seem our issue to
> carry a fix. Let's just revert to upstream.
> 
> Ok?
> 
> Roman
> 
> 
>> We have this little diff against upstream for no apparent reason
>> (probably my mistake when merging the big Shenandoah patch from upstream):
>>
>> diff -r 7d6955d6d501 make/autoconf/hotspot.m4
>> --- a/make/autoconf/hotspot.m4  Tue Jan 08 14:53:11 2019 +0100
>> +++ b/make/autoconf/hotspot.m4  Mon Jan 14 11:53:02 2019 +0100
>> @@ -327,7 +327,7 @@
>>
>>    # Only enable Shenandoah on supported arches
>>    AC_MSG_CHECKING([if shenandoah can be built])
>> -  if test "x$OPENJDK_TARGET_CPU_ARCH" = "xx86" || test
>> "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
>> +  if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || test
>> "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then
>>      AC_MSG_RESULT([yes])
>>    else
>>      DISABLED_JVM_FEATURES="$DISABLED_JVM_FEATURES shenandoahgc"
>>
>>
>> Testing: hotspot_gc_shenandoah
>>
>> OK?
>>
>> Roman
>>
>