diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d22c4cea4eb..ccd3f55d9d6 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2000-06-01  Richard Henderson  <rth@cygnus.com>
+
+	* decl.c (init_decl_processing): Set lang_get_alias_set first thing.
+
 2000-06-01  Richard Henderson  <rth@cygnus.com>
 
 	* decl2.c (unsupported_options): Fix typo, make const.
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 85de6ae96d3..55c7ba5d098 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -6251,6 +6251,8 @@ init_decl_processing ()
   int wchar_type_size;
   tree array_domain_type;
 
+  lang_get_alias_set = c_get_alias_set;
+
   /* Check to see that the user did not specify an invalid combination
      of command-line options.  */
   if (flag_new_abi && !flag_vtable_thunks)
@@ -6640,7 +6642,6 @@ init_decl_processing ()
   using_eh_for_cleanups ();
 
   print_error_function = lang_print_error_function;
-  lang_get_alias_set = &c_get_alias_set;
   valid_lang_attribute = cp_valid_lang_attribute;
 
   /* Maintain consistency.  Perhaps we should just complain if they