aboutsummaryrefslogtreecommitdiffstats
path: root/community/gcc6/fix-gcj-arm-thumb.patch
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2018-12-27 08:44:05 +0000
committerTimo Teräs <timo.teras@iki.fi>2018-12-27 10:48:21 +0200
commit66a06a284359799525a6479f648149e82e1492a3 (patch)
tree44a12a3fc00798525f6563aae55051b0c813f40d /community/gcc6/fix-gcj-arm-thumb.patch
parent601b96a1b5c62948e7989195d28aac2eb86b9d97 (diff)
downloadaports-66a06a284359799525a6479f648149e82e1492a3.tar.bz2
aports-66a06a284359799525a6479f648149e82e1492a3.tar.xz
community/gcc6: fix gcc-java on armv7 and class cache path
- fix unwinding to work with arm thumb code - fix packaging to keep class cache in right path
Diffstat (limited to 'community/gcc6/fix-gcj-arm-thumb.patch')
-rw-r--r--community/gcc6/fix-gcj-arm-thumb.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/community/gcc6/fix-gcj-arm-thumb.patch b/community/gcc6/fix-gcj-arm-thumb.patch
new file mode 100644
index 0000000000..8610515967
--- /dev/null
+++ b/community/gcc6/fix-gcj-arm-thumb.patch
@@ -0,0 +1,23 @@
+diff -ruN gcc/libjava/configure.host gcc/libjava/configure.host
+--- gcc/libjava/configure.host 2015-05-28 21:13:55.185034000 +0300
++++ gcc/libjava/configure.host 2018-12-27 09:26:16.579326441 +0200
+@@ -407,6 +407,10 @@
+ descriptor_h=sysdep/powerpc/descriptor.h
+ ;;
+
++ arm*-*)
++ descriptor_h=sysdep/arm/descriptor.h
++ ;;
++
+ *)
+ descriptor_h=sysdep/descriptor-n.h
+ ;;
+diff -ruN gcc/libjava/sysdep/arm/descriptor.h gcc/libjava/sysdep/arm/descriptor.h
+--- gcc/libjava/sysdep/arm/descriptor.h 1970-01-01 02:00:00.000000000 +0200
++++ gcc/libjava/sysdep/arm/descriptor.h 2018-12-27 09:27:38.714979452 +0200
+@@ -0,0 +1,4 @@
++// Given a function pointer, return the code address.
++// Strip out the ARM/Thumb mode indicator bit
++
++#define UNWRAP_FUNCTION_DESCRIPTOR(X) ((void*)(((unsigned long)X) & ~1UL))
+