--- old/make/linux/makefiles/launcher.make	2010-10-28 13:45:57.000000000 +0200
+++ new/make/linux/makefiles/launcher.make	2010-10-28 13:45:56.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
+# 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
@@ -55,8 +55,16 @@
 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)
+	$(CC) -g -c -o $@ launcher.c $(LAUNCHERFLAGS) $(CPPFLAGS) $(LAUNCHER_TARGET_DEFINES)
 
 launcher.c:
 	@echo Generating $@