*** old/make/Makefile	Thu Apr 11 07:43:01 2013
--- new/make/Makefile	Thu Apr 11 07:43:01 2013

*** 83,117 ****
--- 83,117 ----
  else
    ALT_OUT=
  endif
  
  # Typical C1/C2 targets made available with this Makefile
! C1_VM_TARGETS=product1 fastdebug1 optimized1 jvmg1
! C2_VM_TARGETS=product  fastdebug  optimized  jvmg
! ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero jvmgzero
! SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark jvmgshark
! MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 jvmgminimal1
! C1_VM_TARGETS=product1 fastdebug1 optimized1 debug1
! C2_VM_TARGETS=product  fastdebug  optimized  debug
! ZERO_VM_TARGETS=productzero fastdebugzero optimizedzero debugzero
! SHARK_VM_TARGETS=productshark fastdebugshark optimizedshark debugshark
! MINIMAL1_VM_TARGETS=productminimal1 fastdebugminimal1 debugminimal1
  
  COMMON_VM_PRODUCT_TARGETS=product product1 docs export_product
  COMMON_VM_FASTDEBUG_TARGETS=fastdebug fastdebug1 docs export_fastdebug
! COMMON_VM_DEBUG_TARGETS=jvmg jvmg1 docs export_debug
! COMMON_VM_DEBUG_TARGETS=debug debug1 docs export_debug
  
  # JDK directory list
  JDK_DIRS=bin include jre lib demo
  
  all:           all_product all_fastdebug
  
  ifeq ($(JVM_VARIANT_MINIMAL1),true)
  all_product:    productminimal1
  all_fastdebug:  fastdebugminimal1
! all_debug:      jvmgminimal1
! all_debug:      debugminimal1
  endif
  
  ifdef BUILD_CLIENT_ONLY
  all_product:   product1 docs export_product
  all_fastdebug: fastdebug1 docs export_fastdebug
! all_debug:     jvmg1 docs export_debug
! all_debug:     debug1 docs export_debug
  else
  ifeq ($(MACOSX_UNIVERSAL),true)
  all_product:   universal_product
  all_fastdebug: universal_fastdebug
  all_debug:     universal_debug

*** 125,141 ****
--- 125,141 ----
  all_optimized: optimized optimized1 docs export_optimized
  
  allzero:           all_productzero all_fastdebugzero
  all_productzero:   productzero docs export_product
  all_fastdebugzero: fastdebugzero docs export_fastdebug
! all_debugzero:     jvmgzero docs export_debug
! all_debugzero:     debugzero docs export_debug
  all_optimizedzero: optimizedzero docs export_optimized
  
  allshark:           all_productshark all_fastdebugshark
  all_productshark:   productshark docs export_product
  all_fastdebugshark: fastdebugshark docs export_fastdebug
! all_debugshark:     jvmgshark docs export_debug
! all_debugshark:     debugshark docs export_debug
  all_optimizedshark: optimizedshark docs export_optimized
  
  # Do everything
  world:         all create_jdk
  

*** 258,268 ****
--- 258,268 ----
  export_fastdebug:
          $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
            EXPORT_SUBDIR=/$(@:export_%=%) \
            generic_export
  export_debug:
!         $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=${VM_DEBUG} \
!         $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
            EXPORT_SUBDIR=/$(@:export_%=%) \
            generic_export
  export_optimized:
          $(MAKE) BUILD_FLAVOR=$(@:export_%=%) VM_SUBDIR=$(@:export_%=%) \
            EXPORT_SUBDIR=/$(@:export_%=%) \

*** 279,289 ****
--- 279,289 ----
          $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) \
            VM_SUBDIR=$(@:export_%_jdk=%)  \
            ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
            generic_export
  export_debug_jdk::
!         $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=${VM_DEBUG} \
!         $(MAKE) BUILD_FLAVOR=$(@:export_%_jdk=%) VM_SUBDIR=$(@:export_%_jdk=%) \
            ALT_EXPORT_PATH=$(JDK_IMAGE_DIR)/$(@:export_%_jdk=%) \
            generic_export
  
  # Export file copy rules
  XUSAGE=$(HS_SRC_DIR)/share/vm/Xusage.txt

*** 539,569 ****
--- 539,569 ----
          @$(ECHO) "Running with: $(ALTJVM_DIR)"
          @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -Xinternalversion
          @$(RUN_JVM) -XXaltjvm=$(ALTJVM_DIR) -showversion -help
  
  # C2 test targets
! test_product test_optimized test_fastdebug test_jvmg:
! test_product test_optimized test_fastdebug test_debug:
          @$(MAKE) generic_test ALTJVM_DIR="$(C2_DIR)/$(@:test_%=%)"
  
  # C1 test targets
! test_product1 test_optimized1 test_fastdebug1 test_jvmg1:
! test_product1 test_optimized1 test_fastdebug1 test_debug1:
    ifeq ($(ARCH_DATA_MODEL), 32)
          @$(MAKE) generic_test ALTJVM_DIR="$(C1_DIR)/$(@:test_%1=%)"
    else
          @$(ECHO) "No compiler1 ($(@:test_%=%)) for ARCH_DATA_MODEL=$(ARCH_DATA_MODEL)"
    endif
  
  # Zero test targets
! test_productzero test_optimizedzero test_fastdebugzero test_jvmgzero:
! test_productzero test_optimizedzero test_fastdebugzero test_debugzero:
          @$(MAKE) generic_test ALTJVM_DIR="$(ZERO_DIR)/$(@:test_%zero=%)"
  
  # Shark test targets
! test_productshark test_optimizedshark test_fastdebugshark test_jvmgshark:
! test_productshark test_optimizedshark test_fastdebugshark test_debugshark:
          @$(MAKE) generic_test ALTJVM_DIR="$(SHARK_DIR)/$(@:test_%shark=%)"
  
  # Minimal1 test targets
! test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_jvmgminimal1:
! test_productminimal1 test_optimizedminimal1 test_fastdebugminimal1 test_debugminimal1:
          @$(MAKE) generic_test ALTJVM_DIR="$(MINIMAL1_DIR)/$(@:test_%minimal1=%)"
  
  
  test_jdk:
    ifeq ($(JVM_VARIANT_CLIENT), true)

*** 635,645 ****
--- 635,645 ----
          @$(ECHO) "help:             This help message"
          @$(ECHO) "all:              Same as: all_product all_fastdebug"
          @$(ECHO) "world:            Same as: all create_jdk"
          @$(ECHO) "all_product:      Same as: product product1 export_product"
          @$(ECHO) "all_fastdebug:    Same as: fastdebug fastdebug1 export_fastdebug"
!         @$(ECHO) "all_debug:        Same as: jvmg jvmg1 export_debug"
!         @$(ECHO) "all_debug:        Same as: debug debug1 export_debug"
          @$(ECHO) "all_optimized:    Same as: optimized optimized1 export_optimized"
          @$(ECHO) "clean:            Clean all areas"
          @$(ECHO) "export_product:   Export product files to EXPORT_PATH"
          @$(ECHO) "export_fastdebug: Export fastdebug files to EXPORT_PATH"
          @$(ECHO) "export_debug:     Export debug files to EXPORT_PATH"

*** 739,748 ****
--- 739,765 ----
  ifeq ($(MACOSX_UNIVERSAL),true)
  include $(GAMMADIR)/make/$(OSNAME)/makefiles/universal.gmk
  endif
  endif
  
+ # Compatibility for transition to new naming
+ warn_jvmg_deprecated:
+         echo "Warning: The jvmg target has been replaced with debug"
+         echo "Warning: Please update your usage"
+ 
+ jvmg: warn_jvmg_deprecated debug
+ 
+ jvmg1: warn_jvmg_deprecated debug1
+ 
+ jvmgminimal1: warn_jvmg_deprecated debugminimal1
+ 
+ jvmgcore: warn_jvmg_deprecated debugcore
+ 
+ jvmgzero: warn_jvmg_deprecated debugzero
+ 
+ jvmgshark: warn_jvmg_deprecated debugshark
+ 
  # JPRT rule to build this workspace
  include $(GAMMADIR)/make/jprt.gmk
  
  .PHONY: all world clobber clean help $(C1_VM_TARGETS) $(C2_VM_TARGETS) \
          $(MINIMAL1_VM_TARGETS) \