configure/Makefile: Add support for more options.

Add support to configure and Makefile.in for --disable-atomic,
--disable-float, and --enable-multilib.

1 files changed, 64 insertions, 0 deletions

diff --git a/configure b/configure
index a38d4e6..ac9f41c 100755
--- a/configure
+++ b/configure
@@ -584,6 +584,11 @@ PACKAGE_URL=''
 
 ac_subst_vars='LTLIBOBJS
 LIBOBJS
+multilib_flags
+glibc_configure_flags
+float_asflags
+float_cflags
+atomic_cflags
 XLEN
 default_target
 FETCHER
@@ -645,6 +650,9 @@ ac_user_opts='
 enable_option_checking
 enable_linux
 with_xlen
+enable_atomic
+enable_float
+enable_multilib
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1265,6 +1273,12 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-linux          set linux as the default make target
                           [--disable-linux]
+  --disable-atomic        disable use of atomic memory instructions in glibc
+                          [--enable-atomic]
+  --disable-float         use software floating point in glibc
+                          [--enable-float]
+  --enable-multilib       build multilib glibc (32 and 64 bit)
+                          [--disable-multilib]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -3126,6 +3140,56 @@ else
 fi
 
 
+# Check whether --enable-atomic was given.
+if test "${enable_atomic+set}" = set; then :
+  enableval=$enable_atomic;
+else
+  enable_atomic=yes
+
+fi
+
+
+if test "x$enable_atomic" != xno; then :
+
+else
+  atomic_cflags=-mno-atomic
+
+fi
+
+# Check whether --enable-float was given.
+if test "${enable_float+set}" = set; then :
+  enableval=$enable_float;
+else
+  enable_float=yes
+
+fi
+
+
+if test "x$enable_float" != xno; then :
+
+else
+  float_cflags=-msoft-float
+float_asflags=-msoft-float
+glibc_configure_flags=--without-fp
+
+fi
+
+# Check whether --enable-multilib was given.
+if test "${enable_multilib+set}" = set; then :
+  enableval=$enable_multilib;
+else
+  enable_multilib=no
+
+fi
+
+
+if test "x$enable_multilib" != xno; then :
+
+else
+  multilib_flags=--disable-multilib
+
+fi
+
 ac_config_files="$ac_config_files Makefile"
 
 ac_config_files="$ac_config_files scripts/wrapper/awk"