make/linux/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.
*** 53,64 ****
  LINK_LAUNCHER = $(LINK.c)
  
  LINK_LAUNCHER/PRE_HOOK  = $(LINK_LIB.CC/PRE_HOOK)
  LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK)
  
  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'; \
--- 53,72 ----
  LINK_LAUNCHER = $(LINK.c)
  
  LINK_LAUNCHER/PRE_HOOK  = $(LINK_LIB.CC/PRE_HOOK)
  LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK)
  
+ # 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'; \