diff options
| author | Robert Jarzmik <robert.jarzmik@free.fr> | 2014-01-06 09:25:10 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-01-06 10:58:00 +0100 |
| commit | 0cff096e583cb39f0a421d2740848f9d922362f2 (patch) | |
| tree | 5b7c70794506756d43987050171a348db25a217b /lib | |
| parent | 366f02aaac98ed589e662d4ebde05671bce83c89 (diff) | |
| download | barebox-0cff096e583cb39f0a421d2740848f9d922362f2.tar.gz barebox-0cff096e583cb39f0a421d2740848f9d922362f2.tar.xz | |
lib: libubigen math compile error fix
A compile error appears in libubigen on PXA architecture, because of a
division of an long long by a int :
/home/rj/mio_linux/barebox/lib/libubigen.c:105: undefined reference to
`__aeabi_ldivmod' arm-linux-gnueabi-ld: BFD (GNU Binutils for Debian)
2.20.1.20100303 assertion fail ../../bfd/elf32-arm.c:12497
Fix it by using div_u64 instead.
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libubigen.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libubigen.c b/lib/libubigen.c index 4026f1d4c3..900632905b 100644 --- a/lib/libubigen.c +++ b/lib/libubigen.c @@ -29,6 +29,7 @@ #include <errno.h> #include <crc.h> #include <fs.h> +#include <linux/math64.h> #include <mtd/utils.h> #include <mtd/ubi-media.h> @@ -102,7 +103,7 @@ int ubigen_add_volume(const struct ubigen_info *ui, } memset(vtbl_rec, 0, sizeof(struct ubi_vtbl_record)); - tmp = (vi->bytes + ui->leb_size - 1) / ui->leb_size; + tmp = div_u64(vi->bytes + ui->leb_size - 1, ui->leb_size); vtbl_rec->reserved_pebs = cpu_to_be32(tmp); vtbl_rec->alignment = cpu_to_be32(vi->alignment); vtbl_rec->vol_type = vi->type; |