Index: Makefile
===================================================================
--- Makefile	(revision cc2c9e07c3b07294dbe6c8e5c0b297dca411fff2)
+++ Makefile	(revision 15854f14d5a7dc3acd9835b622e4c568cc5c4fa3)
@@ -14,6 +14,6 @@
 # hand-written assembly language code
 
-FLAGS_COM :=	$(FLAGS) -mshort -std=c99 -fleading-underscore -ffreestanding \
-				-nostdinc -fno-strict-aliasing -fno-inline -fno-omit-frame-pointer \
+FLAGS_COM :=	$(FLAGS) -mshort -std=c99 -ffreestanding -nostdinc \
+				-fno-strict-aliasing -fno-inline -fno-omit-frame-pointer \
 				-Wpedantic -Wconversion -Wsign-conversion -Wshadow \
 				-Wstrict-prototypes -Wmissing-declarations -Wredundant-decls \
@@ -41,5 +41,4 @@
 build/%.o:		prolog/%.c $(HEADERS) | build
 				$(CROSS_GCC) $(FLAGS_COM) -c -o $@ $<
-				$(CROSS_OBJC) --redefine-syms misc/rewrite.txt $@
 
 build/%.o:		prolog/%.s $(HEADERS) | build
@@ -65,5 +64,4 @@
 build/%.o:		libcio/%.c $(HEADERS) | build
 				$(CROSS_GCC) $(FLAGS_COM) -c -o $@ $<
-				$(CROSS_OBJC) --redefine-syms misc/rewrite.txt $@
 
 build/%.o:		libcio/%.s $(HEADERS) | build
@@ -88,5 +86,4 @@
 build/%.o:		vlib/%.c $(HEADERS) | build
 				$(CROSS_GCC) $(FLAGS_COM) -c -o $@ $<
-				$(CROSS_OBJC) --redefine-syms misc/rewrite.txt $@
 
 build/%.o:		vlib/%.s $(HEADERS) | build
@@ -106,5 +103,4 @@
 build/%.o:		iolib/%.c $(HEADERS) | build
 				$(CROSS_GCC) $(FLAGS_COM) -c -o $@ $<
-				$(CROSS_OBJC) --redefine-syms misc/rewrite.txt $@
 
 build/%.o:		iolib/%.s $(HEADERS) | build
@@ -126,5 +122,4 @@
 build/%.o:		libsm/%.c $(HEADERS) | build
 				$(CROSS_GCC) $(FLAGS_COM) -c -o $@ $<
-				$(CROSS_OBJC) --redefine-syms misc/rewrite.txt $@
 
 libsm.a:		$(LIBSM_OBJ)
@@ -143,5 +138,4 @@
 build/%.o:		lib700/%.c $(HEADERS) | build
 				$(CROSS_GCC) $(FLAGS_COM) -c -o $@ $<
-				$(CROSS_OBJC) --redefine-syms misc/rewrite.txt $@
 
 build/%.o:		lib700/%.s $(HEADERS) | build
@@ -167,5 +161,4 @@
 build/%.o:		rom/%.c $(HEADERS) | build
 				$(CROSS_GCC) $(FLAGS_COM) -c -o $@ $<
-				$(CROSS_OBJC) --redefine-syms misc/rewrite.txt $@
 
 build/%.o:		rom/%.s $(HEADERS) | build
@@ -217,5 +210,4 @@
 build/%.o:		ram/%.c $(HEADERS) | build
 				$(CROSS_GCC) $(FLAGS_COM) -c -o $@ $<
-				$(CROSS_OBJC) --redefine-syms misc/rewrite.txt $@
 
 build/%.o:		ram/%.s $(HEADERS) | build
Index: sc/rewrite.txt
===================================================================
--- misc/rewrite.txt	(revision cc2c9e07c3b07294dbe6c8e5c0b297dca411fff2)
+++ 	(revision )
@@ -1,5 +1,0 @@
-___divsi3	__divsi3
-___modsi3	__modsi3
-___mulsi3	__mulsi3
-___udivsi3	__udivsi3
-___umodsi3	__umodsi3
Index: readme.txt
===================================================================
--- readme.txt	(revision cc2c9e07c3b07294dbe6c8e5c0b297dca411fff2)
+++ readme.txt	(revision 15854f14d5a7dc3acd9835b622e4c568cc5c4fa3)
@@ -232,14 +232,2 @@
     functions to preserve A2 and D2, so that GCC code generation can
     use all registers.
-
-  * The hand-written assembly language code expects C function names
-    to be prefixed with an underscore. That's why we pass the
-    -fleading-underscore option to GCC. However, this breaks linking
-    with libgcc, which doesn't use leading underscores.
-
-    Currently, we work around this issue by stripping the leading
-    underscore from references to libgcc functions using objcopy. See
-    misc/rewrite.txt for the function name mapping.
-
-    Ultimately, we should fix any references to C functions in the
-    hand-written assembly language code.