diff options
Diffstat (limited to 'patches/src680/mandriva-archflags.diff')
| -rw-r--r-- | patches/src680/mandriva-archflags.diff | 107 |
1 files changed, 56 insertions, 51 deletions
diff --git a/patches/src680/mandriva-archflags.diff b/patches/src680/mandriva-archflags.diff index fa0d55159..f2ca15bc8 100644 --- a/patches/src680/mandriva-archflags.diff +++ b/patches/src680/mandriva-archflags.diff @@ -1,6 +1,6 @@ ---- solenv/inc/unxlngi6.mk.mdkconfig 2005-09-07 18:02:18.306179040 +0200 -+++ solenv/inc/unxlngi6.mk 2005-09-07 18:27:58.194080496 +0200 -@@ -92,6 +92,14 @@ +--- solenv/inc/unxlngi6.mk.mdkconfig 2005-12-30 15:52:05.000000000 +0100 ++++ solenv/inc/unxlngi6.mk 2005-12-30 16:03:04.000000000 +0100 +@@ -65,6 +65,14 @@ # architecture dependent flags for the C and C++ compiler that can be changed by # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build ARCH_FLAGS*=-mtune=pentiumpro @@ -15,7 +15,7 @@ # name of C++ Compiler CXX*=g++ -@@ -113,14 +121,14 @@ +@@ -86,14 +94,14 @@ .ENDIF # flags for the C++ Compiler @@ -32,95 +32,100 @@ CFLAGSCXX+= -Wno-ctor-dtor-privacy PICSWITCH:=-fpic .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE" -@@ -144,7 +152,8 @@ +@@ -117,13 +125,7 @@ # Compiler flags for debugging CFLAGSDEBUG=-g CFLAGSDBGUTIL= --# Compiler flags for enabling optimazations -+CFLAGSOPT=$(ARCH_FLAGS_OPT) -+# Compiler flags for enabling optimizations - .IF "$(PRODUCT)"!="" - CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products - CFLAGSOPT+=-Wuninitialized # not supported without optimization ---- solenv/inc/unxlngi4.mk.mdkconfig 2005-07-11 17:30:44.000000000 +0200 -+++ solenv/inc/unxlngi4.mk 2005-09-07 18:29:29.709168088 +0200 -@@ -91,6 +91,9 @@ +-# Compiler flags for enabling optimizations +-.IF "$(PRODUCT)"!="" +-CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products +-CFLAGSOPT+=-Wuninitialized # not supported without optimization +-.ELSE # "$(PRODUCT)"!="" +-CFLAGSOPT= # no optimizing for non products +-.ENDIF # "$(PRODUCT)"!="" ++CFLAGSOPT=$(ARCH_OPT_FLAGS) + # Compiler flags for disabling optimizations + CFLAGSNOOPT=-O0 + # Compiler flags for describing the output path +--- solenv/inc/unxlngi5.mk.mdkconfig 2005-12-30 15:52:05.000000000 +0100 ++++ solenv/inc/unxlngi5.mk 2005-12-30 15:59:58.000000000 +0100 +@@ -65,6 +65,13 @@ # architecture dependent flags for the C and C++ compiler that can be changed by # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build ARCH_FLAGS*=-mcpu=pentiumpro +ARCH_FLAGS_CC*=$(ARCH_FLAGS) +ARCH_FLAGS_CXX*=$(ARCH_FLAGS) -+ARCH_FLAGS_OPT*=-O1 ++.IF "$(PRODUCT)"!="" ++ARCH_FLAGS_OPT*=-Os -fno-strict-aliasing # optimizing for products ++.ELSE # "$(PRODUCT)"!="" ++ARCH_FLAGS_OPT*= # no optimizing for non products ++.ENDIF # "$(PRODUCT)"!="" # name of C++ Compiler CXX*=g++ -@@ -107,13 +110,13 @@ - .ENDIF +@@ -90,13 +97,13 @@ + # flags for the C++ Compiler -CFLAGSCC= -pipe $(ARCH_FLAGS) -+CFLAGSCC=$(ARCH_FLAGS_CC) ++CFLAGSCC= $(ARCH_FLAGS_CC) # Flags for enabling exception handling CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs # Flags for disabling exception handling CFLAGS_NO_EXCEPTIONS=-fno-exceptions -CFLAGSCXX= -pipe $(ARCH_FLAGS) -+CFLAGSCXX=$(ARCH_FLAGS_CXX) ++CFLAGSCXX= $(ARCH_FLAGS_CXX) CFLAGSCXX+= -Wno-ctor-dtor-privacy + PICSWITCH:=-fpic - # HACK: enable Hamburg developers to build on glibc-2.2 machines but compile vs. glibc-2.1 headers -@@ -142,7 +145,7 @@ - # Compiler flags for enabling optimazations - # CFLAGSOPT=-O2 - # reduce to -O1 to avoid optimisation problems --CFLAGSOPT=-O1 +@@ -118,11 +125,7 @@ + CFLAGSDEBUG=-g + CFLAGSDBGUTIL= + # Compiler flags for enabling optimizations +-.IF "$(PRODUCT)"!="" +-CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products +-.ELSE # "$(PRODUCT)"!="" +-CFLAGSOPT= # no optimizing for non products +-.ENDIF # "$(PRODUCT)"!="" +CFLAGSOPT=$(ARCH_FLAGS_OPT) - # Compiler flags for disabling optimazations + # Compiler flags for disabling optimizations CFLAGSNOOPT=-O0 - # Compiler flags for discibing the output path ---- solenv/inc/unxlngi5.mk.mdkconfig 2005-09-07 18:15:35.574975760 +0200 -+++ solenv/inc/unxlngi5.mk 2005-09-07 18:21:53.316550312 +0200 -@@ -92,6 +92,13 @@ + # Compiler flags for describing the output path +--- solenv/inc/unxlngi4.mk.mdkconfig 2005-12-30 15:52:05.000000000 +0100 ++++ solenv/inc/unxlngi4.mk 2005-12-30 15:57:55.000000000 +0100 +@@ -64,6 +64,9 @@ # architecture dependent flags for the C and C++ compiler that can be changed by # exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build ARCH_FLAGS*=-mcpu=pentiumpro +ARCH_FLAGS_CC*=$(ARCH_FLAGS) +ARCH_FLAGS_CXX*=$(ARCH_FLAGS) -+.IF "$(PRODUCT)"!="" -+ARCH_FLAGS_OPT*=-Os -fno-strict-aliasing # optimizing for products -+.ELSE # "$(PRODUCT)"!="" -+ARCH_FLAGS_OPT*= # no optimizing for non products -+.ENDIF # "$(PRODUCT)"!="" ++ARCH_FLAGS_OPT*=-O1 # name of C++ Compiler CXX*=g++ -@@ -117,13 +124,13 @@ - +@@ -80,13 +83,13 @@ + .ENDIF # flags for the C++ Compiler -CFLAGSCC= -pipe $(ARCH_FLAGS) -+CFLAGSCC= $(ARCH_FLAGS_CC) ++CFLAGSCC=$(ARCH_FLAGS_CC) # Flags for enabling exception handling CFLAGSEXCEPTIONS=-fexceptions -fno-enforce-eh-specs # Flags for disabling exception handling CFLAGS_NO_EXCEPTIONS=-fno-exceptions -CFLAGSCXX= -pipe $(ARCH_FLAGS) -+CFLAGSCXX= $(ARCH_FLAGS_CXX) ++CFLAGSCXX=$(ARCH_FLAGS_CXX) CFLAGSCXX+= -Wno-ctor-dtor-privacy - PICSWITCH:=-fpic -@@ -145,11 +152,7 @@ - CFLAGSDEBUG=-g - CFLAGSDBGUTIL= - # Compiler flags for enabling optimazations --.IF "$(PRODUCT)"!="" --CFLAGSOPT=-Os -fno-strict-aliasing # optimizing for products --.ELSE # "$(PRODUCT)"!="" --CFLAGSOPT= # no optimizing for non products --.ENDIF # "$(PRODUCT)"!="" + # HACK: enable Hamburg developers to build on glibc-2.2 machines but compile vs. glibc-2.1 headers +@@ -115,7 +118,7 @@ + # Compiler flags for enabling optimizations + # CFLAGSOPT=-O2 + # reduce to -O1 to avoid optimization problems +-CFLAGSOPT=-O1 +CFLAGSOPT=$(ARCH_FLAGS_OPT) - # Compiler flags for disabling optimazations + # Compiler flags for disabling optimizations CFLAGSNOOPT=-O0 - # Compiler flags for discibing the output path + # Compiler flags for describing the output path |