make/solaris/makefiles/launcher.make

*** 1,7 ****
  #
! # Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
--- 1,7 ----
  #
! # Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.
*** 66,77 ****
  # Note: The blog says to use "-W0,-xglobalstatic", but that doesn't
  #       seem to work. I got "-W0,-noglobal" from Kelly and that works.
  #LAUNCHERFLAGS += -W0,-noglobal
  endif # Platform_compiler == sparcWorks
  
  launcher.o: launcher.c $(LAUNCHERDIR)/java.c $(LAUNCHERDIR)/java_md.c
!         $(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CPPFLAGS)
  
  launcher.c:
          @echo Generating $@
          $(QUIETLY) { \
          echo '#define debug launcher_debug'; \
--- 66,85 ----
  # Note: The blog says to use "-W0,-xglobalstatic", but that doesn't
  #       seem to work. I got "-W0,-noglobal" from Kelly and that works.
  #LAUNCHERFLAGS += -W0,-noglobal
  endif # Platform_compiler == sparcWorks
  
+ # Used for platform dispatching
+ LAUNCHER_TARGET_DEFINES  = -DTARGET_OS_FAMILY_$(Platform_os_family)
+ LAUNCHER_TARGET_DEFINES += -DTARGET_ARCH_$(Platform_arch)
+ LAUNCHER_TARGET_DEFINES += -DTARGET_ARCH_MODEL_$(Platform_arch_model)
+ LAUNCHER_TARGET_DEFINES += -DTARGET_OS_ARCH_$(Platform_os_arch)
+ LAUNCHER_TARGET_DEFINES += -DTARGET_OS_ARCH_MODEL_$(Platform_os_arch_model)
+ LAUNCHER_TARGET_DEFINES += -DTARGET_COMPILER_$(Platform_compiler)
+ 
  launcher.o: launcher.c $(LAUNCHERDIR)/java.c $(LAUNCHERDIR)/java_md.c
!         $(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CPPFLAGS) ${LAUNCHER_TARGET_DEFINES}
  
  launcher.c:
          @echo Generating $@
          $(QUIETLY) { \
          echo '#define debug launcher_debug'; \