diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-02-11 10:20:07 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-02-11 10:20:07 -0800 |
| commit | dd39e02041f1b4472085b71f02d4e120c4f221f8 (patch) | |
| tree | b6770c0b7340a21c6129dac05fef167bd9fdb414 /config.make.in | |
| parent | b382aea8ecdf8f0c4b4a76bc70b8e98c9c94e516 (diff) | |
| parent | e19e83c5d2ead7a5ab5fa7afa6fed1a427dc2465 (diff) | |
| download | glibc-dd39e02041f1b4472085b71f02d4e120c4f221f8.tar.gz glibc-dd39e02041f1b4472085b71f02d4e120c4f221f8.tar.xz glibc-dd39e02041f1b4472085b71f02d4e120c4f221f8.zip | |
Merge remote-tracking branch 'origin/master' into hjl/x32/master
Conflicts: configure sysdeps/ieee754/dbl-64/wordsize-64/s_lround.c sysdeps/x86_64/fpu/bits/mathinline.h Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Diffstat (limited to 'config.make.in')
| -rw-r--r-- | config.make.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config.make.in b/config.make.in index 7b5570bd73..9cbd9e680d 100644 --- a/config.make.in +++ b/config.make.in @@ -37,6 +37,7 @@ asflags-cpu = @libc_cv_cc_submachine@ config-cflags-sse4 = @libc_cv_cc_sse4@ config-cflags-avx = @libc_cv_cc_avx@ +config-cflags-sse2avx = @libc_cv_cc_sse2avx@ config-cflags-novzeroupper = @libc_cv_cc_novzeroupper@ config-asflags-i686 = @libc_cv_as_i686@ @@ -47,11 +48,9 @@ all-warnings = @all_warnings@ have-z-combreloc = @libc_cv_z_combreloc@ have-z-execstack = @libc_cv_z_execstack@ -have-initfini = @libc_cv_have_initfini@ have-Bgroup = @libc_cv_Bgroup@ have-as-needed = @libc_cv_as_needed@ libgcc_s_suffix = @libc_cv_libgcc_s_suffix@ -need-nopic-initfini = @nopic_initfini@ with-fp = @with_fp@ old-glibc-headers = @old_glibc_headers@ unwind-find-fde = @libc_cv_gcc_unwind_find_fde@ |