1.1 --- a/common/autoconf/generated-configure.sh Fri Sep 13 13:07:02 2013 +0200
1.2 +++ b/common/autoconf/generated-configure.sh Fri Sep 13 14:59:23 2013 +0200
1.3 @@ -709,7 +709,6 @@
1.4 SHARED_LIBRARY
1.5 OBJ_SUFFIX
1.6 COMPILER_NAME
1.7 -TARGET_BITS_FLAG
1.8 JT_HOME
1.9 JTREGEXE
1.10 LIPO
1.11 @@ -3806,7 +3805,7 @@
1.12 #CUSTOM_AUTOCONF_INCLUDE
1.13
1.14 # Do not change or remove the following line, it is needed for consistency checks:
1.15 -DATE_WHEN_GENERATED=1379070243
1.16 +DATE_WHEN_GENERATED=1379077060
1.17
1.18 ###############################################################################
1.19 #
1.20 @@ -28398,35 +28397,41 @@
1.21 if test "x$OPENJDK_TARGET_OS" = xsolaris; then
1.22 # Always specify -m flags on Solaris
1.23
1.24 - # keep track of c/cxx flags that we added outselves...
1.25 - # to prevent emitting warning...
1.26 - TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
1.27 -
1.28 -
1.29 - CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}"
1.30 - CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}"
1.31 - LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}"
1.32 -
1.33 - CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.34 - CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.35 - LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.36 + # When we add flags to the "official" CFLAGS etc, we need to
1.37 + # keep track of these additions in ADDED_CFLAGS etc. These
1.38 + # will later be checked to make sure only controlled additions
1.39 + # have been made to CFLAGS etc.
1.40 + ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.41 + ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.42 + ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.43 +
1.44 + CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
1.45 + CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
1.46 + LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
1.47 +
1.48 + CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
1.49 + CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
1.50 + LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
1.51
1.52 elif test "x$COMPILE_TYPE" = xreduced; then
1.53 if test "x$OPENJDK_TARGET_OS" != xwindows; then
1.54 # Specify -m if running reduced on other Posix platforms
1.55
1.56 - # keep track of c/cxx flags that we added outselves...
1.57 - # to prevent emitting warning...
1.58 - TARGET_BITS_FLAG="-m${OPENJDK_TARGET_CPU_BITS}"
1.59 -
1.60 -
1.61 - CFLAGS="${CFLAGS} ${TARGET_BITS_FLAG}"
1.62 - CXXFLAGS="${CXXFLAGS} ${TARGET_BITS_FLAG}"
1.63 - LDFLAGS="${LDFLAGS} ${TARGET_BITS_FLAG}"
1.64 -
1.65 - CFLAGS_JDK="${CFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.66 - CXXFLAGS_JDK="${CXXFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.67 - LDFLAGS_JDK="${LDFLAGS_JDK} ${TARGET_BITS_FLAG}"
1.68 + # When we add flags to the "official" CFLAGS etc, we need to
1.69 + # keep track of these additions in ADDED_CFLAGS etc. These
1.70 + # will later be checked to make sure only controlled additions
1.71 + # have been made to CFLAGS etc.
1.72 + ADDED_CFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.73 + ADDED_CXXFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.74 + ADDED_LDFLAGS=" -m${OPENJDK_TARGET_CPU_BITS}"
1.75 +
1.76 + CFLAGS="${CFLAGS}${ADDED_CFLAGS}"
1.77 + CXXFLAGS="${CXXFLAGS}${ADDED_CXXFLAGS}"
1.78 + LDFLAGS="${LDFLAGS}${ADDED_LDFLAGS}"
1.79 +
1.80 + CFLAGS_JDK="${CFLAGS_JDK}${ADDED_CFLAGS}"
1.81 + CXXFLAGS_JDK="${CXXFLAGS_JDK}${ADDED_CXXFLAGS}"
1.82 + LDFLAGS_JDK="${LDFLAGS_JDK}${ADDED_LDFLAGS}"
1.83
1.84 fi
1.85 fi
