8001931: The new build system whitespace cleanup

Reviewed-by: tbell, simonis, erikj

common/autoconf/basics.m4

@@ -707,7 +707,6 @@ AC_DEFUN_ONCE([BASIC_CHECK_SRC_PERMS],
 
 AC_DEFUN_ONCE([BASIC_TEST_USABILITY_ISSUES],
 [
-
   AC_MSG_CHECKING([if build directory is on local disk])
   BASIC_CHECK_DIR_ON_LOCAL_DISK($OUTPUT_ROOT,
       [OUTPUT_DIR_IS_LOCAL="yes"],
@@ -734,5 +733,4 @@ else
     # Hide it the next time around...
     $TOUCH $SRC_ROOT/build/.hide-configure-performance-hints > /dev/null 2>&1
   fi
-
 ])

common/autoconf/build-performance.m4

@@ -53,7 +53,6 @@ AC_DEFUN([BPERF_CHECK_CORES],
     AC_MSG_RESULT([could not detect number of cores, defaulting to 1])
     AC_MSG_WARN([This will disable all parallelism from build!])
   fi
-
 ])
 
 AC_DEFUN([BPERF_CHECK_MEMORY_SIZE],
@@ -331,5 +330,4 @@ else
     SJAVAC_SERVER_DIR=
   fi
   AC_SUBST(SJAVAC_SERVER_DIR)
-
 ])

common/autoconf/configure

@@ -88,7 +88,6 @@ check_hg_updates() {
         check_autoconf_timestamps
       fi
     fi
-    
   fi
 }
 

common/autoconf/generated-configure.sh

@@ -3818,7 +3818,7 @@ fi
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1381335331
+DATE_WHEN_GENERATED=1381407169
 
 ###############################################################################
 #
@@ -7135,7 +7135,6 @@ $as_echo "$COMPILE_TYPE" >&6; }
 
 
 
-
 # Continue setting up basic stuff. Most remaining code require fundamental tools.
 
   # Locate the directory of this script.
@@ -7847,7 +7846,6 @@ fi
 
 
 
-
   ###############################################################################
   #
   # Set the debug level
@@ -16023,7 +16021,6 @@ BOOT_JDK_JVMARGS=$boot_jdk_jvmargs
 ###############################################################################
 
 
-
   # Where are the sources. Any of these can be overridden
   # using --with-override-corba and the likes.
   LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
@@ -16316,7 +16313,6 @@ $as_echo "yes with $JDK_TOPDIR" >&6; }
   fi
 
 
-
   BUILD_OUTPUT="$OUTPUT_ROOT"
 
 
@@ -18721,6 +18717,7 @@ $as_echo "$as_me: Downloading build dependency devkit from $with_builddeps_serve
       if test "x$thelibs" != x; then
         DEVKIT_LIBS="$thelibs"
       fi
+
         # Found devkit
         PATH="$DEVKIT/bin:$PATH"
         SYS_ROOT="$DEVKIT/${rewritten_target}/sys-root"
@@ -28937,6 +28934,7 @@ else
 $as_echo "no" >&6; }
           as_fn_error $? "The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path." "$LINENO" 5
 
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -29393,9 +29391,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 int i;
-
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
@@ -29421,9 +29417,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 int i;
-
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
 
@@ -29466,9 +29460,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 int i;
-
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
 
@@ -29494,9 +29486,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-
 int i;
-
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
 
@@ -30488,9 +30478,11 @@ CFLAGS="$CFLAGS $X_CFLAGS"
   for ac_header in X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " # include <X11/Xlib.h>
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "
+        # include <X11/Xlib.h>
         # include <X11/Xutil.h>
 
+
 "
 if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
@@ -30739,9 +30731,12 @@ if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
+
             CUPS_FOUND=yes
             CUPS_CFLAGS=
             DEFAULT_CUPS=yes
+
+
 fi
 
 done
@@ -31362,6 +31357,7 @@ $as_echo_n "checking for freetype in some standard locations... " >&6; }
       LDFLAGS="$LDFLAGS $DEFAULT_FREETYPE_LIBS"
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
+
             #include<ft2build.h>
             #include FT_FREETYPE_H
             int main() { return 0; }
@@ -31378,6 +31374,7 @@ else
 
             FREETYPE2_FOUND=no
 
+
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -31473,7 +31470,6 @@ fi
 
 
 
-
   ###############################################################################
   #
   # Check for alsa headers and libraries. Used on Linux/GNU systems.
@@ -31748,10 +31744,12 @@ if test "x$ac_cv_header_alsa_asoundlib_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ALSA_ASOUNDLIB_H 1
 _ACEOF
+
             ALSA_FOUND=yes
             ALSA_CFLAGS=-Iignoreme
             ALSA_LIBS=-lasound
             DEFAULT_ALSA=yes
+
 else
   ALSA_FOUND=no
 fi
@@ -31794,7 +31792,6 @@ fi
 
 
 
-
   ###############################################################################
   #
   # Check for the jpeg library
@@ -32128,6 +32125,7 @@ else
         { $as_echo "$as_me:${as_lineno-$LINENO}: Maths library was not found" >&5
 $as_echo "$as_me: Maths library was not found" >&6;}
 
+
 fi
 
 
@@ -32188,7 +32186,6 @@ LIBDL="$LIBS"
   LIBS="$save_LIBS"
 
 
-
   ###############################################################################
   #
   # statically link libstdc++ before C++ ABI is stablized on Linux unless
@@ -32511,7 +32508,6 @@ fi
 
 
 
-
 # After we have toolchain and the paths to all libraries (needed by msys), we can compile the fixpath helper
 
   # When using cygwin or msys, we need a wrapper binary that renames
@@ -32590,7 +32586,6 @@ fi
 
 
 
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if elliptic curve crypto implementation is present" >&5
 $as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; }
 
@@ -32658,7 +32653,6 @@ $as_echo "could not detect number of cores, defaulting to 1" >&6; }
 $as_echo "$as_me: WARNING: This will disable all parallelism from build!" >&2;}
   fi
 
-
   else
     NUM_CORES=$with_num_cores
   fi
@@ -32975,7 +32969,6 @@ fi
 
 
 
-
 # Can the C/C++ compiler use precompiled headers?
 
 
@@ -33174,7 +33167,6 @@ $as_echo "no, disabling ccaching of precompiled headers" >&6; }
   fi
 
 
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if build directory is on local disk" >&5
 $as_echo_n "checking if build directory is on local disk... " >&6; }
 
@@ -33226,7 +33218,6 @@ else
   fi
 
 
-
 # At the end, call the custom hook. (Dummy macro if no custom sources available)
 
 

common/autoconf/jdk-options.m4

@@ -135,7 +135,6 @@ if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
   fi
 
   AC_SUBST(MACOSX_UNIVERSAL)
-
 ])
 
 AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_LEVEL],
@@ -493,7 +492,6 @@ if test "x$OPENJDK_TARGET_OS" = "xwindows"; then
     SALIB_NAME="${LIBRARY_PREFIX}sawindbg${SHARED_LIBRARY_SUFFIX}"
   fi
   AC_SUBST(SALIB_NAME)
-
 ])
 
 AC_DEFUN_ONCE([JDKOPT_SETUP_DEBUG_SYMBOLS],

common/autoconf/libraries.m4

@@ -188,9 +188,11 @@ CFLAGS="$CFLAGS $X_CFLAGS"
   AC_CHECK_HEADERS([X11/extensions/shape.h X11/extensions/Xrender.h X11/extensions/XTest.h X11/Intrinsic.h],
       [X11_A_OK=yes],
       [X11_A_OK=no; break],
-                 [ # include <X11/Xlib.h>
+      [
+        # include <X11/Xlib.h>
         # include <X11/Xutil.h>
-                 ])
+      ]
+  )
 
   CFLAGS="$OLD_CFLAGS"
   AC_LANG_POP(C)
@@ -243,9 +245,12 @@ else
     if test "x$CUPS_FOUND" = xno; then
       # Are the cups headers installed in the default /usr/include location?
       AC_CHECK_HEADERS([cups/cups.h cups/ppd.h],
-	                     [CUPS_FOUND=yes
+          [
+            CUPS_FOUND=yes
             CUPS_CFLAGS=
-	                      DEFAULT_CUPS=yes])
+            DEFAULT_CUPS=yes
+          ]
+      )
     fi
     if test "x$CUPS_FOUND" = xno; then
       # Getting nervous now? Lets poke around for standard Solaris third-party
@@ -377,7 +382,8 @@ else
       PREV_LDFLAGS="$LDFLAGS"
       CXXFLAGS="$CXXFLAGS $DEFAULT_FREETYPE_CFLAGS"
       LDFLAGS="$LDFLAGS $DEFAULT_FREETYPE_LIBS"
-	    AC_LINK_IFELSE([AC_LANG_SOURCE([[#include<ft2build.h>
+      AC_LINK_IFELSE([AC_LANG_SOURCE([[
+            #include<ft2build.h>
             #include FT_FREETYPE_H
             int main() { return 0; }
           ]])],
@@ -389,7 +395,8 @@ else
           ],
           [
             FREETYPE2_FOUND=no
-	                  ])
+          ]
+      )
       CXXCFLAGS="$PREV_CXXFLAGS"
       LDFLAGS="$PREV_LDFLAGS"
       AC_MSG_RESULT([$FREETYPE2_FOUND])
@@ -415,7 +422,6 @@ AC_SUBST(USING_SYSTEM_FT_LIB)
   AC_SUBST(FREETYPE2_LIB_PATH)
   AC_SUBST(FREETYPE2_CFLAGS)
   AC_SUBST(FREETYPE2_LIBS)
-
 ])
 
 AC_DEFUN_ONCE([LIB_SETUP_ALSA],
@@ -467,10 +473,12 @@ else
     fi
     if test "x$ALSA_FOUND" = xno; then
       AC_CHECK_HEADERS([alsa/asoundlib.h],
-	                     [ALSA_FOUND=yes
+          [
+            ALSA_FOUND=yes
             ALSA_CFLAGS=-Iignoreme
             ALSA_LIBS=-lasound
-	                      DEFAULT_ALSA=yes],
+            DEFAULT_ALSA=yes
+          ],
           [ALSA_FOUND=no])
     fi
     if test "x$ALSA_FOUND" = xno; then
@@ -481,7 +489,6 @@ fi
 
   AC_SUBST(ALSA_CFLAGS)
   AC_SUBST(ALSA_LIBS)
-
 ])
 
 AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS],
@@ -614,7 +621,8 @@ fi
   AC_CHECK_LIB(m, cos, [],
       [
         AC_MSG_NOTICE([Maths library was not found])
-             ])
+      ]
+  )
   AC_SUBST(LIBM)
 
   ###############################################################################
@@ -627,7 +635,6 @@ AC_CHECK_LIB(dl,dlopen)
   LIBDL="$LIBS"
   AC_SUBST(LIBDL)
   LIBS="$save_LIBS"
-
 ])
 
 AC_DEFUN_ONCE([LIB_SETUP_STATIC_LINK_LIBSTDCPP],
@@ -770,5 +777,4 @@ if test "x$OPENJDK_TARGET_OS" = xmacosx && test "x$LIBCXX" = x && test "x$GCC" =
   fi
 
   AC_SUBST(LIBCXX)
-
 ])

common/autoconf/platform.m4

@@ -355,7 +355,6 @@ AC_DEFUN([PLATFORM_SETUP_LEGACY_VARS],
     *)      ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
   esac
   AC_SUBST(ZERO_ARCHDEF)
-
 ])
 
 AC_DEFUN([PLATFORM_SET_RELEASE_FILE_OS_VALUES],

common/autoconf/source-dirs.m4

@@ -25,7 +25,6 @@
 
 AC_DEFUN_ONCE([SRCDIRS_SETUP_TOPDIRS],
 [
-
   # Where are the sources. Any of these can be overridden
   # using --with-override-corba and the likes.
   LANGTOOLS_TOPDIR="$SRC_ROOT/langtools"
@@ -269,7 +268,6 @@ if test "x$with_override_jdk" != x; then
     AC_MSG_CHECKING([if JDK should be overridden])
     AC_MSG_RESULT([yes with $JDK_TOPDIR])
   fi
-
 ])
 
 AC_DEFUN_ONCE([SRCDIRS_SETUP_OUTPUT_DIRS],

common/autoconf/toolchain.m4

@@ -216,7 +216,8 @@ AC_SUBST(BUILD_LD)
   # will be found by AC_PROG_CC et al.
   DEVKIT=
   BDEPS_CHECK_MODULE(DEVKIT, devkit, xxx,
-                    [# Found devkit
+      [
+        # Found devkit
         PATH="$DEVKIT/bin:$PATH"
         SYS_ROOT="$DEVKIT/${rewritten_target}/sys-root"
         if test "x$x_includes" = "xNONE"; then
@@ -617,7 +618,8 @@ if test "x$OPENJDK_TARGET_CPU_BITS" = x32 && test "x$OPENJDK_TARGET_OS" = xmacos
         [
           AC_MSG_RESULT([no])
           AC_MSG_ERROR([The selected compiler $CXX does not support -mstackrealign! Try to put another compiler in the path.])
-	           ])
+        ]
+    )
   fi
 
   C_FLAG_DEPS="-MMD -MF"
@@ -1046,18 +1048,16 @@ AC_DEFUN([TOOLCHAIN_COMPILER_CHECK_ARGUMENTS],
   saved_cflags="$CFLAGS"
   CFLAGS="$CFLAGS $1"
   AC_LANG_PUSH([C])
-  AC_COMPILE_IFELSE([
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [], 
-    AC_LANG_SOURCE([[int i;]])
+      [supports=no])
-  ], [], [supports=no])
   AC_LANG_POP([C])
   CFLAGS="$saved_cflags"
 
   saved_cxxflags="$CXXFLAGS"
   CXXFLAGS="$CXXFLAG $1"
   AC_LANG_PUSH([C++])
-  AC_COMPILE_IFELSE([
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[int i;]])], [], 
-    AC_LANG_SOURCE([[int i;]])
+      [supports=no])
-  ], [], [supports=no])
   AC_LANG_POP([C++])
   CXXFLAGS="$saved_cxxflags"
 

common/makefiles/devkit/Makefile

@@ -119,5 +119,3 @@ clean		:
 
 FORCE :
 .PHONY : $(configs) $(platforms)
-
-

common/makefiles/javadoc/Javadoc.gmk

@@ -295,6 +295,7 @@ contained herein are not final and are subject to change. \
 The information is being made available to you solely for purpose of \
 evaluation. \
 </div> </div>
+
 endif
 
 #################################################################