[oe-commits] org.oe.angstrom-2007.12-stable java: add backports from .dev

koen commit openembedded-commits at lists.openembedded.org
Sat Jan 26 09:12:10 UTC 2008


java: add backports from .dev

Author: koen at openembedded.org
Branch: org.openembedded.angstrom-2007.12-stable
Revision: 64df931c3ef2562e4c46d07e6714d06407e19ee1
ViewMTN: http://monotone.openembedded.org/revision/info/64df931c3ef2562e4c46d07e6714d06407e19ee1
Files:
1
packages/jamvm/files
packages/swt
packages/swt/files
packages/cacao/cacao-cldc.inc
packages/cacao/cacao-initial_0.98.bb
packages/cacao/cacao-native.inc
packages/cacao/cacao-native_0.98+hg20071001.bb
packages/cacao/cacao_0.98+hg20071001.bb
packages/cacao/cacaoh-native.inc
packages/cacao/cacaoh-native_0.98+hg20071001.bb
packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch
packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch
packages/cacao/files/cacao-0.98+hg-attachthread.patch
packages/cacao/files/cacao-0.98+svn-classpath_var.patch
packages/cacao/files/cacao-0.98+svn-libdir.diff
packages/cacao/files/cacao-0.98-initial.patch
packages/classpath/classpath-initial_0.93.bb
packages/classpath/classpath-minimal_0.96.1.bb
packages/classpath/classpath-native.inc
packages/classpath/classpath-native_0.96.1.bb
packages/classpath/classpath_0.95.bb
packages/classpath/classpath_0.96.1.bb
packages/classpath/files/gjar-prefix-patch.diff
packages/ecj/ecj-bootstrap-native_3.3.bb
packages/ecj/ecj-initial_3.3.bb
packages/ecj/files/ecj.in
packages/jamvm/files/jamvm-1.3.1-size-defaults.patch
packages/jamvm/files/jamvm_1.5.0-initial.patch
packages/jamvm/jamvm-initial_1.5.0.bb
packages/jamvm/jamvm.inc
packages/jamvm/jamvm_1.5.0.bb
packages/jikes/jikes-initial.bb
packages/swt/files/Makefile
packages/swt/files/swt-hildon.patch
packages/swt/swt-gtk.inc
packages/swt/swt3.3-gtk_3.3.1.bb
packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb
packages/swt/swt3.4-gtk_3.3+3.4M3.bb
BACKPORTS.txt
packages/cacao/cacao-cldc_0.98.bb
packages/cacao/cacao.inc
packages/cacao/cacaoh-cldc-native_0.98.bb
packages/classpath/classpath.inc
packages/jamvm/jamvm_1.4.5.bb
packages/jikes/jikes-native_1.21.bb
packages/midpath/midpath-alsa_0.1.bb
packages/midpath/midpath-cldc-native_0.1.bb
packages/midpath/midpath-cldc-sdl_0.1.bb
packages/midpath/midpath-cldc-x11_0.1.bb
packages/midpath/midpath-cldc_0.1.bb
packages/midpath/midpath-gtk_0.1.bb
packages/midpath/midpath-pulseaudio_0.1.bb
packages/midpath/midpath-qt3x11_0.1.bb
packages/midpath/midpath-qte_0.1.bb
packages/midpath/midpath-test_0.1.bb
packages/midpath/midpath.inc
packages/midpath/midpath_0.1.bb
mtn:execute
true
Diffs:

#
# mt diff -r1a1c6b6380c98ded0aaf7a75c6f4b0c56c7a8440 -r64df931c3ef2562e4c46d07e6714d06407e19ee1
#
# 
# 
# add_dir "packages/jamvm/files"
# 
# add_dir "packages/swt"
# 
# add_dir "packages/swt/files"
# 
# add_file "packages/cacao/cacao-cldc.inc"
#  content [0e7e1860852d3c226974148b855a1db2ea3c2b27]
# 
# add_file "packages/cacao/cacao-initial_0.98.bb"
#  content [154e9de597ec6ab475c760aca2814514979356ea]
# 
# add_file "packages/cacao/cacao-native.inc"
#  content [cc20995498c174c9ac504a54e5d844cfddfb8f3f]
# 
# add_file "packages/cacao/cacao-native_0.98+hg20071001.bb"
#  content [b087b9a24b9593dfff241d8dbafef831492c316b]
# 
# add_file "packages/cacao/cacao_0.98+hg20071001.bb"
#  content [6b579068c4284eea4bb711e240a0e1ff839a8583]
# 
# add_file "packages/cacao/cacaoh-native.inc"
#  content [21cb933b74df6d2ac41c9593d5df8f193f74b51a]
# 
# add_file "packages/cacao/cacaoh-native_0.98+hg20071001.bb"
#  content [3e9914f2a492d38de75e478cba4c16addca80a06]
# 
# add_file "packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch"
#  content [125e26e26224355531392be2ba7990afaadd8f15]
# 
# add_file "packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch"
#  content [b4231277ce3d268059eaa141886c615a2dac0fc5]
# 
# add_file "packages/cacao/files/cacao-0.98+hg-attachthread.patch"
#  content [4aaacaa58d869f91cd245871bcad90a6ec0c72c1]
# 
# add_file "packages/cacao/files/cacao-0.98+svn-classpath_var.patch"
#  content [3ba0b66a46c0306ff811d3930f646fe0074b7477]
# 
# add_file "packages/cacao/files/cacao-0.98+svn-libdir.diff"
#  content [b97c32544ee97fef51a7222eb879ce6e68e3d1d4]
# 
# add_file "packages/cacao/files/cacao-0.98-initial.patch"
#  content [0ae2a924095b58fa9168774fc8b8a24c6093e87f]
# 
# add_file "packages/classpath/classpath-initial_0.93.bb"
#  content [dcbd137250c9fd6e2ca0ca88afc7404e9ede289c]
# 
# add_file "packages/classpath/classpath-minimal_0.96.1.bb"
#  content [e55ff8e0007e4814498b21013d19e63123d425ee]
# 
# add_file "packages/classpath/classpath-native.inc"
#  content [ce05671105e08fb6217f1907cf4202d41ebfd512]
# 
# add_file "packages/classpath/classpath-native_0.96.1.bb"
#  content [8b956ee477f32cf28c75a7cd39e9e85373378164]
# 
# add_file "packages/classpath/classpath_0.95.bb"
#  content [d2f820a6ce35613717c16b3612ca071f4d918e83]
# 
# add_file "packages/classpath/classpath_0.96.1.bb"
#  content [d2f820a6ce35613717c16b3612ca071f4d918e83]
# 
# add_file "packages/classpath/files/gjar-prefix-patch.diff"
#  content [d511884813b1b0a0b7ea1f16e8e11c32981eb117]
# 
# add_file "packages/ecj/ecj-bootstrap-native_3.3.bb"
#  content [defbc5098ae61f56a2ac8c59ace6bbe9c8007eb3]
# 
# add_file "packages/ecj/ecj-initial_3.3.bb"
#  content [b410a403c3f29b5239ebde0751e23e02f0d3409a]
# 
# add_file "packages/ecj/files/ecj.in"
#  content [ded1ab42bf6383b2789b01c1f98beeb3a909507f]
# 
# add_file "packages/jamvm/files/jamvm-1.3.1-size-defaults.patch"
#  content [87b384507b8adbd40cca46154ac6911a8a79c4d6]
# 
# add_file "packages/jamvm/files/jamvm_1.5.0-initial.patch"
#  content [91a98ee8f2d7c025af1263c9f0e20fc020521ed2]
# 
# add_file "packages/jamvm/jamvm-initial_1.5.0.bb"
#  content [08d6c4fd24b6e2bf4ac4e75a896b575f9431bfa4]
# 
# add_file "packages/jamvm/jamvm.inc"
#  content [5edcfc7c22cf4daf00c3d364962aa42af749237e]
# 
# add_file "packages/jamvm/jamvm_1.5.0.bb"
#  content [645cab3c8ecedf36901ba0d416cb8956c85f04b1]
# 
# add_file "packages/jikes/jikes-initial.bb"
#  content [acb7ab273c93fa5264bb5d431ef94cf91cb08c8b]
# 
# add_file "packages/swt/files/Makefile"
#  content [6a0e11147f246807075b03fa7fa27e739f8b6e5d]
# 
# add_file "packages/swt/files/swt-hildon.patch"
#  content [cc6d6cb67722d189122f70411ef01e0639206d86]
# 
# add_file "packages/swt/swt-gtk.inc"
#  content [bcadfa700e7fc0872ab1d3a38e456f41e5ebefed]
# 
# add_file "packages/swt/swt3.3-gtk_3.3.1.bb"
#  content [ac1e6656f8358a0ce3928cd18fcdc21d2d36511e]
# 
# add_file "packages/swt/swt3.4-gtk-hildon_3.3+3.4M3.bb"
#  content [2659ee0d88eeab0a2f7012db8f483cc8a4e0373c]
# 
# add_file "packages/swt/swt3.4-gtk_3.3+3.4M3.bb"
#  content [cf948019bf5ff1d457cbe1999cc6651269b7ea70]
# 
# patch "BACKPORTS.txt"
#  from [b2e6fff9ec87814e33ed20140d0596e2ec851efc]
#    to [b5a20def1e3060df71c7e8246c1b1ccf9bc29c05]
# 
# patch "packages/cacao/cacao-cldc_0.98.bb"
#  from [d075f4c8402dcd779ca32535993ba6af6aafdafd]
#    to [7a579745f970088319acb19f5f2f1ab814666abf]
# 
# patch "packages/cacao/cacao.inc"
#  from [d8bc9087bb9ca79854ffb1d26ff94e4bafea0159]
#    to [595f9dee8b31829f4c2a1e6565e8b3d7e4522473]
# 
# patch "packages/cacao/cacaoh-cldc-native_0.98.bb"
#  from [70727331bb54728e45f64ce0f2d252d870e2bf51]
#    to [cc2ee6f43a136dc2ba76ed7bea4fec2f935c6fdb]
# 
# patch "packages/classpath/classpath.inc"
#  from [79ca11a969e17a040267d3e92c101f763fefe104]
#    to [f89bbf74a4b188100d82872ac4cea3f094bafca9]
# 
# patch "packages/jamvm/jamvm_1.4.5.bb"
#  from [d3200cc6d653922acc3679bbb1ca8a3c97b8e67b]
#    to [d778d272861de9bf5a6bc422f452f11f0e078df7]
# 
# patch "packages/jikes/jikes-native_1.21.bb"
#  from [1259d32e2a9d8f19824f3284c5c62601c2dd947b]
#    to [ceee4d931ba6e74ba4e24d312663180e70c0db0d]
# 
# patch "packages/midpath/midpath-alsa_0.1.bb"
#  from [cdb38b276ca1e010fded8299464b1143a8079b57]
#    to [59c49b0e291796c65de18b1ea83c5a22be461c82]
# 
# patch "packages/midpath/midpath-cldc-native_0.1.bb"
#  from [876ed1db01ef361d0403dfa49aa970522a41661d]
#    to [e1909db00b37983435f9cf72ad6a21cd8b3373dd]
# 
# patch "packages/midpath/midpath-cldc-sdl_0.1.bb"
#  from [cdc0198274025dc4aace2193322876e10d72c7aa]
#    to [fc533f09c53b28e3ce3f72786930d1aa39f778e1]
# 
# patch "packages/midpath/midpath-cldc-x11_0.1.bb"
#  from [fa9d3d7fe3f54287c26f6d9e57241640e7edf920]
#    to [b472bd32e9ced6aa3773d2a244c41ee6a978e04a]
# 
# patch "packages/midpath/midpath-cldc_0.1.bb"
#  from [207ecb961824e78d5556506fd417a98aec0cdeba]
#    to [4ad9e1316464c9456f1d76d0a65c71c6526ae081]
# 
# patch "packages/midpath/midpath-gtk_0.1.bb"
#  from [9aa618d4539e50f9f8af91c6c6eeacbfc5f131d8]
#    to [cd6056399e37f2fbd335a2c7d10d70d17180a653]
# 
# patch "packages/midpath/midpath-pulseaudio_0.1.bb"
#  from [eb944e221aa04ed0c5a06788cd304f5aee0476da]
#    to [9d2cabb455468f889d23d83e83b5d1e6d57945af]
# 
# patch "packages/midpath/midpath-qt3x11_0.1.bb"
#  from [9d7c04b2e318f9703bdd2dce4606d9c8d8c2cbf8]
#    to [f4ffde278db4c6cc306f8eb2c103e1e0fb57bb9b]
# 
# patch "packages/midpath/midpath-qte_0.1.bb"
#  from [549d071305ff33976fb3b295f8abd83641872134]
#    to [83b41197388d55f4ef2d0ef337fecbaa1dbae5ec]
# 
# patch "packages/midpath/midpath-test_0.1.bb"
#  from [9086208d53ee5c8a8eafe4d13de2580741d16a60]
#    to [b57e98d5684c02898a04b720e7fd73b16b7a3f84]
# 
# patch "packages/midpath/midpath.inc"
#  from [e9d8c24f154d72d1d4847d255e9e58c8dc1bb7d1]
#    to [4ec39c10e6cf8f56277e239747ebd3f4809d0ba5]
# 
# patch "packages/midpath/midpath_0.1.bb"
#  from [d2d43501642415ee4c61b8e8ae4fe885f928f74c]
#    to [cccad19a0b23b239ad0e374fd612a7266a53eb4a]
# 
#   set "packages/ecj/files/ecj.in"
#  attr "mtn:execute"
# value "true"
# 
============================================================
--- packages/cacao/cacao-cldc.inc	0e7e1860852d3c226974148b855a1db2ea3c2b27
+++ packages/cacao/cacao-cldc.inc	0e7e1860852d3c226974148b855a1db2ea3c2b27
@@ -0,0 +1,64 @@
+DESCRIPTION = "Cacao-cldc is a Java Virtual Machine, which uses MIDPath CLDC as default Java core library"
+HOMEPAGE = "http://www.cacaojvm.org/"
+LICENSE  = "GPL"
+PRIORITY = "optional"
+SECTION  = "interpreters"
+
+DEPENDS = "zlib libtool classpath midpath-cldc cacaoh-cldc-native virtual/javac-native"
+
+# Avoid version number here, otherwise dpkg will expect a package name
+# and cannot be satisfied with a package that provides classpath.
+RDEPENDS = "midpath-cldc"
+
+PROVIDES = "cacao-cldc virtual/java-cldc"
+RPROVIDES_cacao-cldc = "java-cldc-runtime"
+
+inherit autotools update-alternatives
+
+EXTRA_OECONF = "\
+	${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
+	--enable-debug \
+	--enable-jni \
+	--disable-libjvm \
+	--enable-java=cldc1.1 \
+	--with-classpath=cldc1.1 \
+	--with-classpath-classes=${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar \
+	--with-target-classpath-classes=${datadir}/midpath-cldc/midpath-cldc1.1.jar \
+	--with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-cldc-${PV} \
+	--with-classpath-libdir=${STAGING_LIBDIR}/classpath \
+	--with-classpath-includedir=${STAGING_INCDIR}/classpath \
+	--with-vm-zip=${datadir}/cacao-cldc/vm.zip \
+	--libdir=${libdir}/cacao-cldc \
+	--program-suffix=-cldc \
+	"
+
+S = "${WORKDIR}/cacao-${PV}"
+
+PACKAGES = "${PN} ${PN}-doc ${PN}-dbg"
+
+FILES_${PN} = "${bindir}/${PN} ${libdir}/lib*.so* ${datadir}/${PN}"
+FILES_${PN}-doc = "${datadir}/man"
+FILES_${PN}-dbg += "${bindir}/.debug ${libdir}/.debug/lib*.so*"
+
+ALTERNATIVE_NAME = "java-cldc"
+ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}"
+ALTERNATIVE_PATH = "${bindir}/cacao-cldc"
+ALTERNATIVE_PRIORITY = "10"
+
+do_configure_prepend() {
+  # Replaces the placeholder OE_LIBDIR_JNI with the JNI library directory
+  # configured in OE.
+  if [ -e src/vm/properties.c ]; then
+    sed -i -e "s|OE_LIBDIR_JNI|${libdir}/jni|" src/vm/properties.c
+  fi
+
+  if [ -e src/vm/properties.c ]; then
+    sed -i -e "s|OE_LIBDIR_JNI|${libdir}/jni|" src/vm/vm.c
+  fi
+}
+
+do_configure_append() {
+  # Fix the executable name in the wrapper script.
+  sed -i -e "s|exec cacao|exec cacao-cldc|" src/scripts/java.in
+}
+
============================================================
--- packages/cacao/cacao-initial_0.98.bb	154e9de597ec6ab475c760aca2814514979356ea
+++ packages/cacao/cacao-initial_0.98.bb	154e9de597ec6ab475c760aca2814514979356ea
@@ -0,0 +1,34 @@
+require cacao-native.inc
+
+PROVIDES = "virtual/java-initial"
+
+DEPENDS = "zlib-native libtool-native fastjar-native classpath-initial jikes-initial"
+
+PR = "r0"
+
+SRC_URI = "\
+        http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2; \
+        file://cacao-0.98-initial.patch;patch=1;pnum=1 \
+        "
+
+# libjvm disabled - it would conflict with cacao-native installations
+EXTRA_OECONF = "\
+    --enable-debug \
+    --with-classpath-libdir=${libdir} \
+    --with-classpath-includedir=${includedir}/classpath-initial \
+    --with-classpath-classes=${datadir}/classpath-initial/glibj.zip \
+    --with-vm-zip=${datadir}/cacao-initial/vm.zip \
+    --program-suffix=-initial \
+    --disable-libjvm \
+    "
+
+# enforces the usage of jikes-initial
+export JAVAC=jikes-initial
+
+# enforces the usage of fastjar
+export JAR=fastjar
+
+do_configure_append() {
+  # Fix the executable name in the wrapper script.
+  sed -i -e "s|exec cacao|exec cacao-initial|" src/scripts/java.in
+}
============================================================
--- packages/cacao/cacao-native.inc	cc20995498c174c9ac504a54e5d844cfddfb8f3f
+++ packages/cacao/cacao-native.inc	cc20995498c174c9ac504a54e5d844cfddfb8f3f
@@ -0,0 +1,27 @@
+DESCRIPTION = "CacaoVM for use as OpenEmbedded's Java VM"
+HOMEPAGE = "http://www.cacaojvm.org/"
+LICENSE  = "GPL"
+PRIORITY = "optional"
+SECTION  = "interpreters"
+
+DEPENDS = "zlib-native libtool-native classpath-native ecj-initial fastjar-native"
+
+PROVIDES = "virtual/java-native"
+
+S = "${WORKDIR}/cacao-${PV}"
+
+inherit native autotools
+
+EXTRA_OECONF = "\
+    --enable-debug \
+    --with-classpath-libdir=${libdir} \
+    --with-classpath-includedir=${includedir}/classpath \
+    --with-classpath-classes=${datadir}/classpath/glibj.zip \
+    --with-vm-zip=${datadir}/cacao/vm.zip \
+    "
+
+# force usage of ecj-initial (but Java5-compatible class library)
+export JAVAC="${STAGING_BINDIR_NATIVE}/ecj-initial -bootclasspath ${STAGING_DATADIR_NATIVE}/classpath/glibj.zip"
+
+# force usage of fastjar
+export JAR=fastjar
============================================================
--- packages/cacao/cacao-native_0.98+hg20071001.bb	b087b9a24b9593dfff241d8dbafef831492c316b
+++ packages/cacao/cacao-native_0.98+hg20071001.bb	b087b9a24b9593dfff241d8dbafef831492c316b
@@ -0,0 +1,5 @@
+require cacao-native.inc
+
+PR = "r1"
+
+SRC_URI = "http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518"
============================================================
--- packages/cacao/cacao_0.98+hg20071001.bb	6b579068c4284eea4bb711e240a0e1ff839a8583
+++ packages/cacao/cacao_0.98+hg20071001.bb	6b579068c4284eea4bb711e240a0e1ff839a8583
@@ -0,0 +1,22 @@
+require cacao.inc
+
+PR = "r7"
+
+SRC_URI = "\
+        http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518 \
+        file://cacao-0.98+svn-libdir.diff;patch=1 \
+        file://cacao-0.98+svn-classpath_var.patch;patch=1 \
+        file://cacao-0.98+hg-arm-cacheflush-fix.patch;patch=1 \
+        file://cacao-0.98+hg-attachthread.patch;patch=1 \
+        "
+
+EXTRA_OECONF += "\
+    --enable-annotations \
+		"
+
+# Quirks for Nokia N800:
+# - with mfloat-abi=softfp the runtime fails to run anything
+# - without --enable-softfloat it cannot find files within Jars
+TARGET_CC_ARCH_nokia800 = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=soft"
+
+EXTRA_OECONF_append_nokia800 = "--enable-softfloat"
============================================================
--- packages/cacao/cacaoh-native.inc	21cb933b74df6d2ac41c9593d5df8f193f74b51a
+++ packages/cacao/cacaoh-native.inc	21cb933b74df6d2ac41c9593d5df8f193f74b51a
@@ -0,0 +1,27 @@
+DESCRIPTION = "Header generator for Cacao JVM - Needed for cross-compilation builds"
+HOMEPAGE = "http://www.cacaojvm.org/"
+LICENSE  = "GPL"
+
+DEPENDS = "libtool-native zlib-native virtual/javac-native classpath-native"
+
+S = "${WORKDIR}/cacao-${PV}"
+
+PR = "r1"
+
+inherit autotools native
+
+EXTRA_OECONF = " \
+    --with-classpath-includedir=${STAGING_INCDIR}/classpath \
+    --with-classpath-classes=${STAGING_DATADIR}/classpath/glibj.zip \
+    "
+
+do_compile() {
+  # Compile the header generator only (and what is needed for it).
+  oe_runmake -C src/toolbox libtoolbox.la
+  oe_runmake -C src/vmcore libvmcore.la
+  oe_runmake -C src/cacaoh cacaoh
+}
+
+do_stage() {
+	install -m 0755 src/cacaoh/.libs/cacaoh ${STAGING_BINDIR}/cacaoh-${PV}
+}
============================================================
--- packages/cacao/cacaoh-native_0.98+hg20071001.bb	3e9914f2a492d38de75e478cba4c16addca80a06
+++ packages/cacao/cacaoh-native_0.98+hg20071001.bb	3e9914f2a492d38de75e478cba4c16addca80a06
@@ -0,0 +1,5 @@
+require cacaoh-native.inc
+
+SRC_URI = "http://jalimo.evolvis.org/repository/sources/cacao-${PV}.tar.bz2;md5sum=9ff10c929bd0cbf15909107c1aff7518"
+
+
============================================================
--- packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch	125e26e26224355531392be2ba7990afaadd8f15
+++ packages/cacao/files/cacao-0.98+hg-arm-cacheflush-fix.patch	125e26e26224355531392be2ba7990afaadd8f15
@@ -0,0 +1,18 @@
+diff -r df1b780317c3 src/vm/jit/arm/asmpart.S
+--- a/src/vm/jit/arm/asmpart.S	Thu Jan 17 01:01:35 2008 +0100
++++ b/src/vm/jit/arm/asmpart.S	Mon Jan 21 00:14:41 2008 +0100
+@@ -323,10 +323,11 @@ asm_cacheflush:
+ 	mov   a1, #0xff000000
+ #endif
+ 
++#if defined(__ARM_EABI__)
++	swi   0x0
++	ldmfd sp!, {r7}
++#else
+ 	swi   sys_cacheflush
+-
+-#if defined(__ARM_EABI__)
+-	ldmfd sp!, {r7}
+ #endif
+ 
+ 	mov   pc, lr
============================================================
--- packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch	b4231277ce3d268059eaa141886c615a2dac0fc5
+++ packages/cacao/files/cacao-0.98+hg-arm-cacheflush-workaround.patch	b4231277ce3d268059eaa141886c615a2dac0fc5
@@ -0,0 +1,50 @@
+Index: cacao-0.98+hg7750/src/vm/jit/arm/asmpart.S
+===================================================================
+--- cacao-0.98+hg7750.orig/src/vm/jit/arm/asmpart.S	2007-11-28 10:14:51.000000000 +0100
++++ cacao-0.98+hg7750/src/vm/jit/arm/asmpart.S	2007-11-28 10:15:31.000000000 +0100
+@@ -302,35 +302,21 @@
+ *                                                                              *
+ *******************************************************************************/
+ 
+-.equ sys_cacheflush,__ARM_NR_cacheflush /* syscall number for cache flushing  */
+-
++.equ sys_cacheflush, 0x9f0002
+ asm_cacheflush:
+-	add   a1, a0, a1
+-	mov   a2, #0
+-
+-#if defined(__ARM_EABI__)
+-	/* According to EABI, the syscall number should be passed via R7,
+-	   see "http://wiki.debian.org/ArmEabiPort" for additional details. */
+-
+-	stmfd sp!, {r7}
+-	mov   r7, #0x0f0000
+-	add   r7, r%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list