components/runtime/openjdk-7/patches/patch-jdk_make_common_Mapfile-vers.gmk.patch

   1 $NetBSD: patch-jdk_make_common_Mapfile-vers.gmk,v 1.1 2013/06/15 09:31:06 jperkin Exp $
   2
   3 GCC support.
   4
   5 --- jdk/make/common/Mapfile-vers.gmk.orig       2013-02-20 17:07:30.000000000 +0000
   6 +++ jdk/make/common/Mapfile-vers.gmk
   7 @@ -50,14 +50,16 @@ ifeq ($(VARIANT), OPT)
   8    ifndef FILES_m
   9      FILES_m =        mapfile-vers
  10    endif
  11 -
  12 +
  13 +ifneq ($(CC_VERSION), gcc)
  14    # If we are re-ordering functions in this solaris library, we need to make
  15    # sure that -xF is added to the compile lines. This option is critical and
  16    # enables the functions to be reordered.
  17    ifdef FILES_reorder
  18      CFLAGS_OPT   += -xF
  19      CXXFLAGS_OPT += -xF
  20 -  endif
  21 +  endif # FILES_reorder
  22 +endif # USE_GCC
  23
  24  INIT += $(TEMPDIR)/mapfile-vers
  25
  26 @@ -70,9 +72,15 @@ $(TEMPDIR)/mapfile-vers : $(FILES_m) $(F
  27  endif # VARIANT
  28
  29  ifndef LDNOMAP
  30 +ifneq ($(CC_VERSION), gcc)
  31    LDMAPFLAGS_OPT =  -M$(TEMPDIR)/mapfile-vers
  32    LDMAPFLAGS_DBG =  $(FILES_m:%=-M%)
  33 -endif
  34 +else
  35 +  ## proper passthrough for gcc
  36 +  LDMAPFLAGS_OPT =  -Xlinker -M$(TEMPDIR)/mapfile-vers
  37 +  LDMAPFLAGS_DBG =  $(FILES_m:%=-Xlinker -M%)
  38 +endif # USE_GCC
  39 +endif # LDNOMAP
  40
  41  endif # PLATFORM
  42