2005-02-02 Yoshinori K. Okuji <okuji@enbug.org>

  * stage2/smp-imps.h (imps_any_new_apics): Removed.
  (imps_enabled): Likewise.
  (imps_lapic_addr): Likewise.
  (imps_num_cpus): Likewise.
  (imps_cpu_apic_map): Likewise.
  (imps_apic_cpu_map): Likewise.

  * stage2/Makefile.am (libgrub_a_CFLAGS): Remove
  -fwritable-strings. Not required for the grub shell actually.

  * grub/Makefile.am (AM_CFLAGS): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 07e4b00d99da084cb9b66abaf88f0c37836e3072..6ad1038b13460d5c469ff3c2998c7842723e5194 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-02-02  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * stage2/smp-imps.h (imps_any_new_apics): Removed.
+       (imps_enabled): Likewise.
+       (imps_lapic_addr): Likewise.
+       (imps_num_cpus): Likewise.
+       (imps_cpu_apic_map): Likewise.
+       (imps_apic_cpu_map): Likewise.
+
+       * stage2/Makefile.am (libgrub_a_CFLAGS): Remove
+       -fwritable-strings. Not required for the grub shell actually.
+
+       * grub/Makefile.am (AM_CFLAGS): Likewise.
+
 2005-02-01  Yoshinori K. Okuji  <okuji@enbug.org>
 
        * grub/asmstub.c (grub_stage2): Use auto instead of static for

diff --git a/grub/Makefile.am b/grub/Makefile.am
index 39a10488568d7881f75e8e4d267f6c8ea215246d..7eb2eaadf8367616407610777bdeb70449830b51 100644 (file)
--- a/grub/Makefile.am
+++ b/grub/Makefile.am
@@ -13,7 +13,7 @@ AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
        $(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \
        -I$(top_srcdir)/stage1 -I$(top_srcdir)/lib
 
-AM_CFLAGS = $(GRUB_CFLAGS) -fwritable-strings
+AM_CFLAGS = $(GRUB_CFLAGS)
 
 grub_SOURCES = main.c asmstub.c
 grub_LDADD = ../stage2/libgrub.a  ../lib/libcommon.a $(GRUB_LIBS)

diff --git a/grub/Makefile.in b/grub/Makefile.in
index 86a1651f46e2009fd5800a1d7ef7650ff034109c..67f1d45118b6347c85f22106032bed6c287c47c7 100644 (file)
--- a/grub/Makefile.in
+++ b/grub/Makefile.in
@@ -185,7 +185,7 @@ AM_CPPFLAGS = -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
        $(SERIAL_FLAGS) -I$(top_srcdir)/stage2 \
        -I$(top_srcdir)/stage1 -I$(top_srcdir)/lib
 
-AM_CFLAGS = $(GRUB_CFLAGS) -fwritable-strings
+AM_CFLAGS = $(GRUB_CFLAGS)
 grub_SOURCES = main.c asmstub.c
 grub_LDADD = ../stage2/libgrub.a  ../lib/libcommon.a $(GRUB_LIBS)
 all: all-am

diff --git a/stage2/Makefile.am b/stage2/Makefile.am
index 3a32ae7501ef2795936c1839eff552ba21aa4821..f8e6d42b26122748e4d0110f27daf928d9b68296 100644 (file)
--- a/stage2/Makefile.am
+++ b/stage2/Makefile.am
@@ -24,8 +24,7 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
        -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
        -DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
        -DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
-       -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 \
-       -fwritable-strings
+       -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
 
 # Stage 2 and Stage 1.5's.
 pkglibdir = $(libdir)/$(PACKAGE)/$(host_cpu)-$(host_vendor)

diff --git a/stage2/Makefile.in b/stage2/Makefile.in
index ca28c17d3c58a69de261dff7c2547207fbb04fe2..7bfe3709ad65afa35e63d1393862fe9e40b5ddcc 100644 (file)
--- a/stage2/Makefile.in
+++ b/stage2/Makefile.in
@@ -579,8 +579,7 @@ libgrub_a_CFLAGS = $(GRUB_CFLAGS) -I$(top_srcdir)/lib \
        -DGRUB_UTIL=1 -DFSYS_EXT2FS=1 -DFSYS_FAT=1 -DFSYS_FFS=1 \
        -DFSYS_ISO9660=1 -DFSYS_JFS=1 -DFSYS_MINIX=1 -DFSYS_REISERFS=1 \
        -DFSYS_UFS2=1 -DFSYS_VSTAFS=1 -DFSYS_XFS=1 \
-       -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1 \
-       -fwritable-strings
+       -DUSE_MD5_PASSWORDS=1 -DSUPPORT_SERIAL=1 -DSUPPORT_HERCULES=1
 
 @DISKLESS_SUPPORT_FALSE@pkglib_DATA = stage2 stage2_eltorito e2fs_stage1_5 fat_stage1_5 \
 @DISKLESS_SUPPORT_FALSE@       ffs_stage1_5 iso9660_stage1_5 jfs_stage1_5 minix_stage1_5 \

diff --git a/stage2/smp-imps.c b/stage2/smp-imps.c
index 2fb6caeb94eaa8f107a36ff98d9c0e05d930c243..a44d7867f05770977ebcfa574a747dfa05dfa72f 100644 (file)
--- a/stage2/smp-imps.c
+++ b/stage2/smp-imps.c
@@ -1,6 +1,6 @@
 /*
  *  GRUB  --  GRand Unified Bootloader
- *  Copyright (C) 1999  Free Software Foundation, Inc.
+ *  Copyright (C) 1999,2005  Free Software Foundation, Inc.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -249,13 +249,31 @@ defconfig =
  *  Exported globals here.
  */
 
+/*
+ *  "imps_any_new_apics" is non-zero if any of the APICS (local or I/O)
+ *  are *not* an 82489DX.  This is useful to determine if more than 15
+ *  CPUs can be supported (true if zero).
+ */
 static int imps_any_new_apics = 0;
 #if 0
 volatile int imps_release_cpus = 0;
 #endif
+/*
+ *  "imps_enabled" is non-zero if the probe sequence found IMPS
+ *  information and was successful.
+ */
 static int imps_enabled = 0;
+/*
+ *  This represents the number of CPUs found.
+ */
 static int imps_num_cpus = 1;
+/*
+ *  This contains the local APIC hardware address.
+ */
 static unsigned imps_lapic_addr = ((unsigned) (&lapic_dummy)) - LAPIC_ID;
+/*
+ *  These map from virtual cpu numbers to APIC id's and back.
+ */
 static unsigned char imps_cpu_apic_map[IMPS_MAX_CPUS];
 static unsigned char imps_apic_cpu_map[IMPS_MAX_CPUS];
 

diff --git a/stage2/smp-imps.h b/stage2/smp-imps.h
index dc239942e0cf4ad7dcfb21451cf82ef148c0e065..c0fdce346630a3d0af8ff6edae2668534b51b133 100644 (file)
--- a/stage2/smp-imps.h
+++ b/stage2/smp-imps.h
@@ -182,36 +182,6 @@ struct imps_interrupt
  *  Exported globals here.
  */
 
-/*
- *  "imps_any_new_apics" is non-zero if any of the APICS (local or I/O)
- *  are *not* an 82489DX.  This is useful to determine if more than 15
- *  CPUs can be supported (true if zero).
- */
-extern int imps_any_new_apics;
-
-/*
- *  "imps_enabled" is non-zero if the probe sequence found IMPS
- *  information and was successful.
- */
-extern int imps_enabled;
-
-/*
- *  This contains the local APIC hardware address.
- */
-extern unsigned imps_lapic_addr;
-
-/*
- *  This represents the number of CPUs found.
- */
-extern int imps_num_cpus;
-
-/*
- *  These map from virtual cpu numbers to APIC id's and back.
- */
-extern unsigned char imps_cpu_apic_map[IMPS_MAX_CPUS];
-extern unsigned char imps_apic_cpu_map[IMPS_MAX_CPUS];
-
-
 /*
  *  This is the primary function for probing for Intel MPS 1.1/1.4
  *  compatible hardware and BIOS information.  While probing the CPUs