Commit Graph

4594 Commits

Author SHA1 Message Date
1be50ba412 Clean up win32/64 extraction 2014-08-28 15:51:02 -06:00
214cecfbc5 Merge branch 'master' of github.com:ReadyTalk/avian
* 'master' of github.com:ReadyTalk/avian:
  publish vm.pro as part of the classpath artifact
  fix gradle macosx OperatingSystem naming
  adjust gradle publish coordinates
  automagically detect java_home in gradle
  move binaryToObject to a 'tools' artifact
  change classpath artifact name to 'classpath-avian' and remove c++ sources from it

Conflicts:
	build.gradle
2014-08-28 15:34:34 -06:00
8bd28937df Merge pull request #331 from joshuawarner32/gradle-artifact-update
Gradle artifact update
2014-08-28 15:18:46 -06:00
35c677ba0b Add snapshot/release repo 2014-08-28 14:58:35 -06:00
c9dc5b1a9c Update wrapper to http (not https) for squeeze purposes 2014-08-28 14:48:21 -06:00
72d9c8e191 Uncomment artifactoryPublish section 2014-08-28 14:41:31 -06:00
4302602b63 Add win32/win64 dependencies 2014-08-28 14:25:58 -06:00
58cbf5face fix Android thread enumeration 2014-08-22 16:07:44 -06:00
7f4c0b3118 fix SSL stack and Android JAR resource loading 2014-08-22 07:20:19 -06:00
ea10178a55 publish vm.pro as part of the classpath artifact 2014-08-21 22:03:41 -06:00
38d67216b5 fix gradle macosx OperatingSystem naming 2014-08-21 22:00:12 -06:00
b96cc3c575 update to more recent version of Android class library
Lots has changed since we forked Android's libcore, so merging the
latest upstream code has required extensive changes to the
Avian/Android port.

One big change is that we now use Avian's versions of
java.lang.Object, java.lang.Class, java.lang.ClassLoader, some
java.lang.reflect.* classes, etc. instead of the Android versions.
The main reason is that the Android versions have become very
Dex/Dalvik-specific, and since Avian is based on Java class files, not
dex archives, that code doesn't make sense here.  This has the side
benefit that we can share more native code with classpath-avian.cpp
and reduce the amount of Java/C++ code duplication.
2014-08-21 13:42:49 -06:00
d2809f2c4d adjust gradle publish coordinates 2014-08-21 11:06:56 -06:00
978f86b25c automagically detect java_home in gradle 2014-08-21 10:43:58 -06:00
282ebf9d84 move binaryToObject to a 'tools' artifact 2014-08-21 10:39:36 -06:00
4b4259be87 change classpath artifact name to 'classpath-avian' and remove c++ sources from it 2014-08-21 09:13:14 -06:00
ba808a8589 Merge pull request #330 from sgoings/master
Enable individual platform/arch builds by watching for platform/arch
2014-08-20 18:27:06 -06:00
525a350853 Enable individual platform/arch builds by watching for platform/arch 2014-08-20 16:17:39 -06:00
c758da3fa5 Merge pull request #329 from dicej/atomic-flags
ensure Thread::flags is always updated atomically
2014-08-20 10:30:25 -06:00
32aefaf421 ensure Thread::flags is always updated atomically
Since this field is sometimes updated from other threads, it is
essential that we always update it atomically.
2014-08-20 09:49:00 -06:00
e1074c026c Merge pull request #327 from dicej/tryNative
add avian.Machine.tryNative
2014-08-19 16:32:37 -06:00
8b83de8985 add avian.Machine.tryNative
This function allows you to call native code such that any
SIGSEGV/SIGBUS/SIGFPE/EXC_ACCESS_VIOLATION/etc. raised by that code is
transformed into a Java exception and thrown by tryNative.  Note that
this effectively results in a longjmp out of whatever function raised
the exception, so any C++ destructors or other cleanup code will not
be run.
2014-08-19 14:03:46 -06:00
0c464f3f84 Merge pull request #328 from dicej/windows
Windows
2014-08-19 12:53:59 -06:00
42ae8cbe39 fix openjdk-src Windows build regression 2014-08-19 11:49:18 -06:00
32ef5da55a don't try to run CMake on Cygwin
We've still got some bugs to work out with CMake on Cygwin, so we
disable it for now.
2014-08-19 11:47:34 -06:00
62983ebd7a Merge pull request #326 from dicej/gc-jvmfillinstacktrace
fix GC safety bug in jvmFillInStackTrace
2014-08-19 11:06:31 -06:00
f94157aa38 fix GC safety bug in jvmFillInStackTrace
This fixes spurious Trace test failures with openjdk-src build.
2014-08-19 10:14:07 -06:00
acfcdf6b85 Merge pull request #325 from joshuawarner32/linux-arm-instr-cache
use prototype for __clear_cache across all linux-arm systems
2014-08-19 09:17:00 -06:00
bfb96ce065 Merge pull request #323 from joshuawarner32/ci-flexibility
skip bootimage tests with 'openjdk' but no 'openjdk-src' flags
2014-08-19 09:01:48 -06:00
5210cbaa54 use prototype for __clear_cache across all linux-arm systems, not just android 2014-08-19 08:53:21 -06:00
298eb8f13b Merge pull request #324 from dicej/unused
explicitly override UNUSED definition
2014-08-18 08:09:18 -06:00
5b618982b5 explicitly override UNUSED definition
Recent versions of jni.h such as the one provided by Debian Jessie's
OpenJDK define UNUSED in a way that conflicts with our definition and
usage, so we need to explicitly undefine it before redefining it to
avoid compiler noise.
2014-08-17 15:34:44 -06:00
1753eed778 skip bootimage tests with 'openjdk' but no 'openjdk-src' flags 2014-08-17 13:56:54 -06:00
6c2c7448d6 Merge pull request #322 from joshuawarner32/ci-flexibility
disable irrelevant openjdk target when openjdk is passed as a flag
2014-08-16 18:17:54 -06:00
9c415cbf09 disable irrelevant openjdk target when openjdk is passed as a flag 2014-08-15 15:29:53 -06:00
aa4038ed3d Merge pull request #321 from joshuawarner32/map-hashcode-equals
add hashCode and equals methods to java/util/Map
2014-08-15 11:31:06 -06:00
46f7a45f12 add hashCode and equals methods to java/util/Map
Granted, this is weird - but this is what openjdk does.  Therefore,
some code that is compiled for openjdk (say, protobufs) will treat
calls to Map.hashCode as interface calls instead of virtual calls, as
they would have previously been under avian's classpath.

Also note that this error caused avian to abort in findInterfaceMethod
rather than throw an AbstractMethodError or somesuch - but that's a
problem for another day.
2014-08-15 10:44:22 -06:00
34b7f8a17e Merge pull request #320 from dicej/master
fix clang "always true" warning in lzma/main.cpp
2014-08-11 08:41:06 -06:00
1fb297775c fix clang "always true" warning in lzma/main.cpp 2014-08-11 08:40:08 -06:00
44d21884d6 Merge pull request #319 from dicej/master
fix crash in Posix_getaddrinfo for ProGuarded Android build
2014-08-07 10:44:07 -06:00
ff78b05c59 fix crash in Posix_getaddrinfo for ProGuarded Android build
Posix_getaddrinfo needs to access fields in libcore.io.StructAddrinfo
via JNI, so we tell ProGuard to preserve them.

This commit also includes a minor indentation tweek in README.md and
removes -fno-rtti from lzma-build-cflags to avoid a warning from GCC.
2014-08-07 10:16:04 -06:00
bbf3382d3a Merge pull request #318 from dicej/bootimage-lzma
fix bootimage lzma build
2014-08-04 18:02:46 -06:00
8c1e7d48ad fix bootimage lzma build
We were using the length of the uncompressed boot image when
generating the object file, whereas we should have been using the
compressed length.
2014-08-04 17:21:23 -06:00
60ea4b2cc2 Merge pull request #317 from joshuawarner32/cmake-vs
Get cmake build working with visual studio 2013
2014-07-31 08:16:48 -06:00
e92230c89c use c++11-conformant _WIN32 test macro 2014-07-30 16:05:30 -06:00
d47fcdc349 fix ubuntu precise mingw math.h problems 2014-07-30 14:15:22 -06:00
ce1a5f5c28 fix macosx arch=i386 process=interpret build 2014-07-30 14:15:22 -06:00
374a39651b allow passing flags to ci.sh script 2014-07-30 14:15:22 -06:00
d8e0f5cc06 fix zlib headers / linking for windows 2014-07-30 14:15:22 -06:00
ef3f77695c use inline asm for sse detection 2014-07-30 14:15:22 -06:00