void-packages/srcpkgs/gcc6/patches/504-fix-gcj-arm-thumb.patch
q66 6f1c7ff607 New package: gcc6-6.5.0
This is the first part of an effort to allow bootstrapping openjdk
without downloading any binaries. The next part will be an openjdk7
package that will be used to bootstrap openjdk8.

After that, we can proceed to add the missing parts to go all the
way up to 11.

[ci skip]
2019-11-15 22:56:51 +01:00

23 lines
806 B
Diff

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))