1.1 --- a/common/autoconf/platform.m4 Fri Sep 13 13:07:02 2013 +0200
1.2 +++ b/common/autoconf/platform.m4 Fri Sep 13 14:59:23 2013 +0200
1.3 @@ -422,18 +422,21 @@
1.4 # Add -mX to various FLAGS variables.
1.5 AC_DEFUN([PLATFORM_SET_COMPILER_TARGET_BITS_FLAGS],
1.6 [
1.7 - # keep track of c/cxx flags that we added outselves...
1.8 - # to prevent emitting warning...
1.9 - TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
1.10 - AC_SUBST(TARGET_BITS_FLAG)
1.11 + # When we add flags to the "official" CFLAGS etc, we need to
1.12 + # keep track of these additions in ADDED_CFLAGS etc. These
1.13 + # will later be checked to make sure only controlled additions
1.14 + # have been made to CFLAGS etc.
1.15 + ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.16 + ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.17 + ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.18
1.19 - CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}"
1.20 - CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}"
1.21 - LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}"
1.22 + CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
1.23 + CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
1.24 + LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
1.25
1.26 - CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.27 - CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.28 - LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.29 + CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
1.30 + CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
1.31 + LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
1.32 ])
1.33
1.34 AC_DEFUN_ONCE([PLATFORM_SETUP_OPENJDK_TARGET_BITS],
