[aarch64-port-dev ] Bad elif in AArch64 8u and 8u60 branches

[Andrew Hughes]

It seems that:

changeset:   8561:ff13d8140756
user:        enevill
date:        Mon Sep 14 21:40:39 2015 +0000
summary:     Fix mismerge when merging up to jdk8u60-b21

introduced a bad #elif conditional in abstractInterpeter.hpp, as reported by:

https://bugzilla.redhat.com/show_bug.cgi?id=1276959

The mistake can be clearly be seen by comparing the AArch64 8u60 version
of the file with the one I merged myself in IcedTea:

$ diff -u {,../../icedtea8/hotspot/}src/share/vm/interpreter/abstractInterpreter.hpp
--- src/share/vm/interpreter/abstractInterpreter.hpp	2015-09-18 01:09:48.089880065 +0100
+++ ../../icedtea8/hotspot/src/share/vm/interpreter/abstractInterpreter.hpp	2015-10-01 01:04:00.823520919 +0100
@@ -34,7 +34,7 @@
 # include INTERP_MASM_MD_HPP
 #elif defined TARGET_ARCH_x86
 # include "interp_masm_x86.hpp"
-#elif TARGET_ARCH_MODEL_aarch64
+#elif defined TARGET_ARCH_MODEL_aarch64
 # include "interp_masm_aarch64.hpp"
 #elif defined TARGET_ARCH_MODEL_sparc
 # include "interp_masm_sparc.hpp"

I've pushed this to the affected trees as a trivial fix.

http://hg.openjdk.java.net/aarch64-port/jdk8u60/hotspot/rev/83f5fdfd56ec
-- 
Andrew :)

Senior Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

PGP Key: ed25519/35964222 (hkp://keys.gnupg.net)
Fingerprint = 5132 579D D154 0ED2 3E04  C5A0 CFDA 0F9B 3596 4222

PGP Key: rsa4096/248BDC07 (hkp://keys.gnupg.net)
Fingerprint = EC5A 1F5E C0AD 1D15 8F1F  8F91 3B96 A578 248B DC07