Changeset 4f14436 in freewrt for target/linux

Timestamp:

Jul 5, 2006, 11:01:51 PM (19 years ago)

Author:

Thorsten Glaser <tg@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

324cbe7

Parents:

8d193bb

Message:

Fix the issue of overridden $(TOPDIR) within buildroot.
Patch from Markus Wigge; ok to commit wbx@

I chose to integrate it here and regenerate these patches
while at it.

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@170 afb5a338-a214-0410-bd46-81f09a774fd1

File:

• target/linux/generic-2.4/patches/050-build_flags.patch (modified) (5 diffs)

target/linux/generic-2.4/patches/050-build_flags.patch

@@ -1 @@
-diff -ur linux-2.4.32/arch/mips/Makefile linux-2.4.32-openwrt/arch/mips/Makefile
---- linux-2.4.32/arch/mips/Makefile     2005-12-15 13:53:59.000000000 +0100
-+++ linux-2.4.32-openwrt/arch/mips/Makefile     2005-12-15 14:02:33.000000000 +0100
-@@ -44,10 +44,10 @@
+diff -pruN linux-2.4.32.orig/Makefile linux-2.4.32/Makefile
+--- linux-2.4.32.orig/Makefile  Wed Nov 16 19:12:32 2005
++++ linux-2.4.32/Makefile       Wed Jul  5 20:59:26 2006
+@@ -11,13 +11,14 @@ KERNELPATH=kernel-$(shell echo $(KERNELR
+ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
+          else if [ -x /bin/bash ]; then echo /bin/bash; \
+          else echo sh; fi ; fi)
+-TOPDIR := $(shell /bin/pwd)
++override TOPDIR        := $(shell /bin/pwd)
++MAKE := $(MAKE) TOPDIR=$(TOPDIR)
+ 
+ HPATH          = $(TOPDIR)/include
+ FINDHPATH      = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu
+ 
+ HOSTCC         = gcc
+-HOSTCFLAGS     = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
++HOSTCFLAGS     = -Wall -Wstrict-prototypes -Os -fomit-frame-pointer
+ 
+ CROSS_COMPILE  =
+ 
+@@ -88,10 +89,9 @@ export MODLIB
+ #
+ # standard CFLAGS
+ #
+-
+ CPPFLAGS := -D__KERNEL__ -I$(HPATH)
+ 
+-CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
++CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -Os \
+          -fno-strict-aliasing -fno-common
+ ifndef CONFIG_FRAME_POINTER
+ CFLAGS += -fomit-frame-pointer
+@@ -106,6 +106,8 @@ AFLAGS := -D__ASSEMBLY__ $(CPPFLAGS)
+ #
+ 
+ export ROOT_DEV = CURRENT
++
++CFLAGS += $(call check_gcc, -funit-at-a-time,)
+ 
+ #
+ # If you want to preset the SVGA mode, uncomment the next line and
+diff -pruN linux-2.4.32.orig/arch/mips/Makefile linux-2.4.32/arch/mips/Makefile
+--- linux-2.4.32.orig/arch/mips/Makefile        Wed Jan 19 14:09:04 2005
++++ linux-2.4.32/arch/mips/Makefile     Wed Jul  5 20:59:13 2006
+@@ -46,10 +46,10 @@ check_gcc = $(shell if $(CC) $(1) -S -o 
  GCCFLAGS       := -I $(TOPDIR)/include/asm/gcc
  GCCFLAGS       += -G 0 -mno-abicalls -fno-pic -pipe
@@ -16 +57 @@
  ifdef CONFIG_SB1XXX_CORELIS
  GCCFLAGS       += -mno-sched-prolog -fno-omit-frame-pointer
-@@ -69,13 +69,13 @@
+@@ -71,13 +71,13 @@ endif
  set_gccflags = $(shell \
  while :; do \
@@ -32 +73 @@
                         -xc /dev/null > /dev/null 2>&1 && \
                         break 2; \
-@@ -90,7 +90,7 @@
+@@ -92,7 +92,7 @@ else \
  fi; \
  gas_abi=-Wa,-32; gas_cpu=$$cpu; gas_isa=-Wa,$$isa; \
@@ -41 +82 @@
                         -o /dev/null -xassembler /dev/null > /dev/null 2>&1 && \
                         break 2; \
-@@ -172,6 +172,7 @@
+@@ -174,6 +174,7 @@ endif
  endif
  
@@ -49 +90 @@
  
  LD             += -m $(ld-emul)
-diff -ur linux-2.4.32/Makefile linux-2.4.32-openwrt/Makefile
---- linux-2.4.32/Makefile       2005-12-15 13:53:59.000000000 +0100
-+++ linux-2.4.32-openwrt/Makefile       2005-12-15 13:59:30.000000000 +0100
-@@ -17,7 +17,7 @@
- FINDHPATH      = $(HPATH)/asm $(HPATH)/linux $(HPATH)/scsi $(HPATH)/net $(HPATH)/math-emu
- 
- HOSTCC         = gcc
--HOSTCFLAGS     = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer
-+HOSTCFLAGS     = -Wall -Wstrict-prototypes -Os -fomit-frame-pointer
- 
- CROSS_COMPILE  =
- 
-@@ -88,10 +88,9 @@
- #
- # standard CFLAGS
- #
--
- CPPFLAGS := -D__KERNEL__ -I$(HPATH)
- 
--CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -O2 \
-+CFLAGS := $(CPPFLAGS) -Wall -Wstrict-prototypes -Wno-trigraphs -Os \
-          -fno-strict-aliasing -fno-common
- CFLAGS += -fno-builtin-sprintf
- ifndef CONFIG_FRAME_POINTER
-@@ -104,6 +103,8 @@
- # disable pointer signedness warnings in gcc 4.0
- CFLAGS += $(call check_gcc,-Wno-pointer-sign,)
- 
-+CFLAGS += $(call check_gcc, -funit-at-a-time,)
-+
- #
- # ROOT_DEV specifies the default root-device when making the image.
- # This can be either FLOPPY, CURRENT, /dev/xxxx or empty, in which case