makefiles/CompileLaunchers.gmk

rev 7322 : 8017568: Enable new build on Linux/PPC64

*** 21,31 ****
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #
  
! defalt: all
  
  include $(SPEC)
  include MakeBase.gmk
  include NativeCompilation.gmk
  
--- 21,31 ----
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #
  
! default: all
  
  include $(SPEC)
  include MakeBase.gmk
  include NativeCompilation.gmk
  
*** 126,140 ****
--- 126,151 ----
      $1_CFLAGS:=$(CFLAGS_JDKEXE)
      ifeq ($(10),true)
          $1_CFLAGS:=$(filter-out -MD,$(CFLAGS_JDKEXE))
      endif
  
+     # The linker on older SuSE distros (e.g. on SLES 10) complains with:
+     # "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
+     # if feeded with a version script which contains named tags.
+     ifeq ($(USING_BROKEN_SUSE_LD),yes)
+         ifneq ($(wildcard $(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous),)
+             $1_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU).anonymous
+         else
+             $1_MAPFILE:=
+         endif
+     else
          ifneq ($(wildcard $(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)),)
              $1_MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/launchers/mapfile-$(OPENJDK_TARGET_CPU)
          else
              $1_MAPFILE:=
          endif
+     endif
  
      $(call SetupNativeCompilation,BUILD_LAUNCHER_$1,\
          SRC:=$(JDK_TOPDIR)/src/share/bin,\
          INCLUDE_FILES:=main.c,\
          LANG:=C,\
*** 446,455 ****
--- 457,476 ----
  ifeq ($(OPENJDK_TARGET_OS),windows)
      BUILD_UNPACKEXE_LDEXE:=$(CC)
      EXE_OUT_OPTION_save:=$(EXE_OUT_OPTION)
      EXE_OUT_OPTION:=-Fe
  endif
+ 
+ # The linker on older SuSE distros (e.g. on SLES 10) complains with:
+ # "Invalid version tag `SUNWprivate_1.1'. Only anonymous version tag is allowed in executable."
+ # if feeded with a version script which contains named tags.
+ ifeq ($(USING_BROKEN_SUSE_LD),yes)
+   UNPACK_MAPFILE=$(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers-unpack200.anonymous
+ else
+   UNPACK_MAPFILE=$(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers-unpack200
+ endif
+ 
  $(eval $(call SetupNativeCompilation,BUILD_UNPACKEXE,\
                  SRC:=$(JDK_TOPDIR)/src/share/native/com/sun/java/util/jar/pack,\
                  EXCLUDE_FILES:=jni.cpp,\
                  LANG:=$(UNPACKEXE_LANG),\
                  OPTIMIZATION:=LOW, \
*** 457,467 ****
                          -DFULL, \
                  CFLAGS_release:=-DPRODUCT,\
                  CFLAGS_linux:=-fPIC,\
                  CFLAGS_solaris:=-KPIC, \
                  CFLAGS_macosx:=-fPIC, \
!                 MAPFILE:=$(JDK_TOPDIR)/makefiles/mapfiles/libunpack/mapfile-vers-unpack200,\
                  LDFLAGS:=$(UNPACKEXE_ZIPOBJS),\
                  LDFLAGS_windows:=$(CXXFLAGS_JDKEXE),\
                  LDFLAGS_posix:=$(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
                           $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
                           $(call SET_SHARED_LIBRARY_ORIGIN),\
--- 478,488 ----
                          -DFULL, \
                  CFLAGS_release:=-DPRODUCT,\
                  CFLAGS_linux:=-fPIC,\
                  CFLAGS_solaris:=-KPIC, \
                  CFLAGS_macosx:=-fPIC, \
!                 MAPFILE:=$(UNPACK_MAPFILE),\
                  LDFLAGS:=$(UNPACKEXE_ZIPOBJS),\
                  LDFLAGS_windows:=$(CXXFLAGS_JDKEXE),\
                  LDFLAGS_posix:=$(LDFLAGS_JDKEXE) $(LDFLAGS_CXX_JDK) \
                           $(call SET_SHARED_LIBRARY_NAME,$(LIBRARY_PREFIX)unpack$(SHARED_LIBRARY_SUFFIX)) \
                           $(call SET_SHARED_LIBRARY_ORIGIN),\