Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03c7287d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drop-time' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull __TIME__/__DATE__ removal from Michal Marek:
 "This series by Josh finishes the removal of __DATE__ and __TIME__ from
  the kernel.  The last patch adds -Werror=date-time to KBUILD_CFLAGS to
  stop these from reappearing.

  Part of the series went through Greg's trees during this merge window,
  which is why this pull request is not based on v3.13-rc1"

* 'drop-time' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  Makefile: Build with -Werror=date-time if the compiler supports it
  x86: math-emu: Drop already-disabled print of build date
  net: wireless: brcm80211: Drop debug version with build date/time
  mtd: denali: Drop print of build date/time
parents 597690cd fe7c36c7

Makefile

+3 −0
Original line number Diff line number Diff line
@@ -688,6 +688,9 @@ KBUILD_CFLAGS += $(call cc-option,-Werror=implicit-int) 
# require functions to have arguments in prototypes, not empty 'int foo()'

KBUILD_CFLAGS   += $(call cc-option,-Werror=strict-prototypes)



# Prohibit date/time macros, which would make the build non-deterministic

KBUILD_CFLAGS   += $(call cc-option,-Werror=date-time)



# use the deterministic mode of AR if available

KBUILD_ARFLAGS := $(call ar-option,D)

arch/x86/math-emu/errors.c

+0 −5
Original line number Diff line number Diff line
@@ -330,11 +330,6 @@ asmlinkage void FPU_exception(int n) 


	RE_ENTRANT_CHECK_OFF;

	if ((~control_word & n & CW_Exceptions) || (n == EX_INTERNAL)) {

#ifdef PRINT_MESSAGES

		/* My message from the sponsor */

		printk(FPU_VERSION " " __DATE__ " (C) W. Metzenthen.\n");

#endif /* PRINT_MESSAGES */



		/* Get a name string for error reporting */

		for (i = 0; exception_names[i].type; i++)

			if ((exception_names[i].type & n) ==