From patchwork Thu Dec 19 12:20:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edward Nevill X-Patchwork-Id: 22629 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f70.google.com (mail-pa0-f70.google.com [209.85.220.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EBE7423FCA for ; Thu, 19 Dec 2013 12:20:26 +0000 (UTC) Received: by mail-pa0-f70.google.com with SMTP id fa1sf2722264pad.5 for ; Thu, 19 Dec 2013 04:20:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:subject:from:reply-to:to :cc:date:in-reply-to:references:organization:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe:content-type:content-transfer-encoding; bh=Gpbf4aoT5kDyHTDj/5SPcIe4Q5iDCvidY7XiC9rlkF8=; b=QCfEDaitLmJLbux/XNXtTiOGpHqzj3V9xWAf7hq7weFas3lvu/4uaeqLnh842bL1e0 XEHGFbehoJihBGMszxA4nQHR3/L4udtTsP433G6LH3C3QUFMBMzqx94hUB4lCTEGpzeq mwd9yKn3V1EpQYkuRbUbO9m5LfpebGxFTpmDeFgeJ92HNDfDcZQybI51JGcSPI2WKUpZ m+Ic4mHRh2FUt1ZDf3BDtMU3WRl0QO3rJLILKdUXKvNzgQ1VAKNzh09lIRIfeRy9MQpn nO877XLnoOdFAc0rMicNqlb4VcpEt/cZZiITjLw1EmtXX+k7IVIfdUHZtxEK/6n9J33W 70xA== X-Gm-Message-State: ALoCoQnfpRoQgn2qQvzQUcEuY6yBQDXLaAJ164Q5MsWd/eRrzAckrVP9RkgnxKjOhoP4NQYudFWX X-Received: by 10.66.66.109 with SMTP id e13mr522218pat.1.1387455625603; Thu, 19 Dec 2013 04:20:25 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.29.97 with SMTP id j1ls346677qeh.82.gmail; Thu, 19 Dec 2013 04:20:25 -0800 (PST) X-Received: by 10.220.86.69 with SMTP id r5mr703872vcl.9.1387455625434; Thu, 19 Dec 2013 04:20:25 -0800 (PST) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id tw10si658595vec.120.2013.12.19.04.20.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Dec 2013 04:20:25 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so593385veb.26 for ; Thu, 19 Dec 2013 04:20:25 -0800 (PST) X-Received: by 10.58.11.73 with SMTP id o9mr725916veb.8.1387455625210; Thu, 19 Dec 2013 04:20:25 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.59.13.131 with SMTP id ey3csp315118ved; Thu, 19 Dec 2013 04:20:24 -0800 (PST) X-Received: by 10.194.173.163 with SMTP id bl3mr1276234wjc.10.1387455623660; Thu, 19 Dec 2013 04:20:23 -0800 (PST) Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by mx.google.com with ESMTPS id ei4si732983wid.58.2013.12.19.04.20.23 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Dec 2013 04:20:23 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.51 is neither permitted nor denied by best guess record for domain of edward.nevill@linaro.org) client-ip=74.125.82.51; Received: by mail-wg0-f51.google.com with SMTP id b13so960816wgh.6 for ; Thu, 19 Dec 2013 04:20:23 -0800 (PST) X-Received: by 10.194.176.163 with SMTP id cj3mr1263235wjc.8.1387455622910; Thu, 19 Dec 2013 04:20:22 -0800 (PST) Received: from [10.0.7.5] ([88.98.47.97]) by mx.google.com with ESMTPSA id xl18sm11461460wib.9.2013.12.19.04.20.21 for (version=SSLv3 cipher=RC4-SHA bits=128/128); Thu, 19 Dec 2013 04:20:22 -0800 (PST) Message-ID: <1387455620.19567.111.camel@localhost.localdomain> Subject: RFR: Re: [aarch64-port-dev ] RFR: initial patches for merge up to jdk8-b117 From: Edward Nevill Reply-To: edward.nevill@linaro.org To: aarch64-port-dev@openjdk.java.net, patches@linaro.org Cc: patches@linaro.org Date: Thu, 19 Dec 2013 12:20:20 +0000 In-Reply-To: <87ob4kzq1y.fsf@spicy.frobware.com> References: <8761qslx1p.fsf@spicy.frobware.com> <1386949985.4276.5.camel@localhost.localdomain> <87ob4kzq1y.fsf@spicy.frobware.com> Organization: Linaro X-Mailer: Evolution 3.8.5 (3.8.5-2.fc19) Mime-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: edward.nevill@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , On Fri, 2013-12-13 at 16:14 +0000, Andrew McDermott wrote: > > > > Could you complete the aarch64 specific merge and then repost. > > Yes. But a heads-up: I'm out of the office from next Tuesday through > Jan 2nd so I didn't want these patches left festering on my disk... > Hi, Attached are the aarch64 specific patches which when combined with Andrew's merge will move us up to jdk8-b117. The most relevant changes are *** src/cpu/aarch64/vm/aarch64.ad Matcher::mathExactL_result_proj_mask I have implemented this and protected it with a ShouldNotReachHere(). *** src/cpu/aarch64/vm/macroAssembler_aarch64.cpp More fun with encode_klass / decode_klass. These can now accept a narrow_klass_base() == NULL I have implemented this as a separate case so we now have 3 cases in order 1) narrow_klass_base() == NULL 2) use_XOR_for_compressed_class_base 3) Use heapbase as a temp reg. *** src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp Some implementation changes to TemplateInterpreterGenerator::generate_return_entry_for 2 changes here 1) It now accepts an index_size which is passed straight to get_cache_and_index. 2) The code to fetch the parameter size now does LDR/AND instead of LDRB. This reflects the changes in the x86 code to make it more generic. However it does add an extra instruction. We could revert to the LDRB code if parameter_size_mask == 0xff. We would need different code for little/big endian tho. I have built and tested the following images:- (The 3 numbers X/Y/Z in the following give the number Passed/Failed/Error, the numbers in brackets are the numbers for the current aarch64 tip based on b111). server/fastdebug hotspot/compiler: 282/4/4 (239/2/4) langtools: 2917/3/34 (2856/3/38) client/fastdebug hotspot/compiler: 280/5/5 (239/2/4) langtools: 2906/0/48 (2857/1/39) Note the number of tests has increased between b111 and b117, hotspot/compiler increased from 245 to 290, langtools increased from 2897 to 2954. The failing tests are ------------------------------------------------ server/fastdebug - hotspot/compiler - b111 FAILED: compiler/8013496/Test8013496.sh FAILED: compiler/whitebox/ClearMethodStateTest.java server/fastdebug - hotspot/compiler - b117 FAILED: compiler/7141637/SpreadNullArg.java FAILED: compiler/jsr292/ConcurrentClassLoadingTest.java FAILED: compiler/startup/SmallCodeCacheStartup.java FAILED: compiler/whitebox/ClearMethodStateTest.java SpreadNullArg and ConcurrentClassLoadingTest also fail on x86 b117, SmallCodeCacheStartup is a new test in b117, ClearMethodStateTest fails on b111 and b117 and Test8013496.sh has been removed in b117. -------------------------------------------------- server/fastdebug - langtools - b111 FAILED: tools/javac/lambda/FunctionalInterfaceConversionTest.java FAILED: tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java FAILED: tools/javac/HexThree.java server/fastdebug - langtools - b117 FAILED: tools/javac/annotations/typeAnnotations/classfile/CombinationsTargetTest2.java FAILED: tools/javac/Diagnostics/6769027/T6769027.java FAILED: tools/javac/HexThree.java FunctionalInterfaceConversionTest and CombinationsTargetTest2 do not reproduce, FunctionalInterfaceConversionTest is a SEGV, CombinationsTargetTest2 is an Internal VM Error. I suspect these are random failures which just happened to occur in these tests. DefaultMethodsTest seems to be fixed between b111 and b117. T6769027 is a genuine regression on aarch64 which has not regressed on x86. -------------------------------------------------- client/fastdebug - hotspot/compiler - b111 FAILED: compiler/8013496/Test8013496.sh FAILED: compiler/whitebox/IsMethodCompilableTest.java client/fastdebug - hotspot/compiler - b117 FAILED: compiler/7141637/SpreadNullArg.java FAILED: compiler/8004867/TestIntAtomicCAS.java FAILED: compiler/jsr292/ConcurrentClassLoadingTest.java FAILED: compiler/whitebox/IsMethodCompilableTest.java FAILED: compiler/7184394/TestAESMain.java As with the server, SpreadNullArg and ConcurrentClassLoadingTest also fail on x86, TestAESMain is not reproducible (InternalVMError), Test8013496.sh has been removed. TestIntAtomicCAS is a genuine regression on aarch64 which has not regressed on x86. -------------------------------------------------- client/fastdebug - langtools - b111 FAILED: tools/javac/lambdaShapes/org/openjdk/tests/vm/DefaultMethodsTest.java client/fastdebug - langtools - b117 0 Failures! As with the server DeafultMethodsTest has been fixed between b111 and b117. -------------------------------------------------- In summary there are two genuine regression failures, T6769027 on the server and TestIntAtomicCAS. I would like to go ahead and push this merge and then work on the regression failures rather than trying to hold the state of the world on my hard disk. OK to push? Ed. -- CUT HERE (start hotspot patch) --- # HG changeset patch # User Edward Nevill edward.nevill@linaro.org # Date 1387293444 0 # Tue Dec 17 15:17:24 2013 +0000 # Node ID e81b912b94a522a26b45b9ff07d3fdb1b01a16cf # Parent df17ddfce21cc8c9238ab933a24aa661bc5926cc Additional aarch64 changes for merge to jdk8-b117 diff -r df17ddfce21c -r e81b912b94a5 src/cpu/aarch64/vm/aarch64.ad --- a/src/cpu/aarch64/vm/aarch64.ad Thu Dec 12 22:44:18 2013 +0000 +++ b/src/cpu/aarch64/vm/aarch64.ad Tue Dec 17 15:17:24 2013 +0000 @@ -1716,6 +1716,11 @@ return R0_REG_mask(); } +const RegMask Matcher::mathExactL_result_proj_mask() { + ShouldNotReachHere(); + return R0_REG_mask(); +} + const RegMask Matcher::mathExactI_flags_proj_mask() { return INT_FLAGS_mask(); } diff -r df17ddfce21c -r e81b912b94a5 src/cpu/aarch64/vm/c1_FrameMap_aarch64.cpp --- a/src/cpu/aarch64/vm/c1_FrameMap_aarch64.cpp Thu Dec 12 22:44:18 2013 +0000 +++ b/src/cpu/aarch64/vm/c1_FrameMap_aarch64.cpp Tue Dec 17 15:17:24 2013 +0000 @@ -52,6 +52,8 @@ #endif // _LP64 } else if (type == T_OBJECT || type == T_ARRAY) { opr = as_oop_opr(reg); + } else if (type == T_METADATA) { + opr = as_metadata_opr(reg); } else { opr = as_opr(reg); } diff -r df17ddfce21c -r e81b912b94a5 src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp --- a/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp Thu Dec 12 22:44:18 2013 +0000 +++ b/src/cpu/aarch64/vm/c1_LIRAssembler_aarch64.cpp Tue Dec 17 15:17:24 2013 +0000 @@ -943,8 +943,12 @@ void LIR_Assembler::mem2reg(LIR_Opr src, LIR_Opr dest, BasicType type, LIR_PatchCode patch_code, CodeEmitInfo* info, bool wide, bool /* unaligned */) { LIR_Address* addr = src->as_address_ptr(); - LIR_Address* from_addr = src->as_address_ptr(); + + if (addr->base()->type() == T_OBJECT) { + __ verify_oop(addr->base()->as_pointer_register()); + } + PatchingStub* patch = NULL; if (patch_code != lir_patch_none) { @@ -2628,6 +2632,10 @@ fatal("CRC32 intrinsic is not implemented on this platform"); } +void LIR_Assembler::emit_profile_type(LIR_OpProfileType* op) { + fatal("Type profiling not implemented on this platform"); +} + void LIR_Assembler::align_backward_branch_target() { } diff -r df17ddfce21c -r e81b912b94a5 src/cpu/aarch64/vm/globals_aarch64.hpp --- a/src/cpu/aarch64/vm/globals_aarch64.hpp Thu Dec 12 22:44:18 2013 +0000 +++ b/src/cpu/aarch64/vm/globals_aarch64.hpp Tue Dec 17 15:17:24 2013 +0000 @@ -71,6 +71,8 @@ // GC Ergo Flags define_pd_global(uintx, CMSYoungGenPerWorker, 64*M); // default max size of CMS young gen, per GC worker thread +define_pd_global(uintx, TypeProfileLevel, 0); + // avoid biased locking while we are bootstrapping the aarch64 build define_pd_global(bool, UseBiasedLocking, false); diff -r df17ddfce21c -r e81b912b94a5 src/cpu/aarch64/vm/macroAssembler_aarch64.cpp --- a/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp Thu Dec 12 22:44:18 2013 +0000 +++ b/src/cpu/aarch64/vm/macroAssembler_aarch64.cpp Tue Dec 17 15:17:24 2013 +0000 @@ -2080,6 +2080,16 @@ } void MacroAssembler::encode_klass_not_null(Register dst, Register src) { + if (Universe::narrow_klass_base() == NULL) { + if (Universe::narrow_klass_shift() != 0) { + assert (LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong"); + lsr(dst, src, LogKlassAlignmentInBytes); + } else { + if (dst != src) mov(dst, src); + } + return; + } + if (use_XOR_for_compressed_class_base) { if (Universe::narrow_klass_shift() != 0) { eor(dst, src, (uint64_t)Universe::narrow_klass_base()); @@ -2111,9 +2121,18 @@ void MacroAssembler::decode_klass_not_null(Register dst, Register src) { Register rbase = dst; - assert(Universe::narrow_klass_base() != NULL, "Base should be initialized"); assert (UseCompressedClassPointers, "should only be used for compressed headers"); + if (Universe::narrow_klass_base() == NULL) { + if (Universe::narrow_klass_shift() != 0) { + assert(LogKlassAlignmentInBytes == Universe::narrow_klass_shift(), "decode alg wrong"); + lsl(dst, src, LogKlassAlignmentInBytes); + } else { + if (dst != src) mov(dst, src); + } + return; + } + if (use_XOR_for_compressed_class_base) { if (Universe::narrow_klass_shift() != 0) { lsl(dst, src, LogKlassAlignmentInBytes); diff -r df17ddfce21c -r e81b912b94a5 src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp --- a/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp Thu Dec 12 22:44:18 2013 +0000 +++ b/src/cpu/aarch64/vm/templateInterpreter_aarch64.cpp Tue Dec 17 15:17:24 2013 +0000 @@ -172,7 +172,7 @@ address TemplateInterpreterGenerator::generate_continuation_for(TosState state) { __ call_Unimplemented(); return 0; } -address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step) { +address TemplateInterpreterGenerator::generate_return_entry_for(TosState state, int step, size_t index_size) { address entry = __ pc(); // Restore stack bottom in case i2c adjusted stack @@ -184,18 +184,11 @@ __ restore_constant_pool_cache(); __ get_method(rmethod); - Label L_got_cache, L_giant_index; - if (EnableInvokeDynamic) { - __ ldrb(r1, Address(rbcp, 0)); - __ cmpw(r1, Bytecodes::_invokedynamic); - __ br(Assembler::EQ, L_giant_index); - } // Pop N words from the stack - __ get_cache_and_index_at_bcp(r1, r2, 1, sizeof(u2)); - __ bind(L_got_cache); - __ ldrb(r1, Address(r1, - in_bytes(ConstantPoolCache::base_offset()) + - 3 * wordSize)); + __ get_cache_and_index_at_bcp(r1, r2, 1, index_size); + __ ldr(r1, Address(r1, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::flags_offset())); + __ andr(r1, r1, ConstantPoolCacheEntry::parameter_size_mask); + __ add(esp, esp, r1, Assembler::LSL, 3); // Restore machine SP in case i2c adjusted it @@ -217,13 +210,6 @@ __ get_dispatch(); __ dispatch_next(state, step); - // out of the main line of code... - if (EnableInvokeDynamic) { - __ bind(L_giant_index); - __ get_cache_and_index_at_bcp(r1, r2, 1, sizeof(u4)); - __ b(L_got_cache); - } - return entry; } diff -r df17ddfce21c -r e81b912b94a5 src/cpu/aarch64/vm/templateTable_aarch64.cpp --- a/src/cpu/aarch64/vm/templateTable_aarch64.cpp Thu Dec 12 22:44:18 2013 +0000 +++ b/src/cpu/aarch64/vm/templateTable_aarch64.cpp Tue Dec 17 15:17:24 2013 +0000 @@ -2974,9 +2974,7 @@ __ ubfxw(rscratch2, flags, ConstantPoolCacheEntry::tos_state_shift, ConstantPoolCacheEntry::tos_state_bits); // load return address { - const address table_addr = (is_invokeinterface || is_invokedynamic) ? - (address)Interpreter::return_5_addrs_by_index_table() : - (address)Interpreter::return_3_addrs_by_index_table(); + const address table_addr = (address) Interpreter::invoke_return_entry_table_for(code); __ mov(rscratch1, table_addr); __ ldr(lr, Address(rscratch1, rscratch2, Address::lsl(3))); } diff -r df17ddfce21c -r e81b912b94a5 src/share/vm/code/relocInfo.cpp --- a/src/share/vm/code/relocInfo.cpp Thu Dec 12 22:44:18 2013 +0000 +++ b/src/share/vm/code/relocInfo.cpp Tue Dec 17 15:17:24 2013 +0000 @@ -109,6 +109,7 @@ found=true; } } + assert(found, "no relocInfo found for pc"); } diff -r df17ddfce21c -r e81b912b94a5 src/share/vm/compiler/compileBroker.cpp --- a/src/share/vm/compiler/compileBroker.cpp Thu Dec 12 22:44:18 2013 +0000 +++ b/src/share/vm/compiler/compileBroker.cpp Tue Dec 17 15:17:24 2013 +0000 @@ -998,7 +998,7 @@ void CompileBroker::init_compiler_threads(int c1_compiler_count, int c2_compiler_count) { EXCEPTION_MARK; -#if !defined(ZERO) && !defined(SHARK) && !defined(TARGET_ARCH_aarch64) +#if !defined(ZERO) && !defined(SHARK) assert(c2_compiler_count > 0 || c1_compiler_count > 0, "No compilers?"); #endif // !ZERO && !SHARK // Initialize the compilation queue diff -r df17ddfce21c -r e81b912b94a5 src/share/vm/opto/chaitin.hpp --- a/src/share/vm/opto/chaitin.hpp Thu Dec 12 22:44:18 2013 +0000 +++ b/src/share/vm/opto/chaitin.hpp Tue Dec 17 15:17:24 2013 +0000 @@ -321,7 +321,10 @@ } uint live_range_id(const Node *node) const { - return _names.at(node->_idx); + if (node->_idx >= size()) + return 0; + else + return _names.at(node->_idx); } uint uf_live_range_id(uint lrg_id) const { diff -r df17ddfce21c -r e81b912b94a5 src/share/vm/runtime/arguments.cpp --- a/src/share/vm/runtime/arguments.cpp Thu Dec 12 22:44:18 2013 +0000 +++ b/src/share/vm/runtime/arguments.cpp Tue Dec 17 15:17:24 2013 +0000 @@ -1132,9 +1132,6 @@ Tier3InvokeNotifyFreqLog = 0; Tier4InvocationThreshold = 0; } - if (FLAG_IS_DEFAULT(NmethodSweepFraction)) { - FLAG_SET_DEFAULT(NmethodSweepFraction, 1 + ReservedCodeCacheSize / (16 * M)); - } } #if INCLUDE_ALL_GCS diff -r df17ddfce21c -r e81b912b94a5 test/gc/metaspace/TestPerfCountersAndMemoryPools.java --- a/test/gc/metaspace/TestPerfCountersAndMemoryPools.java Thu Dec 12 22:44:18 2013 +0000 +++ b/test/gc/metaspace/TestPerfCountersAndMemoryPools.java Tue Dec 17 15:17:24 2013 +0000 @@ -32,8 +32,8 @@ * @library /testlibrary * @summary Tests that a MemoryPoolMXBeans and PerfCounters for metaspace * report the same data. - * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedKlassPointers -XX:+UseSerialGC -XX:+UsePerfData -Xint TestPerfCountersAndMemoryPools - * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UseCompressedKlassPointers -XX:+UseSerialGC -XX:+UsePerfData -Xint TestPerfCountersAndMemoryPools + * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedClassPointers -XX:+UseSerialGC -XX:+UsePerfData TestPerfCountersAndMemoryPools + * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:+UseSerialGC -XX:+UsePerfData TestPerfCountersAndMemoryPools */ public class TestPerfCountersAndMemoryPools { public static void main(String[] args) throws Exception { --- CUT HERE (end hotspot patch) --- --- CUT HERE (start jdk8 patch) --- # HG changeset patch # User Edward Nevill edward.nevill@linaro.org # Date 1387293183 0 # Tue Dec 17 15:13:03 2013 +0000 # Node ID dd3371184ae207ff2a4a7a0637733e3434674efd # Parent 91b84cf2c36158ba2085c4198b1ea94fdd5dd4c8 Additional aarch64 changes for merge to jdk8-b117 diff -r 91b84cf2c361 -r dd3371184ae2 common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Wed Dec 11 20:30:20 2013 +0000 +++ b/common/autoconf/generated-configure.sh Tue Dec 17 15:13:03 2013 +0000 @@ -659,7 +659,6 @@ X_LIBS X_PRE_LIBS X_CFLAGS -XMKMF FIXPATH CXXFLAGS_DEBUG_SYMBOLS CFLAGS_DEBUG_SYMBOLS @@ -1081,7 +1080,6 @@ OBJCFLAGS CPP CXXCPP -XMKMF FREETYPE_CFLAGS FREETYPE_LIBS ALSA_CFLAGS @@ -1855,7 +1853,6 @@ OBJCFLAGS Objective C compiler flags CPP C preprocessor CXXCPP C++ preprocessor - XMKMF Path to xmkmf, Makefile generator for X Window System FREETYPE_CFLAGS C compiler flags for FREETYPE, overriding pkg-config FREETYPE_LIBS @@ -2869,14 +2866,8 @@ */*) ac_site_file1=$CONFIG_SITE;; *) ac_site_file1=./$CONFIG_SITE;; esac -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site -fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" +fi +for ac_site_file in $ac_site_file1 do test "x$ac_site_file" = xNONE && continue if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then @@ -3864,7 +3855,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1383151988 +DATE_WHEN_GENERATED=1387281898 ############################################################################### # @@ -7863,7 +7854,7 @@ JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'` JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'` -if test "x$JVM_VARIANT_KERNEL" = xtrue; then + if test "x$JVM_VARIANT_KERNEL" = xtrue; then if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then as_fn_error $? "You cannot build a kernel JVM for a 64-bit machine." "$LINENO" 5 fi @@ -7897,10 +7888,10 @@ fi if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then INCLUDE_SA=false -fi -if test "x$OPENJDK_TARGET_CPU" = xaarch64; then + fi + if test "x$OPENJDK_TARGET_CPU" = xaarch64; then INCLUDE_SA=false -fi + fi if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then diff -r 91b84cf2c361 -r dd3371184ae2 common/autoconf/jdk-options.m4 --- a/common/autoconf/jdk-options.m4 Wed Dec 11 20:30:20 2013 +0000 +++ b/common/autoconf/jdk-options.m4 Tue Dec 17 15:13:03 2013 +0000 @@ -88,11 +88,6 @@ JVM_VARIANT_ZERO=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zero,/!s/.*/false/g' -e '/,zero,/s/.*/true/g'` JVM_VARIANT_ZEROSHARK=`$ECHO "$JVM_VARIANTS" | $SED -e '/,zeroshark,/!s/.*/false/g' -e '/,zeroshark,/s/.*/true/g'` - if test "x$JVM_VARIANT_CLIENT" = xtrue; then - if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then - AC_MSG_ERROR([You cannot build a client JVM for a 64-bit machine.]) - fi - fi if test "x$JVM_VARIANT_KERNEL" = xtrue; then if test "x$OPENJDK_TARGET_CPU_BITS" = x64; then AC_MSG_ERROR([You cannot build a kernel JVM for a 64-bit machine.]) @@ -127,11 +122,11 @@ fi if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then INCLUDE_SA=false -fi -if test "x$OPENJDK_TARGET_CPU" = xaarch64; then + fi + if test "x$OPENJDK_TARGET_CPU" = xaarch64; then INCLUDE_SA=false -fi -AC_SUBST(INCLUDE_SA) + fi + AC_SUBST(INCLUDE_SA) if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then MACOSX_UNIVERSAL="true" diff -r 91b84cf2c361 -r dd3371184ae2 common/bin/hgforest.sh --- a/common/bin/hgforest.sh Wed Dec 11 20:30:20 2013 +0000 +++ b/common/bin/hgforest.sh Tue Dec 17 15:13:03 2013 +0000 @@ -144,7 +144,8 @@ ( ( if [ "${command}" = "clone" -o "${command}" = "fclone" ] ; then - pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`" + pull_newrepo="${pull_base}/${i}" + # pull_newrepo="`echo ${pull_base}/${i} | sed -e 's@\([^:]/\)//*@\1@g'`" echo hg clone ${pull_newrepo} ${i} path="`dirname ${i}`" if [ "${path}" != "." ] ; then --- CUT HERE (end jdk8 patch) ---