Mercurial > jdk8-mips64-public / changeset
changeset
8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
Fri, 25 Oct 2013 10:15:33 -0700
- author
- dcubed
- date
- Fri, 25 Oct 2013 10:15:33 -0700
- changeset 874
- dfbc93f26f38
- parent 873
- 72ef61df77e5
- child 875
- 4f2011496393
8027117: adapt JDK-7165611 to new build-infra whitespace/indent policy
Summary: Fix whitespace/indent issues.
Reviewed-by: hseigel, coleenp, erikj, ihse
1.1 --- a/common/autoconf/basics.m4 Fri Oct 25 13:58:09 2013 +0200 1.2 +++ b/common/autoconf/basics.m4 Fri Oct 25 10:15:33 2013 -0700 1.3 @@ -656,7 +656,7 @@ 1.4 fi 1.5 1.6 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then 1.7 - BASIC_REQUIRE_PROG(DSYMUTIL, dsymutil) 1.8 + BASIC_REQUIRE_PROG(DSYMUTIL, dsymutil) 1.9 BASIC_REQUIRE_PROG(XATTR, xattr) 1.10 AC_PATH_PROG(CODESIGN, codesign) 1.11 if test "x$CODESIGN" != "x"; then
2.1 --- a/common/autoconf/generated-configure.sh Fri Oct 25 13:58:09 2013 +0200 2.2 +++ b/common/autoconf/generated-configure.sh Fri Oct 25 10:15:33 2013 -0700 2.3 @@ -29913,11 +29913,11 @@ 2.4 elif test "x$enable_debug_symbols" = "xno"; then 2.5 ENABLE_DEBUG_SYMBOLS=false 2.6 else 2.7 - # Default is on if objcopy is found 2.8 - if test "x$OBJCOPY" != x; then 2.9 - ENABLE_DEBUG_SYMBOLS=true 2.10 - # MacOS X and Windows don't use objcopy but default is on for those OSes 2.11 - elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then 2.12 + # Default is on if objcopy is found 2.13 + if test "x$OBJCOPY" != x; then 2.14 + ENABLE_DEBUG_SYMBOLS=true 2.15 + # MacOS X and Windows don't use objcopy but default is on for those OSes 2.16 + elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then 2.17 ENABLE_DEBUG_SYMBOLS=true 2.18 else 2.19 ENABLE_DEBUG_SYMBOLS=false
3.1 --- a/common/autoconf/jdk-options.m4 Fri Oct 25 13:58:09 2013 +0200 3.2 +++ b/common/autoconf/jdk-options.m4 Fri Oct 25 10:15:33 2013 -0700 3.3 @@ -516,11 +516,11 @@ 3.4 elif test "x$enable_debug_symbols" = "xno"; then 3.5 ENABLE_DEBUG_SYMBOLS=false 3.6 else 3.7 - # Default is on if objcopy is found 3.8 - if test "x$OBJCOPY" != x; then 3.9 - ENABLE_DEBUG_SYMBOLS=true 3.10 - # MacOS X and Windows don't use objcopy but default is on for those OSes 3.11 - elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then 3.12 + # Default is on if objcopy is found 3.13 + if test "x$OBJCOPY" != x; then 3.14 + ENABLE_DEBUG_SYMBOLS=true 3.15 + # MacOS X and Windows don't use objcopy but default is on for those OSes 3.16 + elif test "x$OPENJDK_TARGET_OS" = xmacosx || test "x$OPENJDK_TARGET_OS" = xwindows; then 3.17 ENABLE_DEBUG_SYMBOLS=true 3.18 else 3.19 ENABLE_DEBUG_SYMBOLS=false
4.1 --- a/common/makefiles/NativeCompilation.gmk Fri Oct 25 13:58:09 2013 +0200 4.2 +++ b/common/makefiles/NativeCompilation.gmk Fri Oct 25 10:15:33 2013 -0700 4.3 @@ -435,36 +435,36 @@ 4.4 $(CP) $$< $$@ 4.5 endif 4.6 4.7 - ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X 4.8 - ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows 4.9 - ifeq ($(OPENJDK_TARGET_OS), solaris) 4.10 - # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. 4.11 - # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from 4.12 - # empty section headers until a fixed $(OBJCOPY) is available. 4.13 - # An empty section header has sh_addr == 0 and sh_size == 0. 4.14 - # This problem has only been seen on Solaris X64, but we call this tool 4.15 - # on all Solaris builds just in case. 4.16 - # 4.17 - # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. 4.18 - # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. 4.19 - $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \ 4.20 - $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) 4.21 - $(RM) $$@ 4.22 - $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< 4.23 - $(OBJCOPY) --only-keep-debug $$< $$@ 4.24 - $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< 4.25 - else # not solaris 4.26 - $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) 4.27 - $(RM) $$@ 4.28 - $(OBJCOPY) --only-keep-debug $$< $$@ 4.29 - $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< 4.30 - endif # Touch to not retrigger rule on rebuild 4.31 + ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X 4.32 + ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows 4.33 + ifeq ($(OPENJDK_TARGET_OS), solaris) 4.34 + # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. 4.35 + # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from 4.36 + # empty section headers until a fixed $(OBJCOPY) is available. 4.37 + # An empty section header has sh_addr == 0 and sh_size == 0. 4.38 + # This problem has only been seen on Solaris X64, but we call this tool 4.39 + # on all Solaris builds just in case. 4.40 + # 4.41 + # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. 4.42 + # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. 4.43 + $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) \ 4.44 + $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) 4.45 + $(RM) $$@ 4.46 + $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< 4.47 + $(OBJCOPY) --only-keep-debug $$< $$@ 4.48 + $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< 4.49 + else # not solaris 4.50 + $$($1_OBJECT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo : $$($1_TARGET) 4.51 + $(RM) $$@ 4.52 + $(OBJCOPY) --only-keep-debug $$< $$@ 4.53 + $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< 4.54 + endif # Touch to not retrigger rule on rebuild 4.55 $(TOUCH) $$@ 4.56 - endif # !windows 4.57 - endif # !macosx 4.58 + endif # !windows 4.59 + endif # !macosx 4.60 4.61 ifeq ($(ZIP_DEBUGINFO_FILES), true) 4.62 - ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet 4.63 +ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet 4.64 $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).diz 4.65 4.66 ifeq ($(OPENJDK_TARGET_OS), windows) 4.67 @@ -477,12 +477,12 @@ 4.68 $(CD) $$($1_OBJECT_DIR) \ 4.69 && $(ZIP) -q $$@ $$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo 4.70 endif 4.71 - endif # no MacOS X support yet 4.72 +endif # no MacOS X support yet 4.73 else 4.74 ifeq ($(OPENJDK_TARGET_OS), windows) 4.75 $1 += $$($1_OUTPUT_DIR)/$$($1_LIBRARY).map \ 4.76 $$($1_OUTPUT_DIR)/$$($1_LIBRARY).pdb 4.77 - else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files 4.78 + else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files 4.79 $1 += $$($1_OUTPUT_DIR)/$$(LIBRARY_PREFIX)$$($1_LIBRARY).debuginfo 4.80 endif 4.81 endif 4.82 @@ -519,36 +519,36 @@ 4.83 $(CP) $$< $$@ 4.84 endif 4.85 4.86 - ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X 4.87 - ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows 4.88 - ifeq ($(OPENJDK_TARGET_OS), solaris) 4.89 - # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. 4.90 - # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from 4.91 - # empty section headers until a fixed $(OBJCOPY) is available. 4.92 - # An empty section header has sh_addr == 0 and sh_size == 0. 4.93 - # This problem has only been seen on Solaris X64, but we call this tool 4.94 - # on all Solaris builds just in case. 4.95 - # 4.96 - # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. 4.97 - # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. 4.98 - $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \ 4.99 - $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) 4.100 - $(RM) $$@ 4.101 - $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< 4.102 - $(OBJCOPY) --only-keep-debug $$< $$@ 4.103 - $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< 4.104 - else # not solaris 4.105 - $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) 4.106 - $(RM) $$@ 4.107 - $(OBJCOPY) --only-keep-debug $$< $$@ 4.108 - $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< 4.109 - endif 4.110 - $(TOUCH) $$@ 4.111 - endif # !windows 4.112 - endif # !macosx 4.113 + ifneq ($(OPENJDK_TARGET_OS), macosx) # OBJCOPY is not used on MacOS X 4.114 + ifneq ($(OPENJDK_TARGET_OS), windows) # nor on Windows 4.115 + ifeq ($(OPENJDK_TARGET_OS), solaris) 4.116 + # gobjcopy crashes on "empty" section headers with the SHF_ALLOC flag set. 4.117 + # Use $(FIX_EMPTY_SEC_HDR_FLAGS) to clear the SHF_ALLOC flag (if set) from 4.118 + # empty section headers until a fixed $(OBJCOPY) is available. 4.119 + # An empty section header has sh_addr == 0 and sh_size == 0. 4.120 + # This problem has only been seen on Solaris X64, but we call this tool 4.121 + # on all Solaris builds just in case. 4.122 + # 4.123 + # $(OBJCOPY) --add-gnu-debuglink=... corrupts SUNW_* sections. 4.124 + # Use $(ADD_GNU_DEBUGLINK) until a fixed $(OBJCOPY) is available. 4.125 + $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) \ 4.126 + $(FIX_EMPTY_SEC_HDR_FLAGS) $(ADD_GNU_DEBUGLINK) 4.127 + $(RM) $$@ 4.128 + $(FIX_EMPTY_SEC_HDR_FLAGS) $(LOG_INFO) $$< 4.129 + $(OBJCOPY) --only-keep-debug $$< $$@ 4.130 + $(CD) $$(@D) && $(ADD_GNU_DEBUGLINK) $(LOG_INFO) $$(@F) $$< 4.131 + else # not solaris 4.132 + $$($1_OBJECT_DIR)/$$($1_PROGRAM).debuginfo : $$($1_TARGET) 4.133 + $(RM) $$@ 4.134 + $(OBJCOPY) --only-keep-debug $$< $$@ 4.135 + $(CD) $$(@D) && $(OBJCOPY) --add-gnu-debuglink=$$(@F) $$< 4.136 + endif 4.137 + $(TOUCH) $$@ 4.138 + endif # !windows 4.139 + endif # !macosx 4.140 4.141 ifeq ($(ZIP_DEBUGINFO_FILES), true) 4.142 - ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet 4.143 +ifneq ($(OPENJDK_TARGET_OS), macosx) # no MacOS X support yet 4.144 $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).diz 4.145 4.146 ifeq ($(OPENJDK_TARGET_OS), windows) 4.147 @@ -561,12 +561,12 @@ 4.148 $(CD) $$($1_OBJECT_DIR) \ 4.149 && $(ZIP) -q $$@ $$($1_PROGRAM).debuginfo 4.150 endif 4.151 - endif # no MacOS X support yet 4.152 +endif # no MacOS X support yet 4.153 else 4.154 ifeq ($(OPENJDK_TARGET_OS), windows) 4.155 $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).map \ 4.156 $$($1_OUTPUT_DIR)/$$($1_PROGRAM).pdb 4.157 - else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files 4.158 + else ifneq ($(OPENJDK_TARGET_OS), macosx) # MacOS X does not use .debuginfo files 4.159 $1 += $$($1_OUTPUT_DIR)/$$($1_PROGRAM).debuginfo 4.160 endif 4.161 endif
