diff --git a/icu4c/source/common/propname.cpp b/icu4c/source/common/propname.cpp
index 9e491c92b6..95d7e9b26a 100644
--- a/icu4c/source/common/propname.cpp
+++ b/icu4c/source/common/propname.cpp
@@ -233,7 +233,7 @@ isPNameAcceptable(void* /*context*/,
         info->formatVersion[0] == PNAME_FORMAT_VERSION;
 }
 
-static UBool U_CALLCONV pname_cleanup() {
+static UBool U_CALLCONV pname_cleanup(void) {
     if (UDATA) {
         udata_close(UDATA);
         UDATA = NULL;
diff --git a/icu4c/source/common/unorm.cpp b/icu4c/source/common/unorm.cpp
index ed2d94ef22..ee4e9fc749 100644
--- a/icu4c/source/common/unorm.cpp
+++ b/icu4c/source/common/unorm.cpp
@@ -226,7 +226,7 @@ static UnicodeSet *nxCache[_NORM_OPTIONS_SETS_MASK+1]={ NULL };
 U_CDECL_BEGIN
 
 static UBool U_CALLCONV
-unorm_cleanup() {
+unorm_cleanup(void) {
     int32_t i;
 
 #if !UNORM_HARDCODE_DATA
diff --git a/icu4c/source/config/mh-aix-gcc b/icu4c/source/config/mh-aix-gcc
index a5d4e91150..54274da27c 100644
--- a/icu4c/source/config/mh-aix-gcc
+++ b/icu4c/source/config/mh-aix-gcc
@@ -1,5 +1,5 @@
 ## -*-makefile-*-
-## Copyright (c) 2003-2004 IBM, Ken Foskey, and others. All rights reserved.
+## Copyright (c) 2003-2005 IBM, Ken Foskey, and others. All rights reserved.
 ##
 ## Aix-specific setup (for gcc)
 ##
@@ -29,6 +29,9 @@ LD_RPATH_PRE=
 ## enable the shared lib loader
 LDFLAGS += -Wl,-bbigtoc
 
+## These are the library specific LDFLAGS
+LDFLAGSICUDT=-nodefaultlibs -nostdlib
+
 ## We need to delete things prior to linking, or else we'll get
 ## SEVERE ERROR: output file in use ..  on AIX. 
 ## But, shell script version should NOT delete target as we don't
@@ -54,6 +57,9 @@ endif
 ## Compiler switch to embed a library name. Not present on AIX.
 LD_SONAME = 
 
+## The type of assembly needed when pkgdata is used for generating shared libraries.
+GENCCODE_ASSEMBLY=-a xlc
+
 ## Shared object suffix
 SO=	a
 A=	a
diff --git a/icu4c/source/i18n/timezone.cpp b/icu4c/source/i18n/timezone.cpp
index d0237f31ca..79ecf4feef 100644
--- a/icu4c/source/i18n/timezone.cpp
+++ b/icu4c/source/i18n/timezone.cpp
@@ -107,7 +107,7 @@ static UnicodeString* OLSON_IDS = 0;
 #endif
 
 U_CDECL_BEGIN
-static UBool U_CALLCONV timeZone_cleanup()
+static UBool U_CALLCONV timeZone_cleanup(void)
 {
 #ifdef U_USE_TIMEZONE_OBSOLETE_2_8
     delete []OLSON_IDS;
diff --git a/icu4c/source/tools/pkgdata/dllmode.c b/icu4c/source/tools/pkgdata/dllmode.c
index f3b7043238..e6221977e6 100644
--- a/icu4c/source/tools/pkgdata/dllmode.c
+++ b/icu4c/source/tools/pkgdata/dllmode.c
@@ -1,6 +1,6 @@
 /******************************************************************************
 *
-*   Copyright (C) 2000-2004, International Business Machines
+*   Copyright (C) 2000-2005, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -151,7 +151,10 @@ void pkg_mode_dll(UPKGOptions *o, FileStream *makefile, UErrorCode *status)
                                          "\t  echo $$file >> $@; \\\n"
                                          "\tdone;\n\n");
     }
-    
+ 
+    sprintf(tmp, "TOCSYM= %s_dat \n\n", o->entryName); /* entrypoint not always shortname! */
+    T_FileStream_writeLine(makefile, tmp);
+
     pkg_mak_writeAssemblyHeader(makefile, o);
 
     sprintf(tmp,"$(TEMP_DIR)/$(NAME)_dat.o : $(TEMP_DIR)/$(NAME)_dat.c\n"
@@ -184,9 +187,6 @@ void pkg_mode_dll(UPKGOptions *o, FileStream *makefile, UErrorCode *status)
     T_FileStream_writeLine(makefile, tmp);
 #endif
 
-    sprintf(tmp, "TOCSYM= %s_dat \n\n", o->entryName); /* entrypoint not always shortname! */
-    T_FileStream_writeLine(makefile, tmp);
-    
     T_FileStream_writeLine(makefile, "BASE_OBJECTS= $(TOCOBJ) ");
 #ifdef OS400
     T_FileStream_writeLine(makefile, "$(ALLDATAOBJ) ");