diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2000-09-12 19:13:03 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2000-09-12 19:13:03 +0000 |
commit | 1b50fce4c0ed748c156af3ac629e50cb5e4d0ef4 (patch) | |
tree | edee61faabd18b4a5d84e8cdb679d7a8d1fe171f /gnu/usr.bin/binutils/ld/scripttempl/h8300h.sc | |
parent | 9f1193e30b5f04af9ea81c644eec79b7b535b890 (diff) |
Help stupid cvs fixing basic conflicts.
Diffstat (limited to 'gnu/usr.bin/binutils/ld/scripttempl/h8300h.sc')
-rw-r--r-- | gnu/usr.bin/binutils/ld/scripttempl/h8300h.sc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/usr.bin/binutils/ld/scripttempl/h8300h.sc b/gnu/usr.bin/binutils/ld/scripttempl/h8300h.sc index d433d682761..d1cfd860b65 100644 --- a/gnu/usr.bin/binutils/ld/scripttempl/h8300h.sc +++ b/gnu/usr.bin/binutils/ld/scripttempl/h8300h.sc @@ -17,7 +17,7 @@ MEMORY /* The stack starts at the top of main ram. */ topram : o = 0x3fffc, l = 0x4 /* This holds variables in the "tiny" sections. */ - tiny : o = 0xff8000, l = 7f00 + tiny : o = 0xff8000, l = 0x7f00 /* At the very top of the address space is the 8-bit area. */ eight : o = 0xffff00, l = 0x100 } |