From 996dcea5514be11f5b2cc7f572ff1207e5321697 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Wed, 25 Jan 2012 03:51:33 +0000
Subject: [PATCH] [m68k] Apply Thorsten Glaser's compiler config changes

svn path=/dists/trunk/linux-2.6/; revision=18629
---
 debian/changelog           | 5 +++++
 debian/config/m68k/defines | 3 ++-
 debian/rules.real          | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e58b4003f..0f6dbb67e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,11 @@ linux-2.6 (3.2.1-3) UNRELEASED; urgency=low
     modules.builtin.bin is left behind
   * [alpha] Build with gcc-4.5 (Closes: #657112)
 
+  [ Thorsten Glaser ]
+  * [m68k] Use gcc-4.6 like (almost) all other architectures
+  * Pass the cflags define as CFLAGS_KERNEL and CFLAGS_MODULE to kbuild
+  * [m68k] Use cflags -ffreestanding (Closes: #648996)
+
  -- Ben Hutchings <ben@decadent.org.uk>  Tue, 24 Jan 2012 06:19:55 +0000
 
 linux-2.6 (3.2.1-2) unstable; urgency=high
diff --git a/debian/config/m68k/defines b/debian/config/m68k/defines
index c24ceb590..36f581ca6 100644
--- a/debian/config/m68k/defines
+++ b/debian/config/m68k/defines
@@ -1,5 +1,6 @@
 [base]
-compiler: gcc-4.4
+compiler: gcc-4.6
+cflags: -ffreestanding
 flavours:
  amiga
  atari
diff --git a/debian/rules.real b/debian/rules.real
index 1ece35e09..d6232aa57 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -114,7 +114,8 @@ else
 	echo 'endif' >> '$(DIR)/.kernelvariables'
 endif
 ifdef CFLAGS_KERNEL
-	echo 'CFLAGS += $(CFLAGS_KERNEL)'  >> '$(DIR)/.kernelvariables'
+	echo 'CFLAGS_KERNEL += $(CFLAGS_KERNEL)' >> '$(DIR)/.kernelvariables'
+	echo 'CFLAGS_MODULE += $(CFLAGS_KERNEL)' >> '$(DIR)/.kernelvariables'
 endif
 	+$(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' V=1 listnewconfig
 	+yes "" | $(MAKE_CLEAN) -C '$(SOURCE_DIR)' O='$(CURDIR)/$(DIR)' oldconfig >/dev/null