[Bug java/41991] gcj segfaults on i686-apple-darwin* and x86_64-apple-darwin*

[howarth at nitro dot med dot uc dot edu]

------- Comment #10 from howarth at nitro dot med dot uc dot edu  2009-11-16 01:26 -------
This doesn't solve the abort in ejc1 on x86_64-apple-darwin10, but shouldn't we
have...

Index: libjava/Makefile.in
===================================================================
--- libjava/Makefile.in (revision 154191)
+++ libjava/Makefile.in (working copy)
@@ -8510,11 +8510,12 @@
 ECJX_BASE_FLAGS = -findirect-dispatch \
        --main=org.eclipse.jdt.internal.compiler.batch.GCCMain

-@NATIVE_FALSE@ecjx_LINK = $(GCJ_FOR_ECJX_LINK) $(ecjx_LDFLAGS)
-@NATIVE_TRUE@ecjx_LINK = $(GCJLINK) $(ecjx_LDFLAGS)
 @ENABLE_SHARED_FALSE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS)
$(ECJ_BUILD_JAR) -fbootclasspath=$(BOOTCLASSPATH)
 @ENABLE_SHARED_TRUE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS)
-Djava.class.path=$(ECJ_JAR)
 @NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
+@NATIVE_FALSE@ecjx_LINK = $(GCJ_FOR_ECJX_LINK) $(ecjx_LDFLAGS)
+@NATIVE_TRUE@ecjx_LINK = $(GCJLINK) $(ecjx_LDFLAGS) -shared-libgcc
$(extra_gij_ldflags)
+
 @NATIVE_FALSE@ecjx_LDADD = 
 @NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs $(extra_ldflags) \
 @NATIVE_TRUE@  $(am__append_31)
Index: libjava/Makefile.am
===================================================================
--- libjava/Makefile.am (revision 154191)
+++ libjava/Makefile.am (working copy)
@@ -1085,8 +1085,6 @@

 if NATIVE

-ecjx_LINK = $(GCJLINK) $(ecjx_LDFLAGS)
-
 if ENABLE_SHARED
 ## Use ecj.jar at runtime.
 ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR)
@@ -1095,6 +1093,8 @@
 ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
-fbootclasspath=$(BOOTCLASSPATH)
 endif !ENABLE_SHARED

+ecjx_LINK = $(GCJLINK) $(ecjx_LDFLAGS) -shared-libgcc $(extra_gij_ldflags)
+
 ecjx_LDADD = -L$(here)/.libs $(extra_ldflags)
 ecjx_DEPENDENCIES = libgcj.la libgcj.spec
 if BUILD_SUBLIBS

Currently ecjx_LDFLAGS is used in assigning ecjx_LINK before it is assigned
itself.


-- 


http://gcc.gnu.org/bugzilla/show_bug.cgi?id=41991