Mercurial > hg > release > icedtea7-2.4
changeset 2718:47177c9bfafa
Apply Werror fix to aarch64 port.
2012-08-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am:
(ICEDTEA_PATCHES): Add -Werror patch
from IcedTea7 HEAD.
* patches/hotspot/aarch64/werror.patch:
Allow COMPILER_WARNINGS_FATAL to turn off -Werror.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Fri, 28 Mar 2014 03:41:03 +0000 |
| parents | c99ce4169f55 |
| children | fdd91eddd59b |
| files | ChangeLog Makefile.am patches/hotspot/aarch64/werror.patch |
| diffstat | 3 files changed, 55 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Mar 27 23:33:04 2014 +0000 +++ b/ChangeLog Fri Mar 28 03:41:03 2014 +0000 @@ -1,3 +1,11 @@ +2012-08-16 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * Makefile.am: + (ICEDTEA_PATCHES): Add -Werror patch + from IcedTea7 HEAD. + * patches/hotspot/aarch64/werror.patch: + Allow COMPILER_WARNINGS_FATAL to turn off -Werror. + 2014-03-27 Andrew John Hughes <gnu.andrew@member.fsf.org> * NEWS: Updated.
--- a/Makefile.am Thu Mar 27 23:33:04 2014 +0000 +++ b/Makefile.am Fri Mar 28 03:41:03 2014 +0000 @@ -297,6 +297,10 @@ ICEDTEA_PATCHES += patches/nss-config.patch endif +if WITH_ALT_HSBUILD +ICEDTEA_PATCHES += patches/hotspot/aarch64/werror.patch +endif + ICEDTEA_PATCHES += $(DISTRIBUTION_PATCHES) # Bootstrapping patches
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/hotspot/aarch64/werror.patch Fri Mar 28 03:41:03 2014 +0000 @@ -0,0 +1,43 @@ +diff -Nru openjdk.orig/hotspot/make/linux/makefiles/gcc.make openjdk/hotspot/make/linux/makefiles/gcc.make +--- openjdk.orig/hotspot/make/linux/makefiles/gcc.make 2014-03-25 14:07:53.000000000 +0000 ++++ openjdk/hotspot/make/linux/makefiles/gcc.make 2014-03-28 03:26:57.229802760 +0000 +@@ -205,7 +205,9 @@ + endif + + # Compiler warnings are treated as errors ++ifneq ($(COMPILER_WARNINGS_FATAL),false) + WARNINGS_ARE_ERRORS = -Werror ++endif + + ifeq ($(USE_CLANG), true) + # However we need to clean the code up before we can unrestrictedly enable this option with Clang +diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/adlc.make openjdk/hotspot/make/solaris/makefiles/adlc.make +--- openjdk.orig/hotspot/make/solaris/makefiles/adlc.make 2014-03-25 14:07:53.000000000 +0000 ++++ openjdk/hotspot/make/solaris/makefiles/adlc.make 2014-03-28 03:26:02.604988364 +0000 +@@ -73,8 +73,10 @@ + + # CFLAGS_WARN holds compiler options to suppress/enable warnings. + # Compiler warnings are treated as errors +-ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) +- CFLAGS_WARN = +w -errwarn ++ifneq ($(COMPILER_WARNINGS_FATAL),false) ++ ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) ++ CFLAGS_WARN = +w -errwarn ++ endif + endif + CFLAGS += $(CFLAGS_WARN) + +diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/gcc.make openjdk/hotspot/make/solaris/makefiles/gcc.make +--- openjdk.orig/hotspot/make/solaris/makefiles/gcc.make 2014-03-25 14:07:53.000000000 +0000 ++++ openjdk/hotspot/make/solaris/makefiles/gcc.make 2014-03-28 03:27:28.206264586 +0000 +@@ -116,7 +116,9 @@ + + + # Compiler warnings are treated as errors +-WARNINGS_ARE_ERRORS = -Werror ++ifneq ($(COMPILER_WARNINGS_FATAL),false) ++WARNINGS_ARE_ERRORS = -Werror ++endif + # Enable these warnings. See 'info gcc' about details on these options + WARNING_FLAGS = -Wpointer-arith -Wconversion -Wsign-compare -Wundef + CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(WARNING_FLAGS)