Browse code

- the cpu is no longer hard-wired to strongarm1100 on arm arch. (strongarm is still the default, but it can be overwritten by setting CPU in the environment or make command line) - libfl dependency removed (makes cross compiling easier)

(patch provided by Raphael Coeffic <rco@iptel.org> )

Andrei Pelinescu-Onciul authored on 10/10/2007 20:05:15
Showing 2 changed files
... ...
@@ -59,7 +59,7 @@ MAIN_NAME=ser
59 59
 VERSION = 0
60 60
 PATCHLEVEL = 9
61 61
 SUBLEVEL = 7
62
-EXTRAVERSION = -pre8
62
+EXTRAVERSION = -pre9
63 63
 
64 64
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
65 65
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
... ...
@@ -664,22 +664,23 @@ endif	#ARCH, sparc64
664 664
 
665 665
 	#if ipaq/netwinder
666 666
 ifeq	($(ARCH), arm)
667
-		# if gcc 
667
+		# if gcc
668 668
 ifeq		($(CC_NAME), gcc)
669 669
 				#common stuff
670 670
 				CFLAGS=-O9 -funroll-loops  -Wcast-align $(PROFILE) \
671
-					-Wall   
671
+					-Wall  
672
+				CPU ?= strongarm1100
672 673
 			#if gcc 4.x+
673 674
 ifeq			($(CC_SHORTVER), 4.x)
674
-					CFLAGS+=-mcpu=strongarm1100 -ftree-vectorize
675
+					CFLAGS+=-mcpu=$(CPU) -ftree-vectorize
675 676
 else
676 677
 			#if gcc 3.4+
677 678
 ifeq			($(CC_SHORTVER), 3.4)
678
-					CFLAGS+= -mcpu=strongarm1100
679
+					CFLAGS+= -mcpu=$(CPU)
679 680
 else
680 681
 			#if gcc 3.0
681 682
 ifeq			($(CC_SHORTVER), 3.0)
682
-					CFLAGS+= -mcpu=strongarm1100
683
+					CFLAGS+= -mcpu=$(CPU)
683 684
 							#-mcpu=athlon
684 685
 else
685 686
 ifeq			($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5])
... ...
@@ -978,7 +979,7 @@ ifeq ($(YACC),)
978 979
 endif
979 980
 YACC_FLAGS=-d -b cfg
980 981
 # on solaris add -lxnet (e.g. LIBS= -lxnet)
981
-LIBS= -lfl -ldl -lresolv
982
+LIBS= -ldl -lresolv
982 983
 
983 984
 
984 985
 #os specific stuff
... ...
@@ -611,3 +611,9 @@ static void count()
611 611
 }
612 612
 
613 613
 
614
+
615
+/* replacement yywrap, removes libfl dependency */
616
+int yywrap()
617
+{
618
+	return 1;
619
+}