Browse Source

Fix up building with gcc 4.0.1 / gas 2.16.91

tags/v0.9.3
Michael Brown 19 years ago
parent
commit
5d28bae0f1
3 changed files with 4 additions and 5 deletions
  1. 1
    1
      src/arch/i386/Config
  2. 3
    3
      src/arch/i386/prefix/romprefix.S
  3. 0
    1
      src/include/etherboot.h

+ 1
- 1
src/arch/i386/Config View File

133
 endif
133
 endif
134
 GCC_MINORVERSION = $(word 2, $(GCC_VERSION))
134
 GCC_MINORVERSION = $(word 2, $(GCC_VERSION))
135
 ifneq ($(GCC_MINORVERSION),4)
135
 ifneq ($(GCC_MINORVERSION),4)
136
-CFLAGS+=	-mcpu=i386
136
+CFLAGS+=	-march=i386
137
 endif
137
 endif
138
 
138
 
139
 LDFLAGS+=	-N
139
 LDFLAGS+=	-N

+ 3
- 3
src/arch/i386/prefix/romprefix.S View File

110
 	.byte	0			/* Structure revision */
110
 	.byte	0			/* Structure revision */
111
 	.byte	0,1,2			/* PXE version 2.1.0 */
111
 	.byte	0,1,2			/* PXE version 2.1.0 */
112
 	.word	UNDILoader - _prefix	/* Offset to loader routine */
112
 	.word	UNDILoader - _prefix	/* Offset to loader routine */
113
-	.word	UNDIStackSize		/* Stack segment size */
114
-	.word	UNDIDataSize		/* Data segment size */
115
-	.word	UNDICodeSize		/* Code segment size */
113
+	.word	_real_mode_stack_size	/* Stack segment size */
114
+	.word	_real_mode_stack_size	/* Data segment size */
115
+	.word	_pxe_stack_size		/* Code segment size */
116
 	.ascii	"PCIR"
116
 	.ascii	"PCIR"
117
 
117
 
118
 	/* The code segment contains our pxe_stack_t plus the PXE and
118
 	/* The code segment contains our pxe_stack_t plus the PXE and

+ 0
- 1
src/include/etherboot.h View File

285
 extern jmp_buf restart_etherboot;
285
 extern jmp_buf restart_etherboot;
286
 extern int url_port;
286
 extern int url_port;
287
 extern struct arptable_t arptable[MAX_ARP];
287
 extern struct arptable_t arptable[MAX_ARP];
288
-extern struct igmptable_t igmptable[MAX_IGMP];
289
 #ifdef	IMAGE_MENU
288
 #ifdef	IMAGE_MENU
290
 extern int menutmo,menudefault;
289
 extern int menutmo,menudefault;
291
 extern unsigned char *defparams;
290
 extern unsigned char *defparams;

Loading…
Cancel
Save