diff --git a/swsscommon/Makefile b/swsscommon/Makefile
index 79bdc572..7ca2a18e 100644
--- a/swsscommon/Makefile
+++ b/swsscommon/Makefile
@@ -6,6 +6,10 @@ SWIG_FLAG = -go -cgo -c++ -intgosize 64
 ifeq ($(CONFIGURED_ARCH),arm64)
 SWIG_FLAG += -DSWIGWORDSIZE64
 endif
+ifeq ($(CONFIGURED_ARCH),armhf)
+SWIG_FLAG = -go -cgo -c++ -intgosize 32 -DSWIGWORDSIZE32
+endif
+
 
 .PHONY: all clean
 
@@ -14,4 +18,4 @@ all:
 	$(SWIG) $(SWIG_FLAG) -I/usr/include/swss/ swsscommon.i
 
 clean:
-	$(RM) *.go *.cxx *.i
\ No newline at end of file
+	$(RM) *.go *.cxx *.i