Joel Dice
a142a46d41
Merge remote-tracking branch 'jw/master'
2013-03-04 09:37:22 -07:00
Zsombor Gegesy
7726bf49de
fix lzma includes
2013-03-02 22:26:24 +01:00
Joshua Warner
5b973c8fc3
fix bootimage build
2013-03-01 16:27:41 -07:00
Joshua Warner
06bc978d33
Merge branch 'wip'
2013-03-01 15:44:02 -07:00
Joshua Warner
df23c379bf
fix windows embed-loader build
2013-03-01 14:52:27 -07:00
Joshua Warner
add029ad3c
fix powerpc build
...
Evidently, the powerpc gcc compiler feels it necessary to #define powerpc to 1. Seriously? SERIOUSLY????
2013-02-28 16:41:44 -07:00
Joshua Warner
0b01dd565a
fix multiple-include-of-stdint errors
2013-02-28 15:57:09 -07:00
Joel Dice
625c04e786
a few tweaks to fix the OS X Android class library build
...
With corresponding changes to libcore, all the tests are passing
except Datagrams, which fails with a NPE in
NetworkInterface.getNetworkInterfacesList due to OS X not having
/sys/class/net. Porting that class to OS X looks like a non-trivial
task.
2013-02-28 10:15:10 -07:00
Joel Dice
b409bba318
link makefile.in to Makefile.in for Android fdlibm build
2013-02-28 08:17:16 -07:00
Joshua Warner
9327043bc5
Merge branch 'master' into wip
...
Conflicts:
makefile
src/codegen/arm/assembler.cpp
src/codegen/powerpc/assembler.cpp
src/codegen/x86/assembler.cpp
2013-02-27 19:27:07 -07:00
Joel Dice
27d7c8a3c0
skip bootimage test in ci.sh if openjdk is set
2013-02-27 13:47:43 -07:00
Joel Dice
5e2d00010b
move headers from src to src/avian
...
This is necessary to avoid name conflicts on various platforms. For
example, iOS has its own util.h, and Windows has a process.h. By
including our version as e.g. "avian/util.h", we avoid confusion with
the system version.
2013-02-27 13:33:29 -07:00
Joel Dice
44defda878
fix unused parameter error
2013-02-27 12:10:10 -07:00
Joel Dice
c261e1c283
fix OpenJDK tests on OS X
2013-02-27 12:05:57 -07:00
Joel Dice
726cdb645b
support iOS SDK 6.1
2013-02-27 12:05:57 -07:00
Joel Dice
22ecf27aa5
use -I$(src) instead of -idirafter $(src)
...
This fixes the iOS build, where the wrong version of util.h was being
used. The change to use -idirafter happened way back in 2007, and I
can't remember what its intention was. We'll have to watch for
regressions on other platforms.
2013-02-27 12:05:57 -07:00
Joel Dice
3c1db46c57
don't throw an error if the mawt library can't be loaded
2013-02-27 11:34:43 -07:00
Joel Dice
20cb5c7068
add KQueueArrayWrapper to openjdk-srcs on OS X
...
This is necessary to ensure java.nio.channels.Selector works.
2013-02-27 10:57:01 -07:00
Joel Dice
3eda6ab0a2
Merge remote-tracking branch 'github/master' into dicej
...
Conflicts:
makefile
2013-02-27 10:09:38 -07:00
Joel Dice
d4a42c7a26
add Android class library instructions to README.md
2013-02-27 10:03:17 -07:00
Joel Dice
99e5edcc16
add android.pro for using Avian, Android, and ProGuard in combination
2013-02-27 10:03:07 -07:00
Carsten Elton Sorensen
ce9bc520e1
Keep java.net.SocketTimeoutException for OpenJDK
2013-02-27 14:54:50 +01:00
Joel Dice
e6a46fc014
various fixes to get avian-swt-examples working with the Android class library
2013-02-26 16:24:02 -07:00
Joel Dice
8a976fafa7
fix avian-unittest openjdk-src build
2013-02-25 16:55:44 -07:00
Joel Dice
025b628894
Merge remote-tracking branch 'github/master' into dicej
2013-02-25 16:43:09 -07:00
Joel Dice
0bb0b1ec0e
enable use of Android class library on 64-bit systems
...
This involved patching libcore.git to make it 64-bit safe.
2013-02-25 16:41:46 -07:00
Joel Dice
1310fbbe4f
reset alignment at inheritence boundary when iterating over fields
...
In type-generator, we were incorrectly calculating field offsets where
a class inherits from another class whose last field has a natural
alignment which is different from the native word size. Surprisingly,
this only popped up when I built using the Android class library on a
64-bit system.
2013-02-25 16:37:46 -07:00
Joel Dice
2c12c9b020
add note about OpenJDK build infrastructure available on GitHub
2013-02-25 10:38:37 -07:00
Joel Dice
fddd3ec49d
fix openjdk-src build regression due to RUNTIME_ARRAY changes
2013-02-25 10:38:06 -07:00
Joshua Warner
4d38873096
begin merging target assembler multimethod code
2013-02-24 22:38:58 -07:00
Joshua Warner
82eec28856
rename x86 Offset for consistency with arm and powerpc OffsetPromise
2013-02-24 20:48:06 -07:00
Joshua Warner
d2caf50772
fix debug build
2013-02-24 16:03:19 -07:00
Joshua Warner
4c8b593539
break Architecture out of Assembler
2013-02-23 23:03:01 -07:00
Joshua Warner
56625b89d8
group x86, arm, and powerpc target directories into 'target'
2013-02-23 22:47:52 -07:00
Joshua Warner
3d1ae1d517
fix include-what-you-use violations in x86 assembler
2013-02-23 22:29:58 -07:00
Joshua Warner
900b447e27
further break out powerpc assembler
2013-02-23 22:29:03 -07:00
Joshua Warner
73dda9c26e
begin splitting out powerpc assembler
2013-02-23 22:26:48 -07:00
Joshua Warner
22d6ed1bec
further split out arm assembler
2013-02-23 22:25:15 -07:00
Joshua Warner
fd59e1e08d
begin splitting out arm assembler
2013-02-22 20:47:56 -07:00
Joel Dice
686c2352c1
all tests now pass for Android class library build
2013-02-22 17:23:59 -07:00
Joel Dice
0a4a04cc09
Merge remote-tracking branch 'github/master' into dicej
2013-02-22 17:13:10 -07:00
Joshua Warner
fc84f62a65
prevent garbage collection as vm shuts down
2013-02-22 16:33:07 -07:00
Joshua Warner
dbbd4e7d40
attempt fix for openjdk tests
2013-02-22 15:13:25 -07:00
Joel Dice
b32dfb674c
fix merge fallout (take 2)
2013-02-22 14:54:13 -07:00
Joel Dice
5e65468fef
fix merge fallout
2013-02-22 14:50:15 -07:00
Joel Dice
9060a31348
Merge remote-tracking branch 'github/master' into dicej
...
Conflicts:
src/classpath-openjdk.cpp
2013-02-22 14:43:20 -07:00
Joel Dice
d152f8cf74
fix openjdk build
2013-02-22 14:41:24 -07:00
Joel Dice
2f549dd3a3
fix RUNTIME_ARRAY_BODY regressions in classpath-openjdk.cpp
2013-02-22 14:20:09 -07:00
Joel Dice
8546ca5670
fix Avian classpath build
2013-02-22 11:55:01 -07:00
Joel Dice
201473cf87
more work on Android classpath port
2013-02-22 11:06:49 -07:00