aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog.csl6
-rw-r--r--gcc/config/m68k/uclinux.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl
index eb46498ad21..6fee11dc1cf 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,9 @@
+2006-06-28 Richard Sandiford <richard@codesourcery.com>
+
+ gcc/
+ * config/m68k/uclinux.h (LIB_SPEC): Allow -static-libc to suppress
+ the linking of the shared C library.
+
2006-06-27 Richard Sandiford <richard@codesourcery.com>
gcc/testsuite/
diff --git a/gcc/config/m68k/uclinux.h b/gcc/config/m68k/uclinux.h
index 90e9101be8f..0ce0b307e40 100644
--- a/gcc/config/m68k/uclinux.h
+++ b/gcc/config/m68k/uclinux.h
@@ -33,7 +33,7 @@ Boston, MA 02110-1301, USA. */
profiling, or libg.a. */
#undef LIB_SPEC
#define LIB_SPEC \
-"%{mid-shared-library:-R libc.gdb%s} -lc"
+"%{mid-shared-library:%{!static-libc:-R libc.gdb%s}} -lc"
/* Default to using -elf2flt with no options. */
#undef LINK_SPEC