diff -r 62542b8be764 -r 7515a991bb37 jdk/makefiles/lib/Awt2dLibraries.gmk
--- a/jdk/makefiles/lib/Awt2dLibraries.gmk	Thu Nov 21 12:28:16 2013 -0800
+++ b/jdk/makefiles/lib/Awt2dLibraries.gmk	Tue Nov 26 16:40:31 2013 +0100
@@ -231,6 +231,10 @@
       $(JDK_TOPDIR)/src/$(OPENJDK_TARGET_OS_API_DIR)/native/sun/java2d/x11
 endif
 
+ifeq ($(OPENJDK_TARGET_OS), aix)
+  LIBAWT_DIRS += $(JDK_TOPDIR)/src/aix/porting
+endif
+
 LIBAWT_CFLAGS += -D__MEDIALIB_OLD_NAMES -D__USE_J2D_NAMES \
     $(X_CFLAGS) \
     $(foreach dir, $(LIBAWT_DIRS), -I$(dir))
@@ -309,6 +313,10 @@
   LIBAWT_FILES += awt_LoadLibrary.c initIDs.c img_colors.c
 endif
 
+ifeq ($(OPENJDK_TARGET_OS), aix)
+  LIBAWT_FILES += porting_aix.c
+endif
+
 ifeq ($(OPENJDK_TARGET_OS), macosx)
   LIBAWT_FILES += awt_LoadLibrary.c img_colors.c
   LIBAWT_CFLAGS += -F/System/Library/Frameworks/JavaVM.framework/Frameworks