Browse Source

Update build rules a bit. fix quoting problems. Update default
x86 compiler optimization to not force building i386 opcodes.

Eric Andersen 22 years ago
parent
commit
c52c2a24e3
4 changed files with 15 additions and 6 deletions
  1. 5 3
      Rules.mak
  2. 2 1
      extra/Configs/Config.arm
  3. 6 1
      extra/Configs/Config.i386
  4. 2 1
      extra/Configs/Config.i386.default

+ 5 - 3
Rules.mak

@@ -166,10 +166,12 @@ endif
 
 
 # Add a bunch of extra pedantic annoyingly strict checks
-WARNINGS+=-Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing
+XWARNINGS=-Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing
+CPU_CFLAGS=$(subst ",, $(strip $(CPU_CFLAGS-y)))
 # Some nice CFLAGS to work with
-CFLAGS:=$(WARNINGS) $(OPTIMIZATION) -fno-builtin -nostdinc $(CPUFLAGS) \
-	-D_LIBC $(CPU_CFLAGS-y) $(subst ",, $(strip $(ARCH_CFLAGS))) -I$(TOPDIR)include -I.
+CFLAGS:=$(subst ",, $(strip $(WARNINGS))) $(XWARNINGS) $(OPTIMIZATION) \
+	-fno-builtin -nostdinc $(CPUFLAGS) -D_LIBC $(CPU_CFLAGS) \
+	$(subst ",, $(strip $(ARCH_CFLAGS))) -I$(TOPDIR)include -I.
 
 ifeq ($(DODEBUG),y)
     CFLAGS += -g

+ 2 - 1
extra/Configs/Config.arm

@@ -32,7 +32,8 @@ choice
 	  type.
 
 	  Here are the settings recommended for greatest speed:
-	  - "Generic Arm" for any ARM core
+	  - "Generic Arm" select this if your compiler is already setup to
+	    optimize things properly.
 	  - "arm7tdmi" an MMU-less ARM core such as those distributed
 	    by Atmel, Samsung, and others.
 	  - "StrongARM" for Intel's StrongARM cores, such as the

+ 6 - 1
extra/Configs/Config.i386

@@ -22,7 +22,7 @@ config LIBGCC_CFLAGS
 
 choice
 	prompt "Target Processor Type"
-	default CONFIG_386
+	default CONFIG_GENERIC_386
 	help
 	  This is the processor type of your CPU. This information is used for
 	  optimizing purposes.  To build a library that will run on all x86 CPU
@@ -31,6 +31,8 @@ choice
 	  will even run on anything other than the selected processor type.
 
 	  Here are the settings recommended for greatest speed:
+	  - "Generic 386" select this if your compiler is already setup to 
+	     optimize things properly.
 	  - "386" for the AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI
 	     486DLC/DLC2, UMC 486SX-S and NexGen Nx586.  Only "386" kernels
 	     will run on a 386 class machine.
@@ -52,6 +54,9 @@ choice
 
 	  If you don't know what to do, choose "386".
 
+config CONFIG_GENERIC_386
+	bool "Generic 386"
+
 config CONFIG_386
 	bool "386"
 

+ 2 - 1
extra/Configs/Config.i386.default

@@ -6,7 +6,8 @@
 # Target Architecture Features and Options
 #
 HAVE_ELF=y
-CONFIG_386=y
+CONFIG_GENERIC_386=y
+# CONFIG_386 is not set
 # CONFIG_486 is not set
 # CONFIG_586 is not set
 # CONFIG_586MMX is not set