Contents of /trunk/grub/patches/grub-0.97-amd64.patch
Parent Directory | Revision Log
Revision 144 -
(show annotations)
(download)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 4085 byte(s)
Tue May 8 20:06:05 2007 UTC (17 years, 4 months ago) by niro
File size: 4085 byte(s)
-import
1 | Submitted By: Joe Ciccone <joeciccone@crazyeyesoft.com> |
2 | Date: 11-20-2005 |
3 | Initial Package Version: 0.97 |
4 | Upstream Status: None, They dont think a problem exists. So I dont see a |
5 | reason to submit this upstream. |
6 | Origin: Joe Ciccone's patience |
7 | Description: This patch removes -m32 from the CFLAGS defined in configure.ac |
8 | and moves it into the makefiles where it is needed thus allowing the |
9 | utilities to link properly to the default libs, 64bit or 32bit, and |
10 | still allow the bootloader to build 32bit. |
11 | |
12 | diff -Naur grub-0.97.orig/configure.ac grub-0.97/configure.ac |
13 | --- grub-0.97.orig/configure.ac 2005-05-08 02:36:03.000000000 +0000 |
14 | +++ grub-0.97/configure.ac 2005-11-20 22:08:01.000000000 +0000 |
15 | @@ -46,9 +46,9 @@ |
16 | default_CFLAGS=yes |
17 | fi |
18 | |
19 | -if test "x$host_cpu" = xx86_64; then |
20 | - CFLAGS="-m32 $CFLAGS" |
21 | -fi |
22 | +#if test "x$host_cpu" = xx86_64; then |
23 | +# CFLAGS="-m32 $CFLAGS" |
24 | +#fi |
25 | |
26 | # |
27 | # Programs |
28 | @@ -159,10 +159,10 @@ |
29 | |
30 | # Defined in acinclude.m4. |
31 | grub_ASM_USCORE |
32 | -grub_PROG_OBJCOPY_ABSOLUTE |
33 | -if test "x$grub_cv_prog_objcopy_absolute" != xyes; then |
34 | - AC_MSG_ERROR([GRUB requires a working absolute objcopy; upgrade your binutils]) |
35 | -fi |
36 | +#grub_PROG_OBJCOPY_ABSOLUTE |
37 | +#if test "x$grub_cv_prog_objcopy_absolute" != xyes; then |
38 | +# AC_MSG_ERROR([GRUB requires a working absolute objcopy; upgrade your binutils]) |
39 | +#fi |
40 | |
41 | grub_ASM_PREFIX_REQUIREMENT |
42 | |
43 | diff -Naur grub-0.97.orig/gnu/stubs.h grub-0.97/gnu/stubs.h |
44 | --- grub-0.97.orig/gnu/stubs.h 1970-01-01 00:00:00.000000000 +0000 |
45 | +++ grub-0.97/gnu/stubs.h 2005-11-20 22:50:50.000000000 +0000 |
46 | @@ -0,0 +1,23 @@ |
47 | +/* This file is automatically generated. |
48 | + It defines a symbol `__stub_FUNCTION' for each function |
49 | + in the C library which is a stub, meaning it will fail |
50 | + every time called, usually setting errno to ENOSYS. */ |
51 | + |
52 | +#ifdef _LIBC |
53 | + #error Applications may not define the macro _LIBC |
54 | +#endif |
55 | + |
56 | +#define __stub___kernel_cosl |
57 | +#define __stub___kernel_sinl |
58 | +#define __stub___kernel_tanl |
59 | +#define __stub_chflags |
60 | +#define __stub_fattach |
61 | +#define __stub_fchflags |
62 | +#define __stub_fdetach |
63 | +#define __stub_gtty |
64 | +#define __stub_lchmod |
65 | +#define __stub_lutimes |
66 | +#define __stub_revoke |
67 | +#define __stub_setlogin |
68 | +#define __stub_sstk |
69 | +#define __stub_stty |
70 | diff -Naur grub-0.97.orig/grub/Makefile.am grub-0.97/grub/Makefile.am |
71 | --- grub-0.97.orig/grub/Makefile.am 2005-02-02 20:38:19.000000000 +0000 |
72 | +++ grub-0.97/grub/Makefile.am 2005-11-21 00:07:07.000000000 +0000 |
73 | @@ -6,7 +6,7 @@ |
74 | SERIAL_FLAGS = -DSUPPORT_SERIAL=1 |
75 | endif |
76 | |
77 | -AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \ |
78 | +AM_CPPFLAGS = -m32 -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \ |
79 | -DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \ |
80 | -DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \ |
81 | -DUSE_MD5_PASSWORDS=1 -DSUPPORT_HERCULES=1 \ |
82 | diff -Naur grub-0.97.orig/netboot/Makefile.am grub-0.97/netboot/Makefile.am |
83 | --- grub-0.97.orig/netboot/Makefile.am 2003-07-09 11:45:37.000000000 +0000 |
84 | +++ grub-0.97/netboot/Makefile.am 2005-11-20 23:17:27.000000000 +0000 |
85 | @@ -1,3 +1,6 @@ |
86 | +AM_CFLAGS = -m32 |
87 | +AM_CPPFLAGS = -m32 |
88 | + |
89 | # For <shared.h> and <stage1.h>. |
90 | INCLUDES = -I$(top_srcdir)/stage2 -I$(top_srcdir)/stage1 |
91 | |
92 | diff -Naur grub-0.97.orig/stage1/Makefile.am grub-0.97/stage1/Makefile.am |
93 | --- grub-0.97.orig/stage1/Makefile.am 2004-07-16 11:44:56.000000000 +0000 |
94 | +++ grub-0.97/stage1/Makefile.am 2005-11-20 23:15:42.000000000 +0000 |
95 | @@ -4,7 +4,7 @@ |
96 | CLEANFILES = $(nodist_pkglib_DATA) |
97 | |
98 | # We can't use builtins or standard includes. |
99 | -AM_CCASFLAGS = $(STAGE1_CFLAGS) -fno-builtin -nostdinc |
100 | +AM_CCASFLAGS = -m32 $(STAGE1_CFLAGS) -fno-builtin -nostdinc |
101 | LDFLAGS = -nostdlib -Wl,-N,-Ttext,7C00 |
102 | |
103 | noinst_PROGRAMS = stage1.exec |
104 | diff -Naur grub-0.97.orig/stage2/Makefile.am grub-0.97/stage2/Makefile.am |
105 | --- grub-0.97.orig/stage2/Makefile.am 2005-02-02 20:37:35.000000000 +0000 |
106 | +++ grub-0.97/stage2/Makefile.am 2005-11-20 23:17:47.000000000 +0000 |
107 | @@ -10,6 +10,9 @@ |
108 | terminfo.h tparm.h nbi.h ufs2.h vstafs.h xfs.h |
109 | EXTRA_DIST = setjmp.S apm.S $(noinst_SCRIPTS) |
110 | |
111 | +AM_CFLAGS = -m32 |
112 | +AM_CPPFLAGS = -m32 |
113 | + |
114 | # For <stage1.h>. |
115 | INCLUDES = -I$(top_srcdir)/stage1 |
116 |