Commit cde28f0d by Benjamin Kosnik Committed by Benjamin Kosnik

Makefile.am (AC_CXXFLAGS): Add CPUFLAGS here.


2000-05-01  Benjamin Kosnik  <bkoz@haight.constant.com>

	* src/Makefile.am (AC_CXXFLAGS): Add CPUFLAGS here.
	* src/Makefile.in: Regenerate.
	* acinclude.m4 (GLIBCPP_ENABLE_DEBUG): Revert.

From-SVN: r33593
parent c6c4a70b
2000-05-01 Benjamin Kosnik <bkoz@haight.constant.com>
* src/Makefile.am (AC_CXXFLAGS): Add CPUFLAGS here.
* src/Makefile.in: Regenerate.
* acinclude.m4 (GLIBCPP_ENABLE_DEBUG): Revert.
2000-04-30 Benjamin Kosnik <bkoz@gnu.org> 2000-04-30 Benjamin Kosnik <bkoz@gnu.org>
* config/cpu/powerpc/bits/atomicity.h (__compare_and_swap): Fix typo. * config/cpu/powerpc/bits/atomicity.h (__compare_and_swap): Fix typo.
......
...@@ -68,6 +68,7 @@ AS = @AS@ ...@@ -68,6 +68,7 @@ AS = @AS@
BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CPUFLAGS = @CPUFLAGS@
CSTDIO_CC = @CSTDIO_CC@ CSTDIO_CC = @CSTDIO_CC@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXX = @CXX@ CXX = @CXX@
......
...@@ -238,9 +238,11 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [ ...@@ -238,9 +238,11 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [
dnl dnl
dnl Check to see what architecture we are compiling for. If it's dnl Check to see what architecture we are compiling for. If it's
dnl supported, use special hand-crafted routines to provide thread dnl supported, use special hand-crafted routines to provide thread
dnl primitives. dnl primitives. Also, if architecture-specific flags are required for
dnl compilation, add them here.
dnl dnl
dnl Depending on what is found, select configure/cpu/*/bits/atomicity.h dnl Depending on what is found, select configure/cpu/*/bits/atomicity.h
dnl If not found, select configure/cpu/generic/bits/atomicity.h dnl If not found, select configure/cpu/generic/bits/atomicity.h
...@@ -248,6 +250,7 @@ dnl ...@@ -248,6 +250,7 @@ dnl
dnl GLIBCPP_CHECK_CPU dnl GLIBCPP_CHECK_CPU
AC_DEFUN(GLIBCPP_CHECK_CPU, [ AC_DEFUN(GLIBCPP_CHECK_CPU, [
AC_MSG_CHECKING([for cpu primitives directory]) AC_MSG_CHECKING([for cpu primitives directory])
CPUFLAGS=
case "$target_cpu" in case "$target_cpu" in
alpha*) alpha*)
cpu_include_dir="config/cpu/alpha" cpu_include_dir="config/cpu/alpha"
...@@ -260,6 +263,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [ ...@@ -260,6 +263,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [
;; ;;
powerpc | rs6000) powerpc | rs6000)
cpu_include_dir="config/cpu/powerpc" cpu_include_dir="config/cpu/powerpc"
CPUFLAGS='-mnew-mnemonics -Wa,-mppc -mpowerpc'
;; ;;
sparc64 | ultrasparc) sparc64 | ultrasparc)
cpu_include_dir="config/cpu/sparc/sparc64" cpu_include_dir="config/cpu/sparc/sparc64"
...@@ -273,6 +277,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [ ...@@ -273,6 +277,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [
esac esac
AC_MSG_RESULT($cpu_include_dir) AC_MSG_RESULT($cpu_include_dir)
AC_SUBST(cpu_include_dir) AC_SUBST(cpu_include_dir)
AC_SUBST(CPUFLAGS)
]) ])
...@@ -604,16 +609,9 @@ changequote([, ])dnl ...@@ -604,16 +609,9 @@ changequote([, ])dnl
enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_debug" in case "$enable_debug" in
yes) yes)
case "$target_cpu" in DEBUGFLAGS='-O0 -ggdb'
alpha*) ;;
DEBUGFLAGS='-O0 -gdwarf-2'
;;
*)
DEBUGFLAGS='-O0 -g'
;;
esac
;;
no) no)
DEBUGFLAGS='-g' DEBUGFLAGS='-g'
;; ;;
......
...@@ -250,9 +250,11 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [ ...@@ -250,9 +250,11 @@ AC_DEFUN(GLIBCPP_CHECK_BUILTIN_MATH_SUPPORT, [
dnl dnl
dnl Check to see what architecture we are compiling for. If it's dnl Check to see what architecture we are compiling for. If it's
dnl supported, use special hand-crafted routines to provide thread dnl supported, use special hand-crafted routines to provide thread
dnl primitives. dnl primitives. Also, if architecture-specific flags are required for
dnl compilation, add them here.
dnl dnl
dnl Depending on what is found, select configure/cpu/*/bits/atomicity.h dnl Depending on what is found, select configure/cpu/*/bits/atomicity.h
dnl If not found, select configure/cpu/generic/bits/atomicity.h dnl If not found, select configure/cpu/generic/bits/atomicity.h
...@@ -260,6 +262,7 @@ dnl ...@@ -260,6 +262,7 @@ dnl
dnl GLIBCPP_CHECK_CPU dnl GLIBCPP_CHECK_CPU
AC_DEFUN(GLIBCPP_CHECK_CPU, [ AC_DEFUN(GLIBCPP_CHECK_CPU, [
AC_MSG_CHECKING([for cpu primitives directory]) AC_MSG_CHECKING([for cpu primitives directory])
CPUFLAGS=
case "$target_cpu" in case "$target_cpu" in
alpha*) alpha*)
cpu_include_dir="config/cpu/alpha" cpu_include_dir="config/cpu/alpha"
...@@ -272,6 +275,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [ ...@@ -272,6 +275,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [
;; ;;
powerpc | rs6000) powerpc | rs6000)
cpu_include_dir="config/cpu/powerpc" cpu_include_dir="config/cpu/powerpc"
CPUFLAGS='-mnew-mnemonics -Wa,-mppc -mpowerpc'
;; ;;
sparc64 | ultrasparc) sparc64 | ultrasparc)
cpu_include_dir="config/cpu/sparc/sparc64" cpu_include_dir="config/cpu/sparc/sparc64"
...@@ -285,6 +289,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [ ...@@ -285,6 +289,7 @@ AC_DEFUN(GLIBCPP_CHECK_CPU, [
esac esac
AC_MSG_RESULT($cpu_include_dir) AC_MSG_RESULT($cpu_include_dir)
AC_SUBST(cpu_include_dir) AC_SUBST(cpu_include_dir)
AC_SUBST(CPUFLAGS)
]) ])
...@@ -616,16 +621,9 @@ changequote([, ])dnl ...@@ -616,16 +621,9 @@ changequote([, ])dnl
enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl enable_debug=GLIBCPP_ENABLE_DEBUG_DEFAULT)dnl
dnl Option parsed, now set things appropriately dnl Option parsed, now set things appropriately
case "$enable_debug" in case "$enable_debug" in
yes) yes)
case "$target_cpu" in DEBUGFLAGS='-O0 -ggdb'
alpha*) ;;
DEBUGFLAGS='-O0 -gdwarf-2'
;;
*)
DEBUGFLAGS='-O0 -g'
;;
esac
;;
no) no)
DEBUGFLAGS='-g' DEBUGFLAGS='-g'
;; ;;
......
...@@ -32,6 +32,7 @@ GLIBCPP_ENABLE_THREADS ...@@ -32,6 +32,7 @@ GLIBCPP_ENABLE_THREADS
#GLIBCPP_ENABLE_NAMESPACES(yes) #GLIBCPP_ENABLE_NAMESPACES(yes)
#GLIBCPP_ENABLE_RELIBGCC([../..]) #GLIBCPP_ENABLE_RELIBGCC([../..])
if test -n "$with_cross_host"; then if test -n "$with_cross_host"; then
# We are being configured with a cross compiler. AC_REPLACE_FUNCS # We are being configured with a cross compiler. AC_REPLACE_FUNCS
......
...@@ -68,6 +68,7 @@ AS = @AS@ ...@@ -68,6 +68,7 @@ AS = @AS@
BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CPUFLAGS = @CPUFLAGS@
CSTDIO_CC = @CSTDIO_CC@ CSTDIO_CC = @CSTDIO_CC@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXX = @CXX@ CXX = @CXX@
......
...@@ -68,6 +68,7 @@ AS = @AS@ ...@@ -68,6 +68,7 @@ AS = @AS@
BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CPUFLAGS = @CPUFLAGS@
CSTDIO_CC = @CSTDIO_CC@ CSTDIO_CC = @CSTDIO_CC@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXX = @CXX@ CXX = @CXX@
......
...@@ -42,7 +42,7 @@ WERROR = -Werror ...@@ -42,7 +42,7 @@ WERROR = -Werror
# -fdata-sections -ffunction-sections \ # -fdata-sections -ffunction-sections \
# -fvtable-gc -Wl,--gc-sections # -fvtable-gc -Wl,--gc-sections
# AC_CXXFLAGS = @OPTLEVEL@ @DEBUGFLAGS@ @NAMESPACES@ # AC_CXXFLAGS = @OPTLEVEL@ @DEBUGFLAGS@ @NAMESPACES@
AC_CXXFLAGS = @DEBUGFLAGS@ AC_CXXFLAGS = @CPUFLAGS@ @DEBUGFLAGS@
AM_CXXFLAGS = -fno-implicit-templates \ AM_CXXFLAGS = -fno-implicit-templates \
-Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \ -Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \
$(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS)
......
...@@ -67,6 +67,7 @@ AS = @AS@ ...@@ -67,6 +67,7 @@ AS = @AS@
BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@ BUILD_LIBIO_INCLUDE = @BUILD_LIBIO_INCLUDE@
CC = @CC@ CC = @CC@
CPP = @CPP@ CPP = @CPP@
CPUFLAGS = @CPUFLAGS@
CSTDIO_CC = @CSTDIO_CC@ CSTDIO_CC = @CSTDIO_CC@
CSTDIO_H = @CSTDIO_H@ CSTDIO_H = @CSTDIO_H@
CXX = @CXX@ CXX = @CXX@
...@@ -118,7 +119,7 @@ WERROR = -Werror ...@@ -118,7 +119,7 @@ WERROR = -Werror
# -fdata-sections -ffunction-sections \ # -fdata-sections -ffunction-sections \
# -fvtable-gc -Wl,--gc-sections # -fvtable-gc -Wl,--gc-sections
# AC_CXXFLAGS = @OPTLEVEL@ @DEBUGFLAGS@ @NAMESPACES@ # AC_CXXFLAGS = @OPTLEVEL@ @DEBUGFLAGS@ @NAMESPACES@
AC_CXXFLAGS = @DEBUGFLAGS@ AC_CXXFLAGS = @CPUFLAGS@ @DEBUGFLAGS@
AM_CXXFLAGS = -fno-implicit-templates \ AM_CXXFLAGS = -fno-implicit-templates \
-Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \ -Wall -Wno-format -W -Wwrite-strings -Winline $(WERROR) \
$(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(AC_CXXFLAGS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment