[uClibc-cvs] uClibc Rules.mak,1.133,1.134

[Erik Andersen]

Update of /var/cvs/uClibc
In directory winder:/tmp/cvs-serv32077

Modified Files:
	Rules.mak 
Log Message:
Patch from Peter Kjellerstedt to make it simpler for arches to specify
either -fPIC or -fpic


Index: Rules.mak
===================================================================
RCS file: /var/cvs/uClibc/Rules.mak,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -d -r1.133 -r1.134
--- Rules.mak	14 Jun 2003 01:39:39 -0000	1.133
+++ Rules.mak	15 Jul 2003 07:44:34 -0000	1.134
@@ -108,6 +108,7 @@
 ARFLAGS:=r
 
 OPTIMIZATION:=
+PICFLAG:=-fPIC
 # Some nice CPU specific optimizations
 ifeq ($(strip $(TARGET_ARCH)),i386)
 	OPTIMIZATION+=$(call check_gcc,-mpreferred-stack-boundary=2,)
@@ -158,6 +159,7 @@
 ifeq ($(strip $(TARGET_ARCH)),cris)
 	CPU_LDFLAGS-$(CONFIG_CRIS):="-mcrislinux"
 	CPU_CFLAGS-$(CONFIG_CRIS):="-mlinux"
+	PICFLAG:=-fpic
 endif
 
 # use '-Os' optimization if available, else use -O2, allow Config to override
@@ -174,6 +176,7 @@
 
 ifeq ($(DODEBUG),y)
     CFLAGS += -g
+    #CFLAGS = $(XWARNINGS) -O0 -g $(CPU_CFLAGS) -fno-builtin -nostdinc -D_LIBC -I$(TOPDIR)include -I.
     LDFLAGS:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
     STRIPTOOL:= true -Since_we_are_debugging
 else
@@ -206,11 +209,7 @@
 
 CFLAGS_NOPIC:=$(CFLAGS)
 ifeq ($(DOPIC),y)
-ifeq ($(strip $(TARGET_ARCH)),cris)
-	CFLAGS += -fpic -mlinux
-else
-    CFLAGS += -fPIC
-endif
+    CFLAGS += $(PICFLAG)
 endif
 
 LIBGCC_CFLAGS ?= $(CFLAGS) $(CPU_CFLAGS-y)