--- old/makefiles/CompileLaunchers.gmk	2013-05-08 19:01:25.199409385 +0200
+++ new/makefiles/CompileLaunchers.gmk	2013-05-08 19:01:25.039410672 +0200
@@ -103,6 +103,10 @@
         $1_LDFLAGS_SUFFIX += -pthread
     endif
 
+    ifeq ($(OPENJDK_TARGET_OS), aix)
+	$1_LDFLAGS_SUFFIX += -L$(JDK_OUTPUTDIR)/objs -ljli_static
+    endif
+
     ifeq ($(USE_EXTERNAL_LIBZ), true)
         $1_LDFLAGS_SUFFIX += -lz
     endif
@@ -160,6 +164,7 @@
 	MAPFILE := $$($1_MAPFILE), \
         LDFLAGS_SUFFIX:=$(LDFLAGS_JDKEXE_SUFFIX) $$($1_LDFLAGS_SUFFIX),\
 	LDFLAGS_SUFFIX_posix:=$4,\
+	LDFLAGS_SUFFIX_aix:=-lpthread,\
 	LDFLAGS_SUFFIX_windows:=$$($1_WINDOWS_JLI_LIB) \
 			       $(JDK_OUTPUTDIR)/objs/libjava/java.lib advapi32.lib $5,\
 	LDFLAGS_SUFFIX_linux:=-L$(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)/jli -ljli $(LIBDL) -lc, \
@@ -178,7 +183,7 @@
 
     BUILD_LAUNCHERS += $$(BUILD_LAUNCHER_$1)
 
-    ifeq ($(OPENJDK_TARGET_OS),macosx)
+    ifneq (,$(filter $(OPENJDK_TARGET_OS), macosx aix))
         $$(BUILD_LAUNCHER_$1) : $(JDK_OUTPUTDIR)/objs/libjli_static.a
     endif