]>
Commit | Line | Data |
---|---|---|
61d105fa ER |
1 | disable -m32 on ppc (gcc 3.3.6 does not like it) |
2 | ||
3 | revert 'returns_twice' attribute for grub_setjmp. | |
4 | http://repo.or.cz/w/grub2.git/commitdiff/2c7825edcb18e9d0680a953f1475ef2caf6b0f0f | |
5 | ||
6 | --- grub-1.98/configure.ac~ 2010-03-06 20:51:37.000000000 +0000 | |
7 | +++ grub-1.98/configure.ac 2010-07-19 13:59:46.468351205 +0000 | |
8 | @@ -114,7 +114,7 @@ | |
9 | esac | |
10 | ||
11 | case "$target_cpu" in | |
12 | - i386 | powerpc) target_m32=1 ;; | |
13 | + i386) target_m32=1 ;; | |
14 | x86_64 | sparc64) target_m64=1 ;; | |
15 | esac | |
16 | ||
17 | --- grub-1.98/include/grub/powerpc/setjmp.h~ 2010-03-06 20:51:37.000000000 +0000 | |
18 | +++ grub-1.98/include/grub/powerpc/setjmp.h 2010-07-19 16:37:03.616853413 +0000 | |
19 | @@ -21,7 +21,7 @@ | |
20 | ||
21 | typedef unsigned long grub_jmp_buf[20]; | |
22 | ||
23 | -int grub_setjmp (grub_jmp_buf env) __attribute__ ((returns_twice)); | |
24 | +int grub_setjmp (grub_jmp_buf env); | |
25 | void grub_longjmp (grub_jmp_buf env, int val) __attribute__ ((noreturn)); | |
26 | ||
27 | #endif /* ! GRUB_SETJMP_CPU_HEADER */ |