5 files changed, 7 insertions, 5 deletions
diff --git a/bsps/sh/gensh4/console/console.c b/bsps/sh/gensh4/console/console.c
index 917556df4e..02c43786d5 100644
--- a/bsps/sh/gensh4/console/console.c
+++ b/bsps/sh/gensh4/console/console.c
@@ -284,7 +284,7 @@ console_open(rtems_device_major_number major,
         console_set_attributes,    /* setAttributes */
         console_stop_remote_tx,    /* stopRemoteTx */
         console_start_remote_tx,   /* startRemoteTx */
-        1                          /* outputUsesInterrupts */
+        TERMIOS_IRQ_DRIVEN         /* outputUsesInterrupts */
     };
     static const rtems_termios_callbacks poll_callbacks = {
         console_first_open,        /* firstOpen */
@@ -294,7 +294,7 @@ console_open(rtems_device_major_number major,
         console_set_attributes,    /* setAttributes */
         console_stop_remote_tx,    /* stopRemoteTx */
         console_start_remote_tx,   /* startRemoteTx */
-        0                          /* outputUsesInterrupts */
+        TERMIOS_POLLED             /* outputUsesInterrupts */
     };
 
     switch (console_mode)
diff --git a/bsps/sh/gensh4/include/tm27.h b/bsps/sh/gensh4/include/tm27.h
index c26ec49272..978bf8505a 100644
--- a/bsps/sh/gensh4/include/tm27.h
+++ b/bsps/sh/gensh4/include/tm27.h
@@ -27,6 +27,8 @@
 #   error "..."
 #endif
 
+#define TM27_USE_VECTOR_HANDLER
+
 #define Install_tm27_vector( handler ) \
 { \
     rtems_isr_entry old_handler; \
diff --git a/bsps/sh/gensh4/start/linkcmds b/bsps/sh/gensh4/start/linkcmds
index b940aadb2b..b0a4baeef4 100644
--- a/bsps/sh/gensh4/start/linkcmds
+++ b/bsps/sh/gensh4/start/linkcmds
@@ -146,7 +146,7 @@ SECTIONS
   } > ram
 
   .noinit (NOLOAD) : {
-    *(.noinit*)
+    *(SORT_BY_NAME (SORT_BY_ALIGNMENT (.noinit*)))
   } > ram
 
   .rtemsstack (NOLOAD) : {
diff --git a/bsps/sh/gensh4/start/linkcmds.rom b/bsps/sh/gensh4/start/linkcmds.rom
index 704b624f01..127bc38763 100644
--- a/bsps/sh/gensh4/start/linkcmds.rom
+++ b/bsps/sh/gensh4/start/linkcmds.rom
@@ -189,7 +189,7 @@ SECTIONS
   } > ram
 
   .noinit (NOLOAD) : {
-    *(.noinit*)
+    *(SORT_BY_NAME (SORT_BY_ALIGNMENT (.noinit*)))
   } > ram
 
   .rtemsstack (NOLOAD) : {
diff --git a/bsps/sh/gensh4/start/linkcmds.rom2ram b/bsps/sh/gensh4/start/linkcmds.rom2ram
index 6785556416..89d8c59bd1 100644
--- a/bsps/sh/gensh4/start/linkcmds.rom2ram
+++ b/bsps/sh/gensh4/start/linkcmds.rom2ram
@@ -193,7 +193,7 @@ SECTIONS
     } >ram
 
   .noinit (NOLOAD) : {
-    *(.noinit*)
+    *(SORT_BY_NAME (SORT_BY_ALIGNMENT (.noinit*)))
   } > ram
 
   .rtemsstack (NOLOAD) : {