aboutsummaryrefslogtreecommitdiffstats
path: root/package/grub
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-07-20 12:28:54 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-07-20 12:28:54 +0000
commit015d66cffb6616d4c772ba5347ccf62547a3cc2c (patch)
treedd72e5756e09726c35e2eb2db0e048030be74b18 /package/grub
parentb1f318de533bd8bb8eba8a1d25752b2a4de83d07 (diff)
downloadupstream-015d66cffb6616d4c772ba5347ccf62547a3cc2c.tar.gz
upstream-015d66cffb6616d4c772ba5347ccf62547a3cc2c.tar.bz2
upstream-015d66cffb6616d4c772ba5347ccf62547a3cc2c.zip
grub: replace an unnecessary piece of inline assembly that breaks the build on recent mac os x
SVN-Revision: 32784
Diffstat (limited to 'package/grub')
-rw-r--r--package/grub/patches/210-remove_inline_asm.patch14
1 files changed, 14 insertions, 0 deletions
diff --git a/package/grub/patches/210-remove_inline_asm.patch b/package/grub/patches/210-remove_inline_asm.patch
new file mode 100644
index 0000000000..8eb9fc2c97
--- /dev/null
+++ b/package/grub/patches/210-remove_inline_asm.patch
@@ -0,0 +1,14 @@
+--- a/stage2/fsys_iso9660.c
++++ b/stage2/fsys_iso9660.c
+@@ -83,10 +83,7 @@ iso9660_devread (int sector, int byte_of
+
+ sector += (byte_offset >> sector_size_lg2);
+ byte_offset &= (buf_geom.sector_size - 1);
+- asm volatile ("shl%L0 %1,%0"
+- : "=r"(sector)
+- : "Ic"((int8_t)(ISO_SECTOR_BITS - sector_size_lg2)),
+- "0"(sector));
++ sector <<= ISO_SECTOR_BITS - sector_size_lg2;
+
+ #if !defined(STAGE1_5)
+ if (disk_read_hook && debug)