diff --git a/import/Make.defs b/import/Make.defs
index 056d9b7fe..e2705f372 100644
--- a/import/Make.defs
+++ b/import/Make.defs
@@ -163,10 +163,13 @@ else
   ARCHCRT0OBJ = $(TOPDIR)$(DELIM)startup$(DELIM)crt0$(OBJEXT)
 endif
 
-CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+ARCHCFLAGS += -fno-common -pipe
+ARCHCXXFLAGS += -fno-common -pipe
+
+CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
 
-CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
+CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
 CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
 
 # ELF module definitions