Commit cbd8ec84 authored by Yoshinori Sato's avatar Yoshinori Sato Committed by Linus Torvalds

[PATCH] h8300: build error fixes

build error and warning fix
blkdev location cleanup
typo fix
parent 44d80c37
...@@ -5,4 +5,4 @@ ...@@ -5,4 +5,4 @@
.S.o: .S.o:
$(CC) $(AFLAGS) -D__ASSEMBLY__ -c $< -o $@ $(CC) $(AFLAGS) -D__ASSEMBLY__ -c $< -o $@
lib-y = ashrdi3.o checksum.o memcpy.o memset.o abs.o lib-y = ashrdi3.o checksum.o memcpy.o memset.o abs.o romfs.o
;;; memcpy.S ;;; abs.S
#include <asm/linkage.h> #include <asm/linkage.h>
......
...@@ -17,9 +17,6 @@ ...@@ -17,9 +17,6 @@
;; c = er1(r1l) ;; c = er1(r1l)
;; count = er2 ;; count = er2
SYMBOL_NAME_LABEL(memset) SYMBOL_NAME_LABEL(memset)
mov.l er2,er2
beq 7f
mov.l er0,@-sp
btst #0,r0l btst #0,r0l
beq 2f beq 2f
...@@ -36,8 +33,13 @@ SYMBOL_NAME_LABEL(memset) ...@@ -36,8 +33,13 @@ SYMBOL_NAME_LABEL(memset)
cmp.l #4,er2 cmp.l #4,er2
blo 4f blo 4f
;; count>=4 -> count/4 ;; count>=4 -> count/4
#if defined(__H8300H__)
shlr.l er2 shlr.l er2
shlr.l er2 shlr.l er2
#endif
#if defined(__H8300S__)
shlr.l #2,er2
#endif
;; byte -> long ;; byte -> long
mov.b r1l,r1h mov.b r1l,r1h
mov.w r1,e1 mov.w r1,e1
...@@ -56,6 +58,4 @@ SYMBOL_NAME_LABEL(memset) ...@@ -56,6 +58,4 @@ SYMBOL_NAME_LABEL(memset)
dec.b r3l dec.b r3l
bne 5b bne 5b
6: 6:
mov.l @sp+,er0 rts
7:
rts
\ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment