From 2572f1c610c85d2f27fa58ba090e626e1b98ce60 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Wed, 15 Jun 2005 00:10:05 +0000 Subject: [PATCH] re PR libffi/21943 (O32 libffi.so fails to link on IRIX 6) PR libgcj/21943 * src/mips/n32.S: Enforce PIC code. * src/mips/o32.S: Likewise. From-SVN: r100961 --- libffi/ChangeLog | 6 ++++++ libffi/src/mips/n32.S | 3 ++- libffi/src/mips/o32.S | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 5220826b722..3b1afef3ee4 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,9 @@ +2005-06-15 Rainer Orth + + PR libgcj/21943 + * src/mips/n32.S: Enforce PIC code. + * src/mips/o32.S: Likewise. + 2005-06-15 Rainer Orth * configure.ac: Treat i*86-*-solaris2.10 and up as X86_64. diff --git a/libffi/src/mips/n32.S b/libffi/src/mips/n32.S index 767fa52bd5c..358cfd7e409 100644 --- a/libffi/src/mips/n32.S +++ b/libffi/src/mips/n32.S @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- - n32.S - Copyright (c) 1996, 1998 Red Hat, Inc. + n32.S - Copyright (c) 1996, 1998, 2005 Red Hat, Inc. MIPS Foreign Function Interface @@ -39,6 +39,7 @@ #define SIZEOF_FRAME ( 8 * FFI_SIZEOF_ARG ) + .abicalls .text .align 2 .globl ffi_call_N32 diff --git a/libffi/src/mips/o32.S b/libffi/src/mips/o32.S index 75261b9b88f..bd9a33b7b7e 100644 --- a/libffi/src/mips/o32.S +++ b/libffi/src/mips/o32.S @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- - o32.S - Copyright (c) 1996, 1998 Red Hat, Inc. + o32.S - Copyright (c) 1996, 1998, 2005 Red Hat, Inc. MIPS Foreign Function Interface @@ -37,6 +37,7 @@ #define SIZEOF_FRAME ( 4 * FFI_SIZEOF_ARG + 2 * FFI_SIZEOF_ARG ) + .abicalls .text .align 2 .globl ffi_call_O32