diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2015-01-11 22:13:13 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2015-01-11 22:13:13 +0300 |
| commit | 717e433a572fe0c738973771642ba7f3c997b733 (patch) | |
| tree | b1bd6da3c1ae48b8fd26072f75d36c0b7e925fc0 | |
| parent | e668811bdcb58267414b9dc8a205fb1df21eea68 (diff) | |
| download | illumos-packaging-717e433a572fe0c738973771642ba7f3c997b733.tar.gz | |
Added debian/patches/regset-names.patch
| -rw-r--r-- | uts/debian/patches/regset-names.patch | 22 | ||||
| -rw-r--r-- | uts/debian/patches/series | 1 |
2 files changed, 23 insertions, 0 deletions
diff --git a/uts/debian/patches/regset-names.patch b/uts/debian/patches/regset-names.patch new file mode 100644 index 0000000..c9ddec6 --- /dev/null +++ b/uts/debian/patches/regset-names.patch @@ -0,0 +1,22 @@ +Description: these macros cause problem when compiling + some packages, especially ERR, FS, GS. +Index: uts/usr/src/uts/intel/sys/regset.h +=================================================================== +--- uts.orig/usr/src/uts/intel/sys/regset.h ++++ uts/usr/src/uts/intel/sys/regset.h +@@ -92,6 +92,7 @@ extern "C" { + * The names and offsets defined here are specified by i386 ABI suppl. + */ + ++#if defined(_I386_REGS) || (defined(_KERNEL) && defined(_SYSCALL32_IMPL)) + #define SS 18 /* only stored on a privilege transition */ + #define UESP 17 /* only stored on a privilege transition */ + #define EFL 16 +@@ -111,6 +112,7 @@ extern "C" { + #define ES 2 + #define FS 1 + #define GS 0 ++#endif + + /* aliases for portability */ + diff --git a/uts/debian/patches/series b/uts/debian/patches/series index 0f315e6..c237c1a 100644 --- a/uts/debian/patches/series +++ b/uts/debian/patches/series @@ -66,3 +66,4 @@ disable-clobbered-warning.patch index_t.patch rpc-rpc-h.patch sys-ioctl-include-termios.patch +regset-names.patch |