[GIT] kbuild fixes

[GIT] kbuild fixes

[Sam Ravnborg]

Hi Linus.

- various .gitignore updates
- disabling of -Wformat-security
  We looked at it and 'fixing' the warnings was not pleasant
- fixes/improvements for the newly introduced macros in asm-generic/vmlinux.lds.h

Nothing earth-shaking..
And it has been in -next for a few days with no issues.

I am heading for a two week vacation in Sweden and will
be offline in that period.
Enjoy the kernel hacking while I enjoy my vacation :-) 

	Sam


The following changes since commit 4075ea8c54a7506844a69f674990241e7766357b:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://git.kernel.org/.../bp/bp

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git master

Amerigo Wang (2):
      gitignore: ignore gcov output files
      kbuild: finally remove the obsolete variable $TOPDIR

Floris Kraak (1):
      Kbuild: Disable the -Wformat-security gcc flag

Jaswinder Singh Rajput (1):
      gitignore: ignore scripts/ihex2fw

Paul Mundt (1):
      asm-generic/vmlinux.lds.h: Fix up RW_DATA_SECTION definition.

Tim Abbott (3):
      Add new macros for page-aligned data and bss sections.
      asm-generic/vmlinux.lds.h: shuffle INIT_TASK* macro names in vmlinux.lds.h
      Add new __init_task_data macro to be used in arch init_task.c files.

maximilian attems (1):
      kbuild: deb-pkg ship changelog

 .gitignore                        |    1 +
 Makefile                          |    7 +++----
 arch/mn10300/kernel/vmlinux.lds.S |    2 +-
 drivers/scsi/cxgb3i/Kbuild        |    2 +-
 include/asm-generic/vmlinux.lds.h |   12 ++++++------
 include/linux/init_task.h         |    3 +++
 include/linux/linkage.h           |    9 +++++++++
 scripts/.gitignore                |    1 +
 scripts/package/builddeb          |    2 ++
 9 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index cecb3b0..b93fb7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@
 *.gz
 *.lzma
 *.patch
+*.gcno
 
 #
 # Top-level generic files
diff --git a/Makefile b/Makefile
index d1216fe..b4c7ef5 100644
--- a/Makefile
+++ b/Makefile
@@ -140,15 +140,13 @@ _all: modules
 endif
 
 srctree		:= $(if $(KBUILD_SRC),$(KBUILD_SRC),$(CURDIR))
-TOPDIR		:= $(srctree)
-# FIXME - TOPDIR is obsolete, use srctree/objtree
 objtree		:= $(CURDIR)
 src		:= $(srctree)
 obj		:= $(objtree)
 
 VPATH		:= $(srctree)$(if $(KBUILD_EXTMOD),:$(KBUILD_EXTMOD))
 
-export srctree objtree VPATH TOPDIR
+export srctree objtree VPATH
 
 
 # SUBARCH tells the usermode build what the underlying arch is.  That is set
@@ -344,7 +342,8 @@ KBUILD_CPPFLAGS := -D__KERNEL__
 
 KBUILD_CFLAGS   := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \
 		   -fno-strict-aliasing -fno-common \
-		   -Werror-implicit-function-declaration
+		   -Werror-implicit-function-declaration \
+		   -Wno-format-security
 KBUILD_AFLAGS   := -D__ASSEMBLY__
 
 # Read KERNELRELEASE from include/config/kernel.release (if it exists)
diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S
index bcebcef..c96ba3d 100644
--- a/arch/mn10300/kernel/vmlinux.lds.S
+++ b/arch/mn10300/kernel/vmlinux.lds.S
@@ -61,7 +61,7 @@ SECTIONS
 	_edata = .;		/* End of data section */
   }
 
-  .data.init_task : { INIT_TASK(THREAD_SIZE); }
+  .data.init_task : { INIT_TASK_DATA(THREAD_SIZE); }
 
   /* might get freed after init */
   . = ALIGN(PAGE_SIZE);
diff --git a/drivers/scsi/cxgb3i/Kbuild b/drivers/scsi/cxgb3i/Kbuild
index 25a2032..70d060b 100644
--- a/drivers/scsi/cxgb3i/Kbuild
+++ b/drivers/scsi/cxgb3i/Kbuild
@@ -1,4 +1,4 @@
-EXTRA_CFLAGS += -I$(TOPDIR)/drivers/net/cxgb3
+EXTRA_CFLAGS += -I$(srctree)/drivers/net/cxgb3
 
 cxgb3i-y := cxgb3i_init.o cxgb3i_iscsi.o cxgb3i_pdu.o cxgb3i_offload.o cxgb3i_ddp.o
 obj-$(CONFIG_SCSI_CXGB3_ISCSI) += cxgb3i.o
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 92b73b6..720af4c 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -191,7 +191,7 @@
 	. = ALIGN(align);						\
 	*(.data.cacheline_aligned)
 
-#define INIT_TASK(align)						\
+#define INIT_TASK_DATA(align)						\
 	. = ALIGN(align);						\
 	*(.data.init_task)
 
@@ -434,10 +434,10 @@
 /*
  * Init task
  */
-#define INIT_TASK_DATA(align)						\
+#define INIT_TASK_DATA_SECTION(align)					\
 	. = ALIGN(align);						\
 	.data.init_task : {						\
-		INIT_TASK						\
+		INIT_TASK_DATA(align)					\
 	}
 
 #ifdef CONFIG_CONSTRUCTORS
@@ -704,15 +704,15 @@
  * matches the requirment of PAGE_ALIGNED_DATA.
  *
  * use 0 as page_align if page_aligned data is not used */
-#define RW_DATA_SECTION(cacheline, nosave, pagealigned, inittask)	\
+#define RW_DATA_SECTION(cacheline, pagealigned, inittask)		\
 	. = ALIGN(PAGE_SIZE);						\
 	.data : AT(ADDR(.data) - LOAD_OFFSET) {				\
-		INIT_TASK(inittask)					\
+		INIT_TASK_DATA(inittask)				\
 		CACHELINE_ALIGNED_DATA(cacheline)			\
 		READ_MOSTLY_DATA(cacheline)				\
 		DATA_DATA						\
 		CONSTRUCTORS						\
-		NOSAVE_DATA(nosave)					\
+		NOSAVE_DATA						\
 		PAGE_ALIGNED_DATA(pagealigned)				\
 	}
 
diff --git a/include/linux/init_task.h b/include/linux/init_task.h
index 5368fbd..7fc01b1 100644
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
@@ -183,5 +183,8 @@ extern struct cred init_cred;
 	LIST_HEAD_INIT(cpu_timers[2]),					\
 }
 
+/* Attach to the init_task data structure for proper alignment */
+#define __init_task_data __attribute__((__section__(".data.init_task")))
+
 
 #endif
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index fee9e59..691f591 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -22,6 +22,15 @@
 #define __page_aligned_bss	__section(.bss.page_aligned) __aligned(PAGE_SIZE)
 
 /*
+ * For assembly routines.
+ *
+ * Note when using these that you must specify the appropriate
+ * alignment directives yourself
+ */
+#define __PAGE_ALIGNED_DATA	.section ".data.page_aligned", "aw"
+#define __PAGE_ALIGNED_BSS	.section ".bss.page_aligned", "aw"
+
+/*
  * This is used by architectures to keep arguments on the stack
  * untouched by the compiler by keeping them live until the end.
  * The argument stack may be owned by the assembly-language
diff --git a/scripts/.gitignore b/scripts/.gitignore
index b939fbd..52cab46 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -7,3 +7,4 @@ pnmtologo
 bin2c
 unifdef
 binoffset
+ihex2fw
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 01c2d13..b19f1f4 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -16,6 +16,8 @@ create_package() {
 	local pname="$1" pdir="$2"
 
 	cp debian/copyright "$pdir/usr/share/doc/$pname/"
+	cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian"
+	gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian"
 
 	# Fix ownership and permissions
 	chown -R root:root "$pdir"

Re: [GIT] kbuild fixes

[Floris Kraak]

On Fri, Jul 3, 2009 at 11:43 PM, Sam Ravnborg<sam@ravnborg.org> wrote:
>
> - disabling of -Wformat-security
>  We looked at it and 'fixing' the warnings was not pleasant

The alternative is roughly 136 'trivial' patches to shut them all up*
and one to turn this flag on unconditionally to prevent hackers from
adding more of them after that ;-)

The alternative to *that* is improving on this silly flag:
- Either finding some way to teach GCC how to not emit warnings about
usage that is entirely sane.
- Or finding some way to teach some other build tool to catch unsafe
usage without polluting the build with false positives.

Take your pick.

*) While I can't give you 100% certainty about every warning I know
for a fact the vast majority of the warnings at least consists of
false positives so there'd be no other benefit from them except a
quieter kernel build on certain distro's ;-)

Regards,
Floris
---
'Or lawyers may say, “But if I decline, someone else will do it. So
what is gained?” My reply: “Let someone else do it. But not you. Honor
is personal. Worry about yourself.  You don’t get a pass from moral
responsibility because you acted for a client.”

That’s the first lesson I would offer, aimed at lawyers. A second
lesson, aimed at all, is this: Keep ready your capacity for outrage.
This is very important. Next to the vote, outrage is the one response
each of us can contribute. Outrage is how honor must confront
dishonor. If we lose the capacity for outrage, we are in serious
trouble. '
   --- Stephen Gillers

[GIT] kbuild fixes

[Michal Marek]

Hi Linus,

there are two fixes I intended to send after v3.6-rc7, but failed to do
so. So please pull them for v3.7-rc1 and they will be picked up by
stable. The first one fixes gcc -x <language> syntax in various
build-time tests, which icecream and possible other gcc wrappers did not
understand (and yes, icecream is going to be fixed as well). The second
one fixes make tar-pkg so that unpacking the tarball does not replace
the /lib -> /usr/lib symlink on recent Fedora releases.

Thanks,
Michal

The following changes since commit 979570e02981d4a8fc20b3cc8fd651856c98ee9d:

  Linux 3.6-rc7 (2012-09-23 18:10:57 -0700)

are available in the git repository at:
  git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git rc-fixes

Jean Delvare (1):
      kbuild: Fix gcc -x syntax

Michal Marek (1):
      kbuild: Do not package /boot and /lib in make tar-pkg

 arch/mips/Makefile                         |    2 +-
 arch/mips/kernel/Makefile                  |    2 +-
 arch/x86/Makefile                          |    4 ++--
 scripts/Kbuild.include                     |   12 ++++++------
 scripts/Makefile.fwinst                    |    4 ++--
 scripts/gcc-version.sh                     |    6 +++---
 scripts/gcc-x86_32-has-stack-protector.sh  |    2 +-
 scripts/gcc-x86_64-has-stack-protector.sh  |    2 +-
 scripts/kconfig/check.sh                   |    2 +-
 scripts/kconfig/lxdialog/check-lxdialog.sh |    2 +-
 scripts/package/buildtar                   |    2 +-
 tools/perf/Makefile                        |    2 +-
 tools/power/cpupower/Makefile              |    2 +-
 13 files changed, 22 insertions(+), 22 deletions(-)

[GIT] kbuild fixes

[Michal Marek]

Hi Linus,

please pull these two commits that fix the way modules.builtin is
generated.

Thanks,
Michal

The following changes since commit 63a07cb64ccc3ceae619d3298545d602ab5ecd38:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (2010-06-09 12:44:19 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git rc-fixes

Michal Marek (2):
      kbuild: Generate modules.builtin in make modules
      kbuild: Create output directory in Makefile.modbuiltin

 Makefile                    |    4 ++--
 scripts/Makefile.modbuiltin |    5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

[GIT] kbuild fixes

[Sam Ravnborg]

Hi Linus.

Four kbuild fixlets:

1) Fix to newly introduced vmlinux macros.
   There is one in-tree user which is fixed up.

2) Two fixlets to make menuconfig more cygwin friendly

3) install scrip fix for deb-pkg

This has been in -next at least for one iteration with no comments.
Combined diff below.

Please pull - thanks!

	Sam

The following changes since commit 4b0a84043e0c14088958fddb62f416d050368011:
  Linus Torvalds (1):
        Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/.../peterz/linux-2.6-sched

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git master

Arnaud Lacombe (2):
      kconfig: variable argument lists needs `stdarg.h'
      kconfig: initialize the screen before using curses(3) functions

Tim Abbott (1):
      vmlinux.lds.h: restructure BSS linker script macros

maximilian attems (1):
      kbuild, deb-pkg: fix install scripts for posix sh

 arch/mn10300/kernel/vmlinux.lds.S |    2 +-
 include/asm-generic/vmlinux.lds.h |   19 +++++++++----------
 scripts/kconfig/lxdialog/util.c   |    2 ++
 scripts/kconfig/mconf.c           |    2 ++
 scripts/package/builddeb          |    2 +-
 5 files changed, 15 insertions(+), 12 deletions(-)


diff --git a/arch/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S
index c96ba3d..f4aa079 100644
--- a/arch/mn10300/kernel/vmlinux.lds.S
+++ b/arch/mn10300/kernel/vmlinux.lds.S
@@ -107,7 +107,7 @@ SECTIONS
   __init_end = .;
   /* freed after init ends here */
 
-  BSS(4)
+  BSS_SECTION(0, PAGE_SIZE, 4)
 
   _end = . ;
 
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index a553f10..6ad76bf 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -30,9 +30,7 @@
  *	EXCEPTION_TABLE(...)
  *	NOTES
  *
- *	__bss_start = .;
- *	BSS_SECTION(0, 0)
- *	__bss_stop = .;
+ *	BSS_SECTION(0, 0, 0)
  *	_end = .;
  *
  *	/DISCARD/ : {
@@ -489,7 +487,8 @@
  * bss (Block Started by Symbol) - uninitialized data
  * zeroed during startup
  */
-#define SBSS								\
+#define SBSS(sbss_align)						\
+	. = ALIGN(sbss_align);						\
 	.sbss : AT(ADDR(.sbss) - LOAD_OFFSET) {				\
 		*(.sbss)						\
 		*(.scommon)						\
@@ -498,12 +497,10 @@
 #define BSS(bss_align)							\
 	. = ALIGN(bss_align);						\
 	.bss : AT(ADDR(.bss) - LOAD_OFFSET) {				\
-		VMLINUX_SYMBOL(__bss_start) = .;			\
 		*(.bss.page_aligned)					\
 		*(.dynbss)						\
 		*(.bss)							\
 		*(COMMON)						\
-		VMLINUX_SYMBOL(__bss_stop) = .;				\
 	}
 
 /*
@@ -735,8 +732,10 @@
 		INIT_RAM_FS						\
 	}
 
-#define BSS_SECTION(sbss_align, bss_align)				\
-	SBSS								\
+#define BSS_SECTION(sbss_align, bss_align, stop_align)			\
+	. = ALIGN(sbss_align);						\
+	VMLINUX_SYMBOL(__bss_start) = .;				\
+	SBSS(sbss_align)						\
 	BSS(bss_align)							\
-	. = ALIGN(4);
-
+	. = ALIGN(stop_align);						\
+	VMLINUX_SYMBOL(__bss_stop) = .;
diff --git a/scripts/kconfig/lxdialog/util.c b/scripts/kconfig/lxdialog/util.c
index 86d95cc..f2375ad 100644
--- a/scripts/kconfig/lxdialog/util.c
+++ b/scripts/kconfig/lxdialog/util.c
@@ -19,6 +19,8 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <stdarg.h>
+
 #include "dialog.h"
 
 struct dialog_info dlg;
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 3bcacb4..25b60bc 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -888,6 +888,8 @@ int main(int ac, char **av)
 			single_menu_mode = 1;
 	}
 
+	initscr();
+
 	getyx(stdscr, saved_y, saved_x);
 	if (init_dialog(NULL)) {
 		fprintf(stderr, N_("Your display is too small to run Menuconfig!\n"));
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index b19f1f4..8b357b0 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -89,7 +89,7 @@ for script in postinst postrm preinst prerm ; do
 set -e
 
 # Pass maintainer script parameters to hook scripts
-export DEB_MAINT_PARAMS="\$@"
+export DEB_MAINT_PARAMS="\$*"
 
 test -d $debhookdir/$script.d && run-parts --arg="$version" $debhookdir/$script.d
 exit 0

[GIT] kbuild fixes

[Sam Ravnborg]

Hi Linus.

This tree has seen no testing - but the individual patches
has been tested. I decided to request a pull early because
the kallsyms bug annoys several people.

Please pull to fix:

- kallsyms fix
  fix build breakage on arm
  fix backtrace on at least sparc and presumeably also x86

- make htmldocs breakage

- 2 fixlets for kernel-doc

The following changes since commit fb20871a54961b82d35303b43452928186c1361d:
  Linus Torvalds (1):
        Merge git://git.kernel.org/.../gregkh/staging-2.6

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git master

Amerigo Wang (1):
      kbuild: fix build error during make htmldocs

Mike Frysinger (1):
      kallsyms: fix inverted valid symbol checking

Randy Dunlap (2):
      kernel-doc: ignore kmemcheck_bitfield_begin/end
      kernel-doc: fix param matching for array params

 scripts/basic/docproc.c |    2 +-
 scripts/kallsyms.c      |    6 +++---
 scripts/kernel-doc      |   19 +++++++++++++++++++
 3 files changed, 23 insertions(+), 4 deletions(-)

[GIT] kbuild fixes

[Sam Ravnborg]

Hi Linus.

This fixes an annoying warning "unexpected non-allocatable section",
that shows up in certain combinations of targets/gccs.

The tree commit fixes three different sources of the warnings.
This has now been in -next for a day or two with no additional comlains.

Please pull.

	Sam

The following changes since commit b4348f32dae3cb6eb4bc21c7ed8f76c0b11e9d6a:
  Linus Torvalds (1):
        Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes.git master

Anders Kaseorg (1):
      kbuild, modpost: fix unexpected non-allocatable section when cross compiling

Sam Ravnborg (2):
      kbuild, modpost: fix "unexpected non-allocatable" warning with SUSE gcc
      kbuild, modpost: fix unexpected non-allocatable warning with mips

 scripts/mod/modpost.c |   47 ++++++++++++++++++++++++++++++++++-------------
 1 files changed, 34 insertions(+), 13 deletions(-)