diff mbox

Backport PR 43715 fix for darwin to gcc 4.5.1

Message ID 20100625033520.GA24847@bromo.med.uc.edu
State New
Headers show

Commit Message

Jack Howarth June 25, 2010, 3:35 a.m. UTC 
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?

2010-06-24  Jack Howarth  <howarth@bromo.med.uc.edu>

	Backport from mainline
	2010-04-21  Jack Howarth <howarth@bromo.med.uc.edu>

	PR 43715
	* testsuite/lib/plugin-support.exp: Use "-undefined
	dynamic_lookup" on darwin.

2010-06-24  Jack Howarth  <howarth@bromo.med.uc.edu>

	Backport from mainline
	2010-04-21  Jack Howarth <howarth@bromo.med.uc.edu>

	PR 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.

Comments

Mike Stump June 25, 2010, 5:14 a.m. UTC | #1 
On Jun 24, 2010, at 8:35 PM, Jack Howarth wrote:
> 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?

Ok.
Rainer Orth June 25, 2010, 10:05 a.m. UTC | #2 
Jack Howarth <howarth@bromo.med.uc.edu> writes:

> 2010-06-24  Jack Howarth  <howarth@bromo.med.uc.edu>
>
> 	Backport from mainline
> 	2010-04-21  Jack Howarth <howarth@bromo.med.uc.edu>
>
> 	PR 43715

I've seen this several times in your ChangeLog entries: please use e.g. PR
target/43715 instead.

Thanks.
	Rainer
diff mbox

Patch

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;],