diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a35f4444740..cece0d34ea8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-29  Kazu Hirata  <kazu@cs.umass.edu>
+
+	* dwarf2out.c (add_AT_string): Replace ggc_alloc_string (X,
+	-1) with ggc_strdup.
+	* stmt.c (expand_asm_operands): Likewise.
+	* config/rs6000/rs6000.md (builtin_setjmp_receiver): Likewise.
+
 2003-06-28  Kazu Hirata  <kazu@cs.umass.edu>
 
 	* config/ip2k/ip2k.c (ip2k_reorg): Use INSN_P instead of its
diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md
index ef98de05332..1e891f1f441 100644
--- a/gcc/config/rs6000/rs6000.md
+++ b/gcc/config/rs6000/rs6000.md
@@ -10141,14 +10141,14 @@
   if (DEFAULT_ABI == ABI_DARWIN)
     {
       const char *picbase = machopic_function_base_name ();
-      rtx picrtx = gen_rtx_SYMBOL_REF (Pmode, ggc_alloc_string (picbase, -1));
+      rtx picrtx = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (picbase));
       rtx picreg = gen_rtx_REG (Pmode, RS6000_PIC_OFFSET_TABLE_REGNUM);
       rtx tmplabrtx;
       char tmplab[20];
 
       ASM_GENERATE_INTERNAL_LABEL(tmplab, \"LSJR\",
 				  CODE_LABEL_NUMBER (operands[0]));
-      tmplabrtx = gen_rtx_SYMBOL_REF (Pmode, ggc_alloc_string (tmplab, -1));
+      tmplabrtx = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (tmplab));
 
       emit_insn (gen_load_macho_picbase (picreg, tmplabrtx));
       emit_insn (gen_macho_correct_pic (picreg, picreg, picrtx, tmplabrtx));
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 6890e5a2797..4ae09b14f14 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -4703,7 +4703,7 @@ add_AT_string (die, attr_kind, str)
   if (*slot == NULL)
     *slot = ggc_alloc_cleared (sizeof (struct indirect_string_node));
   node = (struct indirect_string_node *) *slot;
-  node->str = ggc_alloc_string (str, -1);
+  node->str = ggc_strdup (str);
   node->refcount++;
 
   attr->dw_attr_next = NULL;
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 39e41ff6dc5..b592a33d867 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -1830,7 +1830,7 @@ expand_asm_operands (string, outputs, inputs, clobbers, vol, filename, line)
 
       sprintf (buffer, "%d", j);
       ASM_OPERANDS_INPUT_CONSTRAINT_EXP (body, ninputs - ninout + i)
-	= gen_rtx_ASM_INPUT (inout_mode[i], ggc_alloc_string (buffer, -1));
+	= gen_rtx_ASM_INPUT (inout_mode[i], ggc_strdup (buffer));
     }
 
   generating_concat_p = old_generating_concat_p;