--- gcc/config/tower.h	2018/04/24 17:51:38	1.1.1.1
+++ gcc/config/tower.h	2018/04/24 18:06:24	1.1.1.3
@@ -69,17 +69,15 @@ the Free Software Foundation, 675 Mass A
 "%{p:%{m68881:-L/usr/lib/fp/libp} -L/usr/lib/libp}             \
  %{m68881:-L/usr/lib/fp}"
 
-#define LIB_SPEC "-lc %{m68881:/usr/lib/fp/crtn.o}%{!m68881:/lib/crtn.o}"
+#define LIB_SPEC \
+"%{shlib:-lc_s} -lc crtend.o%s \
+ %{m68881:/usr/lib/fp/crtn.o}%{!m68881:/lib/crtn.o}"
 
 /* Use mem* functions, recognize #ident lines.  */
 
 #define TARGET_MEM_FUNCTIONS
 #define IDENT_DIRECTIVE
 
-/* This is only used in g++, don't prepend underscore.  */
-
-#define NO_UNDERSCORES
-
 /* Every structure and union's size must be a multiple of two bytes.  */
 
 #define STRUCTURE_SIZE_BOUNDARY 16
@@ -90,11 +88,7 @@ the Free Software Foundation, 675 Mass A
 #define REGISTER_NAMES \
 {"%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",                      \
  "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%a6", "%sp",                      \
- "%fp0", "%fp1", "%fp2", "%fp3", "%fp4", "%fp5", "%fp6", "%fp7",              \
- "%fpa0", "%fpa1", "%fpa2", "%fpa3", "%fpa4", "%fpa5", "%fpa6", "%fpa7",      \
- "%fpa8", "%fpa9", "%fpa10", "%fpa11", "%fpa12", "%fpa13", "%fpa14", "%fpa15",\
- "%fpa16","%fpa17", "%fpa18", "%fpa19", "%fpa20", "%fpa21", "%fpa22","%fpa23",\
- "%fpa24","%fpa25", "%fpa26", "%fpa27", "%fpa28", "%fpa29", "%fpa30","%fpa31"}
+ "%fp0", "%fp1", "%fp2", "%fp3", "%fp4", "%fp5", "%fp6", "%fp7"};
 
 /* We do not want leading underscores.  */