Commit 03c7287dd22c18815964219c9a2e75054cd004df
Exists in
master
and in
16 other branches
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
Showing 2 changed files Side-by-side Diff
Makefile
| ... | ... | @@ -688,6 +688,9 @@ |
| 688 | 688 | # require functions to have arguments in prototypes, not empty 'int foo()' |
| 689 | 689 | KBUILD_CFLAGS += $(call cc-option,-Werror=strict-prototypes) |
| 690 | 690 | |
| 691 | +# Prohibit date/time macros, which would make the build non-deterministic | |
| 692 | +KBUILD_CFLAGS += $(call cc-option,-Werror=date-time) | |
| 693 | + | |
| 691 | 694 | # use the deterministic mode of AR if available |
| 692 | 695 | KBUILD_ARFLAGS := $(call ar-option,D) |
| 693 | 696 |
arch/x86/math-emu/errors.c
| ... | ... | @@ -330,11 +330,6 @@ |
| 330 | 330 | |
| 331 | 331 | RE_ENTRANT_CHECK_OFF; |
| 332 | 332 | if ((~control_word & n & CW_Exceptions) || (n == EX_INTERNAL)) { |
| 333 | -#ifdef PRINT_MESSAGES | |
| 334 | - /* My message from the sponsor */ | |
| 335 | - printk(FPU_VERSION " " __DATE__ " (C) W. Metzenthen.\n"); | |
| 336 | -#endif /* PRINT_MESSAGES */ | |
| 337 | - | |
| 338 | 333 | /* Get a name string for error reporting */ |
| 339 | 334 | for (i = 0; exception_names[i].type; i++) |
| 340 | 335 | if ((exception_names[i].type & n) == |