gwj / at91sam9263 · Commits

Commit d80438aad5b1ef6e11c7b5003665331cb68f193c

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent ffada369

We can wrap ARCH_CFLAGS/ARCH_LDFLAGS in CFLAGS/LDFLAGS at configure time 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 4 changed files with 2 additions and 17 deletions
Makefile
  View file @d80438a
@@ -16,10 +16,6 @@ endif @@ -16,10 +16,6 @@ endif
16 16
17 VPATH=$(SRC_PATH):$(SRC_PATH)/hw 17 VPATH=$(SRC_PATH):$(SRC_PATH)/hw
18 18
19 -  
20 -CFLAGS += $(ARCH_CFLAGS)  
21 -LDFLAGS += $(ARCH_LDFLAGS)  
22 -  
23 CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@ 19 CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
24 CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 20 CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
25 CPPFLAGS += -U_FORTIFY_SOURCE 21 CPPFLAGS += -U_FORTIFY_SOURCE
Makefile.hw
  View file @d80438a
@@ -8,9 +8,6 @@ include $(SRC_PATH)/rules.mak @@ -8,9 +8,6 @@ include $(SRC_PATH)/rules.mak
8 8
9 VPATH=$(SRC_PATH):$(SRC_PATH)/hw 9 VPATH=$(SRC_PATH):$(SRC_PATH)/hw
10 10
11 -CFLAGS += $(ARCH_CFLAGS)  
12 -LDFLAGS += $(ARCH_LDFLAGS)  
13 -  
14 CPPFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@ 11 CPPFLAGS += -I. -I.. -I$(SRC_PATH) -MMD -MP -MT $@
15 CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 12 CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
16 CPPFLAGS+=-I$(SRC_PATH)/fpu 13 CPPFLAGS+=-I$(SRC_PATH)/fpu
Makefile.target
  View file @d80438a
@@ -60,9 +60,6 @@ ifeq ($(ARCH),ia64) @@ -60,9 +60,6 @@ ifeq ($(ARCH),ia64)
60 CFLAGS+=-mno-sdata 60 CFLAGS+=-mno-sdata
61 endif 61 endif
62 62
63 -CFLAGS+= $(ARCH_CFLAGS)  
64 -LDFLAGS+= $(ARCH_LDFLAGS)  
65 -  
66 CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 63 CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
67 CPPFLAGS+=-U_FORTIFY_SOURCE 64 CPPFLAGS+=-U_FORTIFY_SOURCE
68 LIBS+=-lm 65 LIBS+=-lm
configure
  View file @d80438a
@@ -1489,13 +1489,8 @@ echo &quot;HOST_CC=$host_cc&quot; &gt;&gt; $config_mak @@ -1489,13 +1489,8 @@ echo &quot;HOST_CC=$host_cc&quot; &gt;&gt; $config_mak
1489 echo "AR=$ar" >> $config_mak 1489 echo "AR=$ar" >> $config_mak
1490 echo "OBJCOPY=$objcopy" >> $config_mak 1490 echo "OBJCOPY=$objcopy" >> $config_mak
1491 echo "LD=$ld" >> $config_mak 1491 echo "LD=$ld" >> $config_mak
1492 -# XXX: only use CFLAGS and LDFLAGS ?  
1493 -# XXX: should export HOST_CFLAGS and HOST_LDFLAGS for cross  
1494 -# compilation of dyngen tool (useful for win32 build on Linux host)  
1495 -echo "ARCH_CFLAGS=$ARCH_CFLAGS" >> $config_mak  
1496 -echo "ARCH_LDFLAGS=$ARCH_LDFLAGS" >> $config_mak  
1497 -echo "CFLAGS=$CFLAGS $OS_CFLAGS $EXTRA_CFLAGS" >> $config_mak  
1498 -echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $EXTRA_LDFLAGS" >> $config_mak 1492 +echo "CFLAGS=$CFLAGS $OS_CFLAGS $ARCH_CFLAGS $EXTRA_CFLAGS" >> $config_mak
  1493 +echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS $EXTRA_LDFLAGS" >> $config_mak
1499 echo "EXESUF=$EXESUF" >> $config_mak 1494 echo "EXESUF=$EXESUF" >> $config_mak
1500 echo "PTHREADLIBS=$PTHREADLIBS" >> $config_mak 1495 echo "PTHREADLIBS=$PTHREADLIBS" >> $config_mak
1501 echo "CLOCKLIBS=$CLOCKLIBS" >> $config_mak 1496 echo "CLOCKLIBS=$CLOCKLIBS" >> $config_mak