diff options
| author | msmith <msmith@FreeBSD.org> | 1998-09-17 22:08:34 +0000 |
|---|---|---|
| committer | msmith <msmith@FreeBSD.org> | 1998-09-17 22:08:34 +0000 |
| commit | 23bdbca2d46a44c119d0a48bd31b6fb92d960b90 (patch) | |
| tree | b06eac0a0b460a5d4b0d82b4b41abeae1ed16b6a /sys/modules/linux | |
| parent | 5fb94b7685fb6a56410ef7463830cd2858edd432 (diff) | |
| download | FreeBSD-src-23bdbca2d46a44c119d0a48bd31b6fb92d960b90.zip FreeBSD-src-23bdbca2d46a44c119d0a48bd31b6fb92d960b90.tar.gz | |
Add support for glibc consumers using the new ld-linux.so.2 linker.
I can't say this was the most inspired fix, but it matches the design OK.
Diffstat (limited to 'sys/modules/linux')
| -rw-r--r-- | sys/modules/linux/linux.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sys/modules/linux/linux.c b/sys/modules/linux/linux.c index 4055173..11898c3 100644 --- a/sys/modules/linux/linux.c +++ b/sys/modules/linux/linux.c @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: linux.c,v 1.11 1997/04/06 10:47:59 dufault Exp $ + * $Id: linux.c,v 1.12 1997/05/01 06:08:14 jkh Exp $ */ #include <sys/param.h> @@ -41,12 +41,13 @@ extern const struct execsw linux_execsw; MOD_EXEC(linux, -1, &linux_execsw); -extern Elf32_Brandinfo linux_brand; +extern Elf32_Brandinfo linux_brand, linux_glibc2brand; static int linux_load(struct lkm_table *lkmtp, int cmd) { - if (elf_insert_brand_entry(&linux_brand)) + if ((elf_insert_brand_entry(&linux_brand)) || + (elf_insert_brand_entry(&linux_glibc2brand))) uprintf("Could not install ELF interpreter entry\n"); /* uprintf("Linux emulator installed\n"); XXX - shut up, you! */ return 0; |
