1.1 --- a/make/jprt.properties Sun Mar 17 06:30:45 2013 -0700
1.2 +++ b/make/jprt.properties Mon Mar 18 19:34:35 2013 -0400
1.3 @@ -1,5 +1,5 @@
1.4 #
1.5 -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
1.6 +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
1.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.8 #
1.9 # This code is free software; you can redistribute it and/or modify it
1.10 @@ -97,15 +97,18 @@
1.11 jprt.my.linux.ppcsflt.jdk7u8=${jprt.my.linux.ppcsflt.jdk7}
1.12 jprt.my.linux.ppcsflt=${jprt.my.linux.ppcsflt.${jprt.tools.default.release}}
1.13
1.14 -jprt.my.linux.armvfp.jdk8=linux_armvfp_2.6
1.15 -jprt.my.linux.armvfp.jdk7=linux_armvfp_2.6
1.16 -jprt.my.linux.armvfp.jdk7u8=${jprt.my.linux.armvfp.jdk7}
1.17 -jprt.my.linux.armvfp=${jprt.my.linux.armvfp.${jprt.tools.default.release}}
1.18 +jprt.my.linux.armvfpsflt.jdk8=linux_armvfpsflt_2.6
1.19 +jprt.my.linux.armvfpsflt=${jprt.my.linux.armvfpsflt.${jprt.tools.default.release}}
1.20
1.21 -jprt.my.linux.armv6.jdk8=linux_armv6_2.6
1.22 -jprt.my.linux.armv6.jdk7=linux_armv6_2.6
1.23 -jprt.my.linux.armv6.jdk7u8=${jprt.my.linux.armv6.jdk7}
1.24 -jprt.my.linux.armv6=${jprt.my.linux.armv6.${jprt.tools.default.release}}
1.25 +jprt.my.linux.armvfphflt.jdk8=linux_armvfphflt_2.6
1.26 +jprt.my.linux.armvfphflt=${jprt.my.linux.armvfphflt.${jprt.tools.default.release}}
1.27 +
1.28 +# The ARM GP vfp-sflt build is not currently supported
1.29 +#jprt.my.linux.armvs.jdk8=linux_armvs_2.6
1.30 +#jprt.my.linux.armvs=${jprt.my.linux.armvs.${jprt.tools.default.release}}
1.31 +
1.32 +jprt.my.linux.armvh.jdk8=linux_armvh_2.6
1.33 +jprt.my.linux.armvh=${jprt.my.linux.armvh.${jprt.tools.default.release}}
1.34
1.35 jprt.my.linux.armsflt.jdk8=linux_armsflt_2.6
1.36 jprt.my.linux.armsflt.jdk7=linux_armsflt_2.6
1.37 @@ -139,7 +142,7 @@
1.38 ${jprt.my.macosx.x64}-{product|fastdebug|debug}, \
1.39 ${jprt.my.windows.i586}-{product|fastdebug|debug}, \
1.40 ${jprt.my.windows.x64}-{product|fastdebug|debug}, \
1.41 - ${jprt.my.linux.armv6}-{product|fastdebug}
1.42 + ${jprt.my.linux.armvh}-{product|fastdebug}
1.43
1.44 jprt.build.targets.open= \
1.45 ${jprt.my.solaris.i586}-{productOpen}, \
1.46 @@ -151,7 +154,8 @@
1.47 ${jprt.my.linux.ppc}-{productEmb|fastdebugEmb}, \
1.48 ${jprt.my.linux.ppcv2}-{productEmb|fastdebugEmb}, \
1.49 ${jprt.my.linux.ppcsflt}-{productEmb|fastdebugEmb}, \
1.50 - ${jprt.my.linux.armvfp}-{productEmb|fastdebugEmb}, \
1.51 + ${jprt.my.linux.armvfpsflt}-{productEmb|fastdebugEmb}, \
1.52 + ${jprt.my.linux.armvfphflt}-{productEmb|fastdebugEmb}, \
1.53 ${jprt.my.linux.armsflt}-{productEmb|fastdebugEmb}
1.54
1.55 jprt.build.targets.all=${jprt.build.targets.standard}, \
