diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 1346e2623..9f192b396 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,9 @@
+2007-05-30  Kazu Hirata  <kazu@codesourcery.com>
+
+	* m68k/cf-crt1.C, m68k/cf.sc, m68k/fido.sc, m68k/fido-crt0.S:
+	Replace __INIT_SECTION__ and __FINI_SECTION__ with _init and
+	_fini, respectively.
+
 2007-05-23 Patrick Mansfield <patmans@us.ibm.com>
 
 	* spu/syscalls.c: Change __send_to_ppe to return the result stored
diff --git a/libgloss/m68k/cf-crt1.c b/libgloss/m68k/cf-crt1.c
index a26acfd91..fb569675c 100644
--- a/libgloss/m68k/cf-crt1.c
+++ b/libgloss/m68k/cf-crt1.c
@@ -25,8 +25,8 @@ extern char __end[] __attribute__ ((aligned (4)));
 void *__heap_limit;
 extern void software_init_hook (void) __attribute__ ((weak));
 extern void hardware_init_hook (void) __attribute__ ((weak));
-extern void __INIT_SECTION__ (void);
-extern void __FINI_SECTION__ (void);
+extern void _init (void);
+extern void _fini (void);
 
 extern int main (int, char **, char **);
 
@@ -48,11 +48,11 @@ void __start1 (void *heap_limit)
   if (software_init_hook)
     software_init_hook ();
 
-  __INIT_SECTION__ ();
+  _init ();
 
   /* I'm not sure how useful it is to have a fini_section in an
      embedded system.  */
-  atexit (__FINI_SECTION__);
+  atexit (_fini);
   
   ix = main (0, NULL, NULL);
   exit (ix);
diff --git a/libgloss/m68k/cf.sc b/libgloss/m68k/cf.sc
index 5a3563af2..3c936d035 100644
--- a/libgloss/m68k/cf.sc
+++ b/libgloss/m68k/cf.sc
@@ -61,14 +61,14 @@ SECTIONS
     *(.eh_frame)
 
     . = ALIGN(0x4);
-    __INIT_SECTION__ = . ;
+    _init = . ;
     LONG (0x4e560000)	/* linkw %fp,#0 */
     *(.init)
     SHORT (0x4e5e)	/* unlk %fp */
     SHORT (0x4e75)	/* rts */
 
     . = ALIGN(0x4);
-    __FINI_SECTION__ = . ;
+    _fini = . ;
     LONG (0x4e560000)	/* linkw %fp,#0 */
     *(.fini)
     SHORT (0x4e5e)	/* unlk %fp */
diff --git a/libgloss/m68k/fido-crt0.S b/libgloss/m68k/fido-crt0.S
index 1ef573a4d..757d9eb21 100644
--- a/libgloss/m68k/fido-crt0.S
+++ b/libgloss/m68k/fido-crt0.S
@@ -283,10 +283,10 @@ SYM (_start):
 	movel	IMM (SYM(__do_global_dtors)),(sp)
 	jsr	SYM (atexit)
 #endif
-	movel	IMM (__FINI_SECTION__),(sp)
+	movel	IMM (_fini),(sp)
 	jsr	SYM (atexit)
 
-	jsr	__INIT_SECTION__
+	jsr	_init
 
 /*
  * call the main routine from the application to get it going.
diff --git a/libgloss/m68k/fido.sc b/libgloss/m68k/fido.sc
index 6d7f503ab..9b80b5080 100644
--- a/libgloss/m68k/fido.sc
+++ b/libgloss/m68k/fido.sc
@@ -167,13 +167,13 @@ SECTIONS {
     *(.eh_frame)
 
     . = ALIGN(0x2);
-    __INIT_SECTION__ = . ;
+    _init = . ;
     LONG (0x4e560000)	/* linkw %fp,#0 */
     *(.init)
     SHORT (0x4e5e)	/* unlk %fp */
     SHORT (0x4e75)	/* rts */
 
-    __FINI_SECTION__ = . ;
+    _fini = . ;
     LONG (0x4e560000)	/* linkw %fp,#0 */
     *(.fini)
     SHORT (0x4e5e)	/* unlk %fp */