[2566] 2009-09-03 Colin Watson <address@hidden>

[Colin Watson]

Revision: 2566
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2566
Author:   cjwatson
Date:     2009-09-03 23:00:25 +0000 (Thu, 03 Sep 2009)
Log Message:
-----------
2009-09-03  Colin Watson  <address@hidden>

        * configure.ac: By default, GCC 4.4 generates .eh_frame sections
        containing unwind information in some cases where it previously did
        not. Use -fno-dwarf2-cfi-asm if available to restore the old
        behaviour. See http://patchwork.kernel.org/patch/8555/ for related
        discussion.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/configure.ac

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-09-03 17:07:08 UTC (rev 2565)
+++ trunk/grub2/ChangeLog       2009-09-03 23:00:25 UTC (rev 2566)
@@ -1,3 +1,11 @@
+2009-09-03  Colin Watson  <address@hidden>
+
+       * configure.ac: By default, GCC 4.4 generates .eh_frame sections
+       containing unwind information in some cases where it previously did
+       not. Use -fno-dwarf2-cfi-asm if available to restore the old
+       behaviour. See http://patchwork.kernel.org/patch/8555/ for related
+       discussion.
+
 2009-09-02  Yves BLUSSEAU  <address@hidden>
 
        Embedding loadenv module into grub-emu

Modified: trunk/grub2/configure.ac
===================================================================
--- trunk/grub2/configure.ac    2009-09-03 17:07:08 UTC (rev 2565)
+++ trunk/grub2/configure.ac    2009-09-03 23:00:25 UTC (rev 2566)
@@ -246,6 +246,23 @@
       TARGET_CFLAGS="$TARGET_CFLAGS -malign-jumps=1 -malign-loops=1 
-malign-functions=1"
     fi
   fi
+
+  # By default, GCC 4.4 generates .eh_frame sections containing unwind
+  # information in some cases where it previously did not. GRUB doesn't need
+  # these and they just use up vital space. Restore the old compiler
+  # behaviour.
+  AC_CACHE_CHECK([whether -fno-dwarf2-cfi-asm works], 
[grub_cv_cc_fno_dwarf2_cfi_asm], [
+    SAVE_CFLAGS="$CFLAGS"
+    CFLAGS="$CFLAGS -fno-dwarf2-cfi-asm"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],
+                     [grub_cv_cc_fno_dwarf2_cfi_asm=yes],
+                     [grub_cv_cc_fno_dwarf2_cfi_asm=no])
+    CFLAGS="$SAVE_CFLAGS"
+  ])
+
+  if test "x$grub_cv_cc_fno_dwarf2_cfi_asm" = xyes; then
+    TARGET_CFLAGS="$TARGET_CFLAGS -fno-dwarf2-cfi-asm"
+  fi
 fi
 
 grub_apple_target_cc