diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-10-23 15:46:30 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2019-10-23 15:46:30 +0000 |
| commit | 3ddf3156a13d497504e7b68fc98956f856079a11 (patch) | |
| tree | e2221edfdc16390347551df1ea96625b994f18b9 /usr/src/uts/intel/ia32 | |
| parent | 420d8476db32dc156f7c7016224954aaf90b249b (diff) | |
| parent | a81035424b8f58c433af07a106f89ab5e28c969c (diff) | |
| download | illumos-joyent-3ddf3156a13d497504e7b68fc98956f856079a11.tar.gz | |
[illumos-gate merge]
commit a81035424b8f58c433af07a106f89ab5e28c969c
11841 badseg test times out
commit 695dd8d1c21542efb8ca2e82c6eb63007a6a5212
11741 regexec: fix processing multibyte strings
commit 1603eda21695ca85bfde0e5c75a27d94ac4ce4ff
8908 regcomp: reduce size of bitmap for multibyte locales
commit 62e7498000cb79c72fafb7270dbc3beb8a41863d
8993 regex: Refactor fast/slow stepping bits in the matching engine
commit 65f204200cf9a50fd6bad4093ee0b07bc35105ac
11787 Kernel needs to be built with retpolines
11788 Kernel needs to generally use RSB stuffing
Conflicts:
usr/src/uts/intel/ia32/ml/modstubs.so
usr/src/uts/i86pc/ml/syscall_asm_amd64.s
Diffstat (limited to 'usr/src/uts/intel/ia32')
| -rw-r--r-- | usr/src/uts/intel/ia32/ml/modstubs.s | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/usr/src/uts/intel/ia32/ml/modstubs.s b/usr/src/uts/intel/ia32/ml/modstubs.s index 4bda0fd8c7..8ea92d695a 100644 --- a/usr/src/uts/intel/ia32/ml/modstubs.s +++ b/usr/src/uts/intel/ia32/ml/modstubs.s @@ -91,8 +91,6 @@ char stubs_base[1], stubs_end[1]; * This file contains the stubs routines for modules which can be autoloaded. */ -#if defined(__amd64) - /* * See the 'struct mod_modinfo' definition to see what this declaration * is trying to achieve here. @@ -1292,10 +1290,8 @@ fcnname/**/_info: \ MODULE(elfexec,exec); STUB(elfexec, elfexec, nomod_einval); STUB(elfexec, mapexec_brand, nomod_einval); -#if defined(__amd64) STUB(elfexec, elf32exec, nomod_einval); STUB(elfexec, mapexec32_brand, nomod_einval); -#endif END_MODULE(elfexec); #endif |