comparison make/bsd/makefiles/gcc.make @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents 4823ccaf5023
children 9a980af18ec5
comparison
equal deleted inserted replaced
14908:8db6e76cb658 14909:4ca6dc0799b6
259 # WARNINGS_ARE_ERRORS += -Wno-tautological-constant-out-of-range-compare 259 # WARNINGS_ARE_ERRORS += -Wno-tautological-constant-out-of-range-compare
260 WARNINGS_ARE_ERRORS += -Wno-delete-non-virtual-dtor -Wno-deprecated -Wno-format -Wno-dynamic-class-memaccess 260 WARNINGS_ARE_ERRORS += -Wno-delete-non-virtual-dtor -Wno-deprecated -Wno-format -Wno-dynamic-class-memaccess
261 WARNINGS_ARE_ERRORS += -Wno-empty-body 261 WARNINGS_ARE_ERRORS += -Wno-empty-body
262 endif 262 endif
263 263
264 WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef -Wunused-function -Wformat=2 -Wno-error=format-nonliteral 264 WARNING_FLAGS = -Wpointer-arith -Wsign-compare -Wundef
265 265
266 ifeq ($(USE_CLANG),) 266 ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0"
267 # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit 267 # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
268 # conversions which might affect the values. Only enable it in earlier versions. 268 # conversions which might affect the values. Only enable it in earlier versions.
269 ifeq "$(shell expr \( $(CC_VER_MAJOR) \> 4 \) \| \( \( $(CC_VER_MAJOR) = 4 \) \& \( $(CC_VER_MINOR) \>= 3 \) \))" "0" 269 WARNING_FLAGS = -Wunused-function
270 WARNINGS_FLAGS += -Wconversion 270 ifeq ($(USE_CLANG),)
271 WARNING_FLAGS += -Wconversion
271 endif 272 endif
272 endif 273 endif
273 274
274 CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(WARNING_FLAGS) 275 CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(WARNING_FLAGS)
275 # Special cases 276 # Special cases
288 CFLAGS += -fno-strict-aliasing 289 CFLAGS += -fno-strict-aliasing
289 290
290 # The flags to use for an Optimized g++ build 291 # The flags to use for an Optimized g++ build
291 ifeq ($(OS_VENDOR), Darwin) 292 ifeq ($(OS_VENDOR), Darwin)
292 # use -Os by default, unless -O3 can be proved to be worth the cost, as per policy 293 # use -Os by default, unless -O3 can be proved to be worth the cost, as per policy
293 # <https://wiki.openjdk.java.net/display/MacOSXPort/Compiler+Errata> 294 # <http://wikis.sun.com/display/OpenJDK/Mac+OS+X+Port+Compilers>
294 OPT_CFLAGS_DEFAULT ?= SIZE 295 OPT_CFLAGS_DEFAULT ?= SIZE
295 else 296 else
296 OPT_CFLAGS_DEFAULT ?= SPEED 297 OPT_CFLAGS_DEFAULT ?= SPEED
297 endif 298 endif
298 299