ldbl-128ibm-compat: fixup subdir location of several funcs

We want to ensure that if a second file is built to support
ieee128 long double, we built its companion implementation
with ibm128 long double.  The shared object versions of these
files build correctly because the aliasing is sufficiently
complex to prevent the redirects from applying when defining
them.

However, this does not prevent the static object variants
from becoming quietly broken due to redirects.  This is
intentionally avoided by marking such objects to be built
with -mabi=ibmlongdouble.

Shuffle the misplaced routines to build against the subdir
which defines the needed symbols.

diff --git a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
index 2dceb658e7b42f67af2a43ac5c47e3e11561d794..e40ae08469f515f02ddb35b6d763a6ccea16aa7f 100644 (file)
--- a/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
+++ b/sysdeps/ieee754/ldbl-128ibm-compat/Makefile
@@ -1,9 +1,21 @@
 ifeq ($(subdir),libio)
 ldbl-extra-routines += fwscanf \
+                      fwprintf \
+                      obprintf \
                       swscanf \
+                      swprintf \
                       wscanf \
+                      vasprintf \
+                      vdprintf \
+                      vscanf \
+                      vsprintf \
+                      vsnprintf \
+                      vsscanf \
+                      vswprintf \
                       vswscanf \
-                      vwscanf
+                      vwprintf \
+                      vwscanf \
+                      wprintf
 endif
 
 ifeq ($(subdir),wcsmbs)
@@ -29,28 +41,14 @@ ldbl-extra-routines += printf_size \
                       printf \
                       snprintf \
                       sprintf \
-                      vasprintf \
-                      vdprintf \
                       vfprintf \
                       vprintf \
-                      vsnprintf \
-                      vsprintf \
-                      fwprintf \
-                      swprintf \
-                      wprintf \
                       vfwprintf \
-                      vswprintf \
-                      vwprintf \
                       fscanf \
                       scanf \
                       sscanf \
                       vfscanf \
-                      vscanf \
-                      vsscanf \
                       vfwscanf \
-                      obprintf \
-                      obstack_chk \
-                      vobstack_chk \
                       isoc99_fscanf \
                       isoc99_scanf \
                       isoc99_sscanf \
@@ -211,7 +209,9 @@ ldbl-extra-routines += asprintf_chk \
                       wprintf_chk \
                       vfwprintf_chk \
                       vswprintf_chk \
-                      vwprintf_chk
+                      vwprintf_chk \
+                      obstack_chk \
+                      vobstack_chk
 
 tests-internal += test-printf-chk-ieee128 test-printf-chk-ibm128
 CFLAGS-test-printf-chk-ieee128.c += -mfloat128 -mabi=ieeelongdouble -Wno-psabi