diff --git a/gcc43-build-id.patch b/gcc43-build-id.patch index 4e162e6..3f9a415 100644 --- a/gcc43-build-id.patch +++ b/gcc43-build-id.patch @@ -10,8 +10,8 @@ --- gcc/config/rs6000/sysv4.h.~1~ +++ gcc/config/rs6000/sysv4.h -@@ -1044,7 +1044,7 @@ extern int fixuplabelno; - %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}" +@@ -906,7 +906,7 @@ extern int fixuplabelno; + %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}" #if defined(HAVE_LD_EH_FRAME_HDR) -# define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " diff --git a/gcc43-rh330771.patch b/gcc43-rh330771.patch index c894f83..f52b919 100644 --- a/gcc43-rh330771.patch +++ b/gcc43-rh330771.patch @@ -5,30 +5,30 @@ --- libjava/Makefile.am.jj 2007-03-17 09:20:30.000000000 +0100 +++ libjava/Makefile.am 2007-10-16 15:45:14.000000000 +0200 -@@ -262,6 +262,8 @@ EXTRA_libgcj_la_SOURCES = java/lang/Obje +@@ -277,6 +277,8 @@ EXTRA_libgcj_la_SOURCES = java/lang/Obje libgcj_tools_la_SOURCES = classpath/tools/tools.zip libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes -fsource-filename=$(here)/classpath/tools/all-classes.lst +## See jv_convert_LDADD. +libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \ - -version-info `grep -v '^\#' $(srcdir)/libtool-version` - libgcj_tools_la_DEPENDENCIES = libgcj.la libgcj.spec + -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ + $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS) --- libjava/Makefile.in.jj 2007-07-04 21:11:11.000000000 +0200 +++ libjava/Makefile.in 2007-10-16 15:56:07.000000000 +0200 -@@ -146,7 +146,6 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt +@@ -153,7 +153,6 @@ am__objects_1 = gnu/gcj/xlib/lib_gnu_awt am_lib_gnu_awt_xlib_la_OBJECTS = $(am__objects_1) lib_gnu_awt_xlib_la_OBJECTS = $(am_lib_gnu_awt_xlib_la_OBJECTS) @XLIB_AWT_TRUE@am_lib_gnu_awt_xlib_la_rpath = -rpath $(toolexeclibdir) -libgcj_tools_la_LIBADD = am_libgcj_tools_la_OBJECTS = classpath/tools/libgcj_tools_la-tools.lo libgcj_tools_la_OBJECTS = $(am_libgcj_tools_la_OBJECTS) - am__DEPENDENCIES_1 = gnu/awt.lo gnu/awt/j2d.lo gnu/classpath.lo \ -@@ -894,6 +893,7 @@ libgcj_la_LINK = $(LIBLINK) + @INTERPRETER_TRUE@am__DEPENDENCIES_1 = gnu/classpath/jdwp.lo \ +@@ -941,6 +940,7 @@ libgcj_la_LINK = $(LIBLINK) EXTRA_libgcj_la_SOURCES = java/lang/Object.java libgcj_tools_la_SOURCES = classpath/tools/tools.zip libgcj_tools_la_GCJFLAGS = $(AM_GCJFLAGS) -findirect-dispatch -fno-indirect-classes -fsource-filename=$(here)/classpath/tools/all-classes.lst +libgcj_tools_la_LIBADD = -L$(here)/.libs libgcj.la libgcj_tools_la_LDFLAGS = -rpath $(toolexeclibdir) \ - -version-info `grep -v '^\#' $(srcdir)/libtool-version` - + -version-info `grep -v '^\#' $(srcdir)/libtool-version` \ + $(LIBGCJ_LD_SYMBOLIC_FUNCTIONS)