diff -uNr gcc-4.8.0/gcc/config/darwin.h gcc-4.8.0.fink/gcc/config/darwin.h
--- gcc-4.8.0/gcc/config/darwin.h	2013-02-11 18:30:10.000000000 -0500
+++ gcc-4.8.0.fink/gcc/config/darwin.h	2013-04-06 10:13:42.000000000 -0400
@@ -913,9 +913,8 @@
   darwin_driver_init (&decoded_options_count, &decoded_options)
 #endif
 
-/* The Apple assembler and linker do not support constructor priorities.  */
-#undef SUPPORTS_INIT_PRIORITY
-#define SUPPORTS_INIT_PRIORITY 0
+/* While the Apple assembler and linker do not support constructor priorities,
+   intra-module priority support is available through sort_cdtor_records. */
 
 /* When building cross-compilers (and native crosses) we shall default to 
    providing an osx-version-min of this unless overridden by the User.  */
diff -uNr gcc-4.8.0/gcc/testsuite/g++.dg/special/conpr-3.C gcc-4.8.0.fink/gcc/testsuite/g++.dg/special/conpr-3.C
--- gcc-4.8.0/gcc/testsuite/g++.dg/special/conpr-3.C	2007-02-25 13:47:05.000000000 -0500
+++ gcc-4.8.0.fink/gcc/testsuite/g++.dg/special/conpr-3.C	2013-04-06 10:13:42.000000000 -0400
@@ -1,5 +1,6 @@
 /* { dg-do run { target init_priority } } */
 /* { dg-additional-sources "conpr-3a.cc conpr-3b.cc" } */
+/* { dg-shouldfail "No inter-module priority support" { *-apple-darwin* } } */
 
 #include <stdlib.h>
 
diff -uNr gcc-4.8.0/libjava/configure gcc-4.8.0.fink/libjava/configure
--- gcc-4.8.0/libjava/configure	2012-12-12 08:40:15.000000000 -0500
+++ gcc-4.8.0.fink/libjava/configure	2013-04-06 10:13:42.000000000 -0400
@@ -1621,6 +1621,8 @@
                           default=yes
   --enable-java-maintainer-mode
                           allow rebuilding of .class and .h files
+  --enable-libjava-multilib
+                          build libjava as multilib
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --enable-maintainer-mode  enable make rules and dependencies not useful
@@ -3379,6 +3381,16 @@
 fi
 
 
+# Check whether --enable-libjava-multilib was given.
+if test "${enable_libjava_multilib+set}" = set; then
+  enableval=$enable_libjava_multilib;
+fi
+
+if test "$enable_libjava_multilib" = no; then
+  multilib=no
+  ac_configure_args="$ac_configure_args --disable-multilib"
+fi
+
 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
 
 
diff -uNr gcc-4.8.0/libjava/configure.ac gcc-4.8.0.fink/libjava/configure.ac
--- gcc-4.8.0/libjava/configure.ac	2012-12-12 08:40:15.000000000 -0500
+++ gcc-4.8.0.fink/libjava/configure.ac	2013-04-06 10:13:42.000000000 -0400
@@ -141,6 +141,13 @@
 	[allow rebuilding of .class and .h files]))
 AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
 
+AC_ARG_ENABLE(libjava-multilib,
+	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
+if test "$enable_libjava_multilib" = no; then
+  multilib=no
+  ac_configure_args="$ac_configure_args --disable-multilib"
+fi
+
 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
 GCC_NO_EXECUTABLES
 
diff -uNr gcc-4.8.0/libquadmath/configure gcc-4.8.0.fink/libquadmath/configure
--- gcc-4.8.0/libquadmath/configure	2013-03-22 06:16:00.000000000 -0400
+++ gcc-4.8.0.fink/libquadmath/configure	2013-04-06 10:14:10.000000000 -0400
@@ -3395,7 +3395,7 @@
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
   (eval "$ac_try") 2>&5
-  ac_status=$?
+  ac_status=0
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
     cross_compiling=no
diff -uNr gcc-4.8.1/libjava/Makefile.am gcc-4.8.1.fink/libjava/Makefile.am
--- gcc-4.8.1/libjava/Makefile.am	2013-01-07 13:23:42.000000000 -0500
+++ gcc-4.8.1.fink/libjava/Makefile.am	2013-07-04 22:44:57.000000000 -0400
@@ -492,7 +492,7 @@
 libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \
 	$(LIBLTDL) $(SYS_ZLIBS) $(LIBJAVA_LDFLAGS_NOUNDEF) \
 	-version-info `grep -v '^\#' $(srcdir)/libtool-version` \
-	$(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBGCJ_LD_EXPORT_ALL)
+	$(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBGCJ_LD_EXPORT_ALL) $(LDLIBICONV)
 libgcj_la_LIBADD = \
 	classpath/native/fdlibm/libfdlibm.la \
 	java/lang/Object.lo \
diff -uNr gcc-4.8.1/libjava/Makefile.in gcc-4.8.1.fink/libjava/Makefile.in
--- gcc-4.8.1/libjava/Makefile.in	2013-01-07 13:23:42.000000000 -0500
+++ gcc-4.8.1.fink/libjava/Makefile.in	2013-07-04 22:46:36.000000000 -0400
@@ -1071,7 +1071,7 @@
 libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(extra_ldflags) $(THREADLIBS) \
 	$(LIBLTDL) $(SYS_ZLIBS) $(LIBJAVA_LDFLAGS_NOUNDEF) \
 	-version-info `grep -v '^\#' $(srcdir)/libtool-version` \
-	$(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBGCJ_LD_EXPORT_ALL)
+	$(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) $(LIBGCJ_LD_EXPORT_ALL) $(LDLIBICONV)
 
 libgcj_la_LIBADD = \
 	classpath/native/fdlibm/libfdlibm.la \
diff -uNr gcc-4.8.1/libjava/libgcj.spec.in gcc-4.8.1.fink/libjava/libgcj.spec.in
--- gcc-4.8.1/libjava/libgcj.spec.in	2011-02-04 00:51:57.000000000 -0500
+++ gcc-4.8.1.fink/libjava/libgcj.spec.in	2013-07-04 22:36:57.000000000 -0400
@@ -7,6 +7,6 @@
 *startfile: @THREADSTARTFILESPEC@ %(startfileorig)
 
 %rename lib liborig
-*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@ @LIBMATHSPEC@ @LDLIBICONV@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) @LIBSTDCXXSPEC@ %(liborig)
+*lib: @LD_START_STATIC_SPEC@ @LIBGCJ_SPEC@ @LD_FINISH_STATIC_SPEC@ @LIBMATHSPEC@ @GCSPEC@ @THREADSPEC@ @ZLIBSPEC@ @SYSTEMSPEC@ %(libgcc) @LIBSTDCXXSPEC@ %(liborig)
 
 *jc1: @HASH_SYNC_SPEC@ @DIVIDESPEC@ @CHECKREFSPEC@ @JC1GCSPEC@ @EXCEPTIONSPEC@ @BACKTRACESPEC@ @IEEESPEC@ @ATOMICSPEC@ @LIBGCJ_BC_SPEC@ -fkeep-inline-functions