4 files changed, 17 insertions, 9 deletions
diff --git a/ld/emultempl/spu_inc.s b/ld/emultempl/spu_inc.s
index 243bd10..29a076c 100644
--- a/ld/emultempl/spu_inc.s
+++ b/ld/emultempl/spu_inc.s
@@ -1,7 +1,7 @@
  .text
- .globl _binary_builtin_ovl_mgr_start
- .globl _binary_builtin_ovl_mgr_end
+ .globl _binary_spu_ovl_o_start
+ .globl _binary_spu_ovl_o_end
 
-_binary_builtin_ovl_mgr_start:
+_binary_spu_ovl_o_start:
  .incbin "spu_ovl.o"
-_binary_builtin_ovl_mgr_end:
+_binary_spu_ovl_o_end:
diff --git a/ld/emultempl/spu_none.s b/ld/emultempl/spu_none.s
new file mode 100644
index 0000000..f0d2318
--- /dev/null
+++ b/ld/emultempl/spu_none.s
@@ -0,0 +1,6 @@
+ .text
+ .globl _binary_spu_ovl_o_start
+ .globl _binary_spu_ovl_o_end
+
+_binary_spu_ovl_o_start:
+_binary_spu_ovl_o_end:
diff --git a/ld/emultempl/spu_ovl.S b/ld/emultempl/spu_ovl.S
index 3af4fd8..53d82a4 100644
--- a/ld/emultempl/spu_ovl.S
+++ b/ld/emultempl/spu_ovl.S
@@ -1,6 +1,6 @@
 /* Overlay manager for SPU.
 
-   Copyright 2006 Free Software Foundation, Inc.
+   Copyright 2006, 2007 Free Software Foundation, Inc.
 
    This file is part of GLD, the Gnu Linker.
 
diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em
index de6a914..95b1cb2 100644
--- a/ld/emultempl/spuelf.em
+++ b/ld/emultempl/spuelf.em
@@ -38,12 +38,12 @@ static int emit_stub_syms = 0;
 static bfd_vma local_store_lo = 0;
 static bfd_vma local_store_hi = 0x3ffff;
 
-extern void *_binary_builtin_ovl_mgr_start;
-extern void *_binary_builtin_ovl_mgr_end;
+extern void *_binary_spu_ovl_o_start;
+extern void *_binary_spu_ovl_o_end;
 
 static const struct _ovl_stream ovl_mgr_stream = {
-  &_binary_builtin_ovl_mgr_start,
-  &_binary_builtin_ovl_mgr_end
+  &_binary_spu_ovl_o_start,
+  &_binary_spu_ovl_o_end
 };
 
 static asection *toe = NULL;
@@ -118,6 +118,8 @@ spu_elf_load_ovl_mgr (void)
     {
       /* User supplied __ovly_load.  */
     }
+  else if (ovl_mgr_stream.start == ovl_mgr_stream.end)
+    einfo ("%F%P: no built-in overlay manager\n");
   else
     {
       lang_input_statement_type *ovl_is;