From patchwork Fri Jun 25 13:26:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Howarth X-Patchwork-Id: 56911 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id DAD3EB6F18 for ; Fri, 25 Jun 2010 23:27:05 +1000 (EST) Received: (qmail 16003 invoked by alias); 25 Jun 2010 13:27:04 -0000 Received: (qmail 15991 invoked by uid 22791); 25 Jun 2010 13:27:03 -0000 X-SWARE-Spam-Status: No, hits=-2.0 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from bromo.med.uc.edu (HELO bromo.med.uc.edu) (129.137.3.146) by sourceware.org (qpsmtpd/0.43rc1) with SMTP; Fri, 25 Jun 2010 13:26:59 +0000 Received: from bromo.med.uc.edu (localhost.localdomain [127.0.0.1]) by bromo.med.uc.edu (Postfix) with ESMTP id E1433B0045; Fri, 25 Jun 2010 09:26:57 -0400 (EDT) Received: (from howarth@localhost) by bromo.med.uc.edu (8.14.3/8.14.3/Submit) id o5PDQvei028957; Fri, 25 Jun 2010 09:26:57 -0400 Date: Fri, 25 Jun 2010 09:26:57 -0400 From: Jack Howarth To: gcc-patches@gcc.gnu.org Cc: mikestump@comcast.net, iains@gcc.gnu.org Subject: [PATCH][Revised] Backport PR 43715 fix for darwin to gcc 4.5.1 Message-ID: <20100625132657.GA28955@bromo.med.uc.edu> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org The attached patch backports r158747 and r158748 from gcc trunk to gcc 4.5.1 to solve PR 43715 so that plugin support is built on darwin. Tested on x86_64-apple-darwin10. Okay for gcc trunk? Jack ps Same as previous posting but with fixed ChangeLog entry. 2010-06-24 Jack Howarth Backport from mainline 2010-04-21 Jack Howarth PR target/43715 * testsuite/lib/plugin-support.exp: Use "-undefined dynamic_lookup" on darwin. 2010-06-24 Jack Howarth Backport from mainline 2010-04-21 Jack Howarth PR target/43715 * gcc/configure.ac: Use "$gcc_cv_nm -g" on darwin instead of "$gcc_cv_objdump -T". Use "-undefined dynamic_lookup" on darwin. * gcc/configure: Regenerate. Index: gcc/testsuite/lib/plugin-support.exp =================================================================== --- gcc/testsuite/lib/plugin-support.exp (revision 161355) +++ gcc/testsuite/lib/plugin-support.exp (working copy) @@ -88,6 +88,10 @@ set optstr "$includes $extra_flags -DIN_GCC -fPIC -shared" + if { [ ishost *-*-darwin* ] } { + set optstr [concat $optstr "-undefined dynamic_lookup"] + } + # Temporarily switch to the environment for the plugin compiler. restore_ld_library_path_env_vars set status [remote_exec build "$PLUGINCC $PLUGINCFLAGS $plugin_src $optstr -o $plugin_lib"] Index: gcc/configure.ac =================================================================== --- gcc/configure.ac (revision 161355) +++ gcc/configure.ac (working copy) @@ -4544,15 +4544,23 @@ pluginlibs= if test x"$enable_plugin" = x"yes"; then + case "${host}" in + *-*-darwin*) + export_sym_check="$gcc_cv_nm -g" + ;; + *) + export_sym_check="$gcc_cv_objdump -T" + ;; + esac AC_MSG_CHECKING([for exported symbols]) echo "int main() {return 0;} int foobar() {return 0;}" > conftest.c ${CC} ${CFLAGS} ${LDFLAGS} conftest.c -o conftest > /dev/null 2>&1 - if $gcc_cv_objdump -T conftest | grep foobar > /dev/null; then + if $export_sym_check conftest | grep foobar > /dev/null; then : # No need to use a flag else AC_MSG_CHECKING([for -rdynamic]) ${CC} ${CFLAGS} ${LDFLAGS} -rdynamic conftest.c -o conftest > /dev/null 2>&1 - if $gcc_cv_objdump -T conftest | grep foobar > /dev/null; then + if $export_sym_check conftest | grep foobar > /dev/null; then plugin_rdynamic=yes pluginlibs="-rdynamic" else @@ -4572,7 +4580,14 @@ # Check that we can build shared objects with -fPIC -shared saved_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS -fPIC -shared" + case "${host}" in + *-*-darwin*) + LDFLAGS="$LDFLAGS -fPIC -shared -undefined dynamic_lookup" + ;; + *) + LDFLAGS="$LDFLAGS -fPIC -shared" + ;; + esac AC_MSG_CHECKING([for -fPIC -shared]) AC_TRY_LINK( [extern int X;],[return X == 0;],