Merge pull request #657 from micmac1/kam-arm
kamailio: prevent arm -march overrides
This commit is contained in:
commit
27673cd5e3
2 changed files with 30 additions and 1 deletions
|
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
||||||
|
|
||||||
PKG_NAME:=kamailio
|
PKG_NAME:=kamailio
|
||||||
PKG_VERSION:=5.5.0
|
PKG_VERSION:=5.5.0
|
||||||
PKG_RELEASE:=1
|
PKG_RELEASE:=2
|
||||||
|
|
||||||
PKG_SOURCE_URL:=https://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src
|
PKG_SOURCE_URL:=https://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src
|
||||||
PKG_SOURCE:=kamailio-$(PKG_VERSION)_src.tar.gz
|
PKG_SOURCE:=kamailio-$(PKG_VERSION)_src.tar.gz
|
||||||
|
|
29
net/kamailio/patches/070-dont-override-arm-march.patch
Normal file
29
net/kamailio/patches/070-dont-override-arm-march.patch
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
--- a/src/Makefile.defs
|
||||||
|
+++ b/src/Makefile.defs
|
||||||
|
@@ -1260,7 +1260,7 @@ ifeq ($(ARCH), arm)
|
||||||
|
ifeq ($(CC_NAME), gcc)
|
||||||
|
C_DEFS+=-DCC_GCC_LIKE_ASM
|
||||||
|
#common stuff
|
||||||
|
- CFLAGS=-marm -march=armv5t $(CC_OPT) -fsigned-char $(PROFILE)
|
||||||
|
+ CFLAGS=-marm $(CC_OPT) -fsigned-char $(PROFILE)
|
||||||
|
#if gcc 4.5+ or 4.2+
|
||||||
|
ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))
|
||||||
|
CFLAGS+= -ftree-vectorize -fno-strict-overflow
|
||||||
|
@@ -1308,7 +1308,7 @@ ifeq ($(ARCH), arm6)
|
||||||
|
ifeq ($(CC_NAME), gcc)
|
||||||
|
C_DEFS+=-DCC_GCC_LIKE_ASM
|
||||||
|
#common stuff
|
||||||
|
- CFLAGS=-march=armv6 $(CC_OPT) -fsigned-char \
|
||||||
|
+ CFLAGS=$(CC_OPT) -fsigned-char \
|
||||||
|
$(PROFILE)
|
||||||
|
#if gcc 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+
|
||||||
|
ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))
|
||||||
|
@@ -1355,7 +1355,7 @@ ifeq ($(ARCH), arm7)
|
||||||
|
ifeq ($(CC_NAME), gcc)
|
||||||
|
C_DEFS+=-DCC_GCC_LIKE_ASM
|
||||||
|
#common stuff, use armv7-a as lowest common architecture
|
||||||
|
- CFLAGS=-march=armv7-a $(CC_OPT) -fsigned-char \
|
||||||
|
+ CFLAGS=$(CC_OPT) -fsigned-char \
|
||||||
|
$(PROFILE)
|
||||||
|
#if gcc 7.0+, 6.0+, 5.0+, 4.5+ or 4.2+
|
||||||
|
ifeq (,$(strip $(filter-out 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER))))
|
Loading…
Reference in a new issue