diff options
| -rw-r--r-- | debian/patches/illumos-libgcc-regs.diff | 25 | ||||
| -rw-r--r-- | debian/rules.patch | 1 |
2 files changed, 26 insertions, 0 deletions
diff --git a/debian/patches/illumos-libgcc-regs.diff b/debian/patches/illumos-libgcc-regs.diff new file mode 100644 index 0000000..eddda0f --- /dev/null +++ b/debian/patches/illumos-libgcc-regs.diff @@ -0,0 +1,25 @@ +Index: gcc-5/src/libgcc/config/i386/sol2-unwind.h +=================================================================== +--- gcc-5.orig/src/libgcc/config/i386/sol2-unwind.h ++++ gcc-5/src/libgcc/config/i386/sol2-unwind.h +@@ -28,6 +28,20 @@ see the files COPYING3 and COPYING.RUNTI + #include <ucontext.h> + #include <sys/frame.h> + ++/* /usr/include/sys/regset.h */ ++#ifndef EAX ++# define UESP 17 ++# define EIP 14 ++# define EAX 11 ++# define ECX 10 ++# define EDX 9 ++# define EBX 8 ++# define ESP 7 ++# define EBP 6 ++# define ESI 5 ++# define EDI 4 ++#endif ++ + #ifdef __x86_64__ + + #define MD_FALLBACK_FRAME_STATE_FOR x86_64_fallback_frame_state diff --git a/debian/rules.patch b/debian/rules.patch index ef37dbd..0053131 100644 --- a/debian/rules.patch +++ b/debian/rules.patch @@ -340,6 +340,7 @@ ifeq ($(DEB_TARGET_ARCH_OS), illumos) debian_patches += illumos-fclone-functions debian_patches += illumos-strict-calling-conventions debian_patches += illumos-boehm-gc + debian_patches += illumos-libgcc-regs endif # don't remove, this is regularly overwritten, see PR sanitizer/63958. |