Message ID | 20171206125739.9361-1-gabriel@inconstante.eti.br |
---|---|
State | New |
Headers | show |
Series | powerpc64*: diverge sysdeps directories | expand |
On Wed, 6 Dec 2017, Gabriel F. T. Gomes wrote: > In preparation for the switch of the format of long double - from IBM > Extended Precision to IEEE 754 128-bits floating-point - on powerpc64le, > the sysdeps directories for powerpc64 and powerpc64le now diverge > further to allow them to imply different sets of subdirectories from > sysdeps. This patch moves sysdeps/powerpc/powerpc64 to > sysdeps/powerpc/powerpc64-common, then adjusts the inclusion of files in > C code, as well as it removes the Implies files which create the > hierarchy of processors. Could you give a more detailed indication of the design for how support for a third choice of long double for powerpc64le (in addition to the two existing choices currently present for powerpc64le) would be implemented so that it would build upon this change? There have been a few previous discussions touching on this question, with tentative observations that might suggest certain approaches as opposed to others (or that might be contradicted by more detailed design and implementation work), such as that: (a) it might be undesirable to have any new APIs that are explicitly for use of IBM long double in a context where long double is binary128; (b) strict namespace conformance would mean mapping *l calls (when long double is binary128) to new __*f128 exports but without strict conformance they could map to *f128; (c) there are a few legacy function not built for _Float128 that would need building in the case where it's an alternative long double format as they are non-compat symbols in the API for long double, but still without public *f128 interfaces (scalbl, nexttoward functions, etc.); (d) the approach used in the present ldbl-opt support for different long double formats in printf-like functions - setting a TLS variable to indicate the long double format in a compat wrapper before calling the main function - would be questionable for any new uses because of AS-safety considerations and a desire for dprintf at least to be AS-safe in some cases; (e) the set of printf-like functions with ldbl-opt compatibility is incomplete (missing at least argp.h, err.h, error.h functions) and such incompleteness should not be replicated when adding a third choice of long double. But not I think any detailed design discussions or branches to flesh out the design. The following is not directly related to this patch: we *already* have separate sysdeps directories for powerpc64le (and this patch would create more). Given that we have such directories, is there any need any more for the mechanism of having *-le.abilist files? Or should that mechanism be removed, to simplify the architecture-independent code related to ABI tests and reduce confusion about one set of baselines not being called libc.abilist etc., and the powerpc64le ABI baselines be moved to sysdeps/unix/sysv/linux/powerpc/powerpc64le without the -le in their names? > Future commits will move files related to the long double implementation > of IBM Extended Precision from sysdeps/powerpc/powerpc64-common to > sysdeps/powerpc/powerpc64. Unless you intend a clean ABI break with new symbol versions for everything (in which case all of (a) through (e) are irrelevant), I'd expect all the IBM long double files still to be relevant to powerpc64le as they'd still need to implement the same symbols at the same symbol versions as at present.
I disagree with the subject of this patch: it is not diverging directories. The powerpc64le implementation diverged when the powerpc64le directory was created in the commit you mentioned. You can say that you are: 1. Fixing the order of the sysdeps directories that were broken in the same commit you already mentioned. This breakage doesn't impact negatively the current code, but causes issues when new files are added to the powerpc64le directory. 2. Preparing to add more files to the powerpc64le directory that must not be shared with powerpc or powerpc64, but must be reused by many powerpc64le processors. "Gabriel F. T. Gomes" <gabriel@inconstante.eti.br> writes: > In preparation for the switch of the format of long double - from IBM > Extended Precision to IEEE 754 128-bits floating-point - on powerpc64le, > the sysdeps directories for powerpc64 and powerpc64le now diverge > further to allow them to imply different sets of subdirectories from > sysdeps. This patch goes beyond the long double work and is necessary even if long double was not being migrated. This patch is making clear which code is specific to big endian or little endian and what can be shared between them. By the way, I believe the same kind of patch will be necessary for powerpc, in order to avoid the issues that Alan found [1]. [1] https://patchwork.sourceware.org/patch/23727/
On Wed, 06 Dec 2017, Joseph Myers wrote: >On Wed, 6 Dec 2017, Gabriel F. T. Gomes wrote: > >> In preparation for the switch of the format of long double - from IBM >> Extended Precision to IEEE 754 128-bits floating-point - on powerpc64le, >> the sysdeps directories for powerpc64 and powerpc64le now diverge >> further to allow them to imply different sets of subdirectories from >> sysdeps. This patch moves sysdeps/powerpc/powerpc64 to >> sysdeps/powerpc/powerpc64-common, then adjusts the inclusion of files in >> C code, as well as it removes the Implies files which create the >> hierarchy of processors. > >Could you give a more detailed indication of the design for how support >for a third choice of long double for powerpc64le (in addition to the two >existing choices currently present for powerpc64le) would be implemented >so that it would build upon this change? An overview would be that I was planning to build upon the aliasing mechanism that you wrote for mips, s390x, etc. This means that I was planning for powerpc64le to imply ldbl-128, rather than ldbl-128ibm. This would also mean that many symbols for the float128 interface on powerpc64le (for instance, __ieee754_acosf128) would disappear and that the versioned symbols (for instance, acosf128) would point to the ldbl-128 implementation (for instance, to __ieee754_acosl). On top of that, new, versioned, compat symbols would point to new functions (for instance, __ibm128_ieee754_acosl). This would be implemented on a new sysdeps directory (say ldbl-128ibm-compat), which would reuse the files from ldbl-128ibm (changing their function names), but would be included from new targets in the powerpc64le-specific Makefile. (For the record, I haven't implemented the compatibility code, yet. I have only used the alias mechanism in a local branch (leading to a temporary ABI breakage that I didn't plan to submit before the compatibility code was ready)). >There have been a few previous discussions touching on this question, with >tentative observations that might suggest certain approaches as opposed to >others (or that might be contradicted by more detailed design and >implementation work), such as that: > >(a) it might be undesirable to have any new APIs that are explicitly for >use of IBM long double in a context where long double is binary128; My intention with the approach I described above was that the old implementations would be accessible through external symbol versioning (for instance, acosl@GLIBC_2.17) to new symbols (for instance, __ibm128_ieee754_acosl). I was assuming, perhaps incorrectly, that adding such new symbols would be OK. >(b) strict namespace conformance would mean mapping *l calls (when long >double is binary128) to new __*f128 exports but without strict conformance >they could map to *f128; I thought of it the other way around, i.e. new __ibm128_*l symbols. >(c) there are a few legacy function not built for _Float128 that would >need building in the case where it's an alternative long double format as >they are non-compat symbols in the API for long double, but still without >public *f128 interfaces (scalbl, nexttoward functions, etc.); The functions not available for _Float128 would be provided by the alias mechanism for the new long double format, whereas the compat version would be built from ldbl-128ibm-compat/ldbl-128ibm and provided as new symbols (as pointed out above, I had assumed it would be OK). >(d) the approach used in the present ldbl-opt support for different long >double formats in printf-like functions - setting a TLS variable to >indicate the long double format in a compat wrapper before calling the >main function - would be questionable for any new uses because of >AS-safety considerations and a desire for dprintf at least to be AS-safe >in some cases; I wasn't aware of that being questionable. I'll need more time to understand how to avoid this. >(e) the set of printf-like functions with ldbl-opt compatibility is >incomplete (missing at least argp.h, err.h, error.h functions) and such >incompleteness should not be replicated when adding a third choice of long >double. OK. This is something else I need more time to think of. >But not I think any detailed design discussions or branches to flesh out >the design. I did not understand this sentence. >The following is not directly related to this patch: we *already* have >separate sysdeps directories for powerpc64le (and this patch would create >more). Given that we have such directories, is there any need any more >for the mechanism of having *-le.abilist files? Or should that mechanism >be removed, to simplify the architecture-independent code related to ABI >tests and reduce confusion about one set of baselines not being called >libc.abilist etc., and the powerpc64le ABI baselines be moved to >sysdeps/unix/sysv/linux/powerpc/powerpc64le without the -le in their >names? Thanks for pointing that out. I also bumped into these files while working on the subdirectory renaming, but I wasn't aware that the mechanism of having *-le.abilist was there only because of powerpc64le. I agree it would be more clear to move/rename these files and get rid of the mechanism. >> Future commits will move files related to the long double implementation >> of IBM Extended Precision from sysdeps/powerpc/powerpc64-common to >> sysdeps/powerpc/powerpc64. > >Unless you intend a clean ABI break with new symbol versions for >everything (in which case all of (a) through (e) are irrelevant), I'd >expect all the IBM long double files still to be relevant to powerpc64le >as they'd still need to implement the same symbols at the same symbol >versions as at present. I don't intend to break the ABI. However, since I was planning to use the alias mechanism, I wanted to *imply* ldbl-128 *instead* of ldbl-128ibm. Then, for the IBM long double implementation, I was indeed planning to use the files under ldbl-128ibm, but only through includes from a new directory (ldbl-128ibm-compat), not via the Implies mechanism.
On Wed, 06 Dec 2017, Tulio Magno Quites Machado Filho wrote: >I disagree with the subject of this patch: it is not diverging directories. > >The powerpc64le implementation diverged when the powerpc64le directory was >created in the commit you mentioned. > >You can say that you are: > 1. Fixing the order of the sysdeps directories that were broken in the same > commit you already mentioned. This breakage doesn't impact negatively > the current code, but causes issues when new files are added to the > powerpc64le directory. > 2. Preparing to add more files to the powerpc64le directory that must not > be shared with powerpc or powerpc64, but must be reused by many powerpc64le > processors. Indeed, the main idea behind this patch is to make the separation between powerpc64 and powerpc64le more clear when looking at the structure of the directories, as well as allow them to have conflicting implementations. It happened to be part of the requirements for the use of the alias mechanism for _FloatN types, which I had in mind.
On Wed, 6 Dec 2017, Gabriel F. T. Gomes wrote: > An overview would be that I was planning to build upon the aliasing > mechanism that you wrote for mips, s390x, etc. This means that I was > planning for powerpc64le to imply ldbl-128, rather than ldbl-128ibm. This That could probably work, but it seems likely to be more complicated than keeping building with -mabi=ibmlongdouble (so keeping the same sysdeps implications, but with additional aliases for float128 functions to be namespace-clean, and appropriate header magic - header magic being needed in any case). (Cf. how it would be nice for ldbl-128 functions to build with the *f128 names unconditionally and *l aliases conditionally, with most of the macros from float128_private.h then being eliminated. But right now we have float128_private.h, which works and was certainly a much simpler point to get to. Or cf. how a patch proposed a while back to make _FILE_OFFSET_BITS=64 the default still kept glibc itself building with _FILE_OFFSET_BITS=32 to avoid many problems arising.) > >(a) it might be undesirable to have any new APIs that are explicitly for > >use of IBM long double in a context where long double is binary128; > > My intention with the approach I described above was that the old > implementations would be accessible through external symbol versioning > (for instance, acosl@GLIBC_2.17) to new symbols (for instance, > __ibm128_ieee754_acosl). I was assuming, perhaps incorrectly, that adding > such new symbols would be OK. (i) New internal, non-exported symbols should certainly be OK. (ii) It's new APIs - allowing the user to call acosibm128, for example, with declarations of such names in the public headers - that I think should be avoided. Rather, people wishing to use IBM long double functions after a change of default should compile their programs with -mabi=ibmlongdouble. (iii) Regarding new internal-namespace ABIs, some may be needed (or else a compiler extension to allow the headers to specify a symbol version to use with a function, but new internal-namespace ABIs would be less disruptive). Adding a single set of new ABIs to be used when float128 functions are called as long double (e.g. __acosf128, symbol version GLIBC_2.28) is a smaller addition than adding a new set of ABIs for float128 functions called as long double (e.g. acosl, symbol version GLIBC_2.28) *and* a new set of ABIs for ibm128 functions so they can still be accessed with -mabi=ibmlongdouble (e.g. __ibm128_acosl, version GLIBC_2.28). Though the latter is effectively the approach followed with __nldbl_*. The precise set of ABIs should more or less just be a matter of how you set up the libm_alias_* macros and associated Versions entries and header magic. Note that I didn't convert any IBM long double files (whether in ldbl-128ibm or in powerpc sysdeps directories) to using libm_alias_ldouble, simply because it wasn't relevant for my _Float* work. Whatever you do, being able to have test coverage for both long double modes would be a very good idea. Right now, there is *no* test coverage for -mlong-double-64 at all, on any platform that supports it. (iv) For functions already exported under internal-namespace ABIs, there should be no need to add any more such ABIs. __isinfl and __isinff128 fully suffice to provide isinf functionality for both types, all that's needed is to ensure they are declared with appropriate types in the case where long double is binary128 (so __isinfl would have __ibm128 argument then) and that the type-generic macros result in that case in *f128 being used for long double and *l being used for __ibm128. Likewise for the __*_finite ABIs. (You could argue there's no need for the type-generic macros to support __ibm128 when long double is binary128. In that case, you just need to make sure __isinff128 not __isinfl gets called for long double arguments.) > >(b) strict namespace conformance would mean mapping *l calls (when long > >double is binary128) to new __*f128 exports but without strict conformance > >they could map to *f128; > > I thought of it the other way around, i.e. new __ibm128_*l symbols. Well, if you provide new symbol versions of acosl and all the other such functions then it can be done that way. > >(d) the approach used in the present ldbl-opt support for different long > >double formats in printf-like functions - setting a TLS variable to > >indicate the long double format in a compat wrapper before calling the > >main function - would be questionable for any new uses because of > >AS-safety considerations and a desire for dprintf at least to be AS-safe > >in some cases; > > I wasn't aware of that being questionable. I'll need more time to > understand how to avoid this. Arguably, internal functions taking an explicit parameter for the kind of long double in use (though preferably you want to arrange things so the parameter doesn't exist for configurations that don't need it). (The present code doesn't even save and restore the TLS variable, just sets it to 1 then to 0, so would also run into problems if a function compiled with one long double choice were called from within a printf-like function compiled with a different long double choice, e.g. through the use of printf hooks.) > >(e) the set of printf-like functions with ldbl-opt compatibility is > >incomplete (missing at least argp.h, err.h, error.h functions) and such > >incompleteness should not be replicated when adding a third choice of long > >double. > > OK. This is something else I need more time to think of. It's probably one of the more straightforward pieces. Review the installed headers to find all printf/scanf/strfmon-like functions and get a complete list of those without long double compatibility, and add compatibility for those that lack it. Then, __LDBL_REDIR_DECL etc. macros can be used for all functions with such compatibility (and whatever approach you use for a third long double choice, those macros will need a powerpc version that handles having the three variants). You can't solve the ambiguity for pre-2.4 symbol versions of such functions lacking compatibility, which might have been called by pre-2.4 problems expecting long double = double or by post-2.4 programs expecting long double = IBM long double. But you can add __nldbl_* variants so future programs built with -mlong-double=64 work correctly with these functions, and by adding the __LDBL_REDIR_DECL etc. calls you put the machinery in place for these functions to work properly when there is a third long double variant as well. > >But not I think any detailed design discussions or branches to flesh out > >the design. > > I did not understand this sentence. It's following on from the previous sentence that started before (a) - "There have been a few previous discussions touching on this question .... But not I think any detailed design discussions ....". > Thanks for pointing that out. I also bumped into these files while > working on the subdirectory renaming, but I wasn't aware that the > mechanism of having *-le.abilist was there only because of powerpc64le. I It was because initially powerpc64le had different symbol versions but not any other need for different sysdeps directories.
diff --git a/sysdeps/powerpc/powerpc64/Makefile b/sysdeps/powerpc/powerpc64-common/Makefile similarity index 100% rename from sysdeps/powerpc/powerpc64/Makefile rename to sysdeps/powerpc/powerpc64-common/Makefile diff --git a/sysdeps/powerpc/powerpc64/__longjmp-common.S b/sysdeps/powerpc/powerpc64-common/__longjmp-common.S similarity index 100% rename from sysdeps/powerpc/powerpc64/__longjmp-common.S rename to sysdeps/powerpc/powerpc64-common/__longjmp-common.S diff --git a/sysdeps/powerpc/powerpc64/__longjmp.S b/sysdeps/powerpc/powerpc64-common/__longjmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/__longjmp.S rename to sysdeps/powerpc/powerpc64-common/__longjmp.S diff --git a/sysdeps/powerpc/powerpc64/a2/memcpy.S b/sysdeps/powerpc/powerpc64-common/a2/memcpy.S similarity index 100% rename from sysdeps/powerpc/powerpc64/a2/memcpy.S rename to sysdeps/powerpc/powerpc64-common/a2/memcpy.S diff --git a/sysdeps/powerpc/powerpc64/addmul_1.S b/sysdeps/powerpc/powerpc64-common/addmul_1.S similarity index 100% rename from sysdeps/powerpc/powerpc64/addmul_1.S rename to sysdeps/powerpc/powerpc64-common/addmul_1.S diff --git a/sysdeps/powerpc/powerpc64/atomic-machine.h b/sysdeps/powerpc/powerpc64-common/atomic-machine.h similarity index 100% rename from sysdeps/powerpc/powerpc64/atomic-machine.h rename to sysdeps/powerpc/powerpc64-common/atomic-machine.h diff --git a/sysdeps/powerpc/powerpc64/backtrace.c b/sysdeps/powerpc/powerpc64-common/backtrace.c similarity index 100% rename from sysdeps/powerpc/powerpc64/backtrace.c rename to sysdeps/powerpc/powerpc64-common/backtrace.c diff --git a/sysdeps/powerpc/powerpc64/bits/wordsize.h b/sysdeps/powerpc/powerpc64-common/bits/wordsize.h similarity index 100% rename from sysdeps/powerpc/powerpc64/bits/wordsize.h rename to sysdeps/powerpc/powerpc64-common/bits/wordsize.h diff --git a/sysdeps/powerpc/powerpc64/bsd-_setjmp.S b/sysdeps/powerpc/powerpc64-common/bsd-_setjmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/bsd-_setjmp.S rename to sysdeps/powerpc/powerpc64-common/bsd-_setjmp.S diff --git a/sysdeps/powerpc/powerpc64/bsd-setjmp.S b/sysdeps/powerpc/powerpc64-common/bsd-setjmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/bsd-setjmp.S rename to sysdeps/powerpc/powerpc64-common/bsd-setjmp.S diff --git a/sysdeps/powerpc/powerpc64/bzero.S b/sysdeps/powerpc/powerpc64-common/bzero.S similarity index 100% rename from sysdeps/powerpc/powerpc64/bzero.S rename to sysdeps/powerpc/powerpc64-common/bzero.S diff --git a/sysdeps/powerpc/powerpc64/cell/memcpy.S b/sysdeps/powerpc/powerpc64-common/cell/memcpy.S similarity index 100% rename from sysdeps/powerpc/powerpc64/cell/memcpy.S rename to sysdeps/powerpc/powerpc64-common/cell/memcpy.S diff --git a/sysdeps/powerpc/powerpc64/configure b/sysdeps/powerpc/powerpc64-common/configure similarity index 100% rename from sysdeps/powerpc/powerpc64/configure rename to sysdeps/powerpc/powerpc64-common/configure diff --git a/sysdeps/powerpc/powerpc64/configure.ac b/sysdeps/powerpc/powerpc64-common/configure.ac similarity index 100% rename from sysdeps/powerpc/powerpc64/configure.ac rename to sysdeps/powerpc/powerpc64-common/configure.ac diff --git a/sysdeps/powerpc/powerpc64/crti.S b/sysdeps/powerpc/powerpc64-common/crti.S similarity index 100% rename from sysdeps/powerpc/powerpc64/crti.S rename to sysdeps/powerpc/powerpc64-common/crti.S diff --git a/sysdeps/powerpc/powerpc64/crtn.S b/sysdeps/powerpc/powerpc64-common/crtn.S similarity index 100% rename from sysdeps/powerpc/powerpc64/crtn.S rename to sysdeps/powerpc/powerpc64-common/crtn.S diff --git a/sysdeps/powerpc/powerpc64/dl-dtprocnum.h b/sysdeps/powerpc/powerpc64-common/dl-dtprocnum.h similarity index 100% rename from sysdeps/powerpc/powerpc64/dl-dtprocnum.h rename to sysdeps/powerpc/powerpc64-common/dl-dtprocnum.h diff --git a/sysdeps/powerpc/powerpc64/dl-irel.h b/sysdeps/powerpc/powerpc64-common/dl-irel.h similarity index 100% rename from sysdeps/powerpc/powerpc64/dl-irel.h rename to sysdeps/powerpc/powerpc64-common/dl-irel.h diff --git a/sysdeps/powerpc/powerpc64/dl-machine.c b/sysdeps/powerpc/powerpc64-common/dl-machine.c similarity index 100% rename from sysdeps/powerpc/powerpc64/dl-machine.c rename to sysdeps/powerpc/powerpc64-common/dl-machine.c diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64-common/dl-machine.h similarity index 100% rename from sysdeps/powerpc/powerpc64/dl-machine.h rename to sysdeps/powerpc/powerpc64-common/dl-machine.h diff --git a/sysdeps/powerpc/powerpc64/dl-trampoline.S b/sysdeps/powerpc/powerpc64-common/dl-trampoline.S similarity index 100% rename from sysdeps/powerpc/powerpc64/dl-trampoline.S rename to sysdeps/powerpc/powerpc64-common/dl-trampoline.S diff --git a/sysdeps/powerpc/powerpc64/entry.h b/sysdeps/powerpc/powerpc64-common/entry.h similarity index 100% rename from sysdeps/powerpc/powerpc64/entry.h rename to sysdeps/powerpc/powerpc64-common/entry.h diff --git a/sysdeps/powerpc/powerpc64/ffsll.c b/sysdeps/powerpc/powerpc64-common/ffsll.c similarity index 100% rename from sysdeps/powerpc/powerpc64/ffsll.c rename to sysdeps/powerpc/powerpc64-common/ffsll.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/Makefile similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/Makefile rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/Makefile diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf-power8.S similarity index 93% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-power8.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf-power8.S index c0c3adc1a2..3297ce66fe 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-power8.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf-power8.S @@ -21,4 +21,4 @@ #define __ieee754_expf __ieee754_expf_power8 -#include <sysdeps/powerpc/powerpc64/power8/fpu/e_expf.S> +#include <sysdeps/powerpc/powerpc64-common/power8/fpu/e_expf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_expf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_expf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-power7.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-power7.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot-power7.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypot.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypot.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-power7.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-power7.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf-power7.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/e_hypotf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/e_hypotf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-power5+.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-power5+.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-power5+.S index 535298d77b..45871cdd0b 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-power5+.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-power5+.S @@ -27,4 +27,4 @@ #define __ceil __ceil_power5plus -#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_ceil.S> +#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceil.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-ppc64.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-ppc64.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-ppc64.S index ffff330762..afaefc9f0a 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil-ppc64.S @@ -27,4 +27,4 @@ #define __ceil __ceil_ppc64 -#include <sysdeps/powerpc/powerpc64/fpu/s_ceil.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_ceil.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceil.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceil.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-power5+.S similarity index 93% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-power5+.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-power5+.S index 9ac2771733..ba677891e2 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-power5+.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-power5+.S @@ -21,4 +21,4 @@ #define __ceilf __ceilf_power5plus -#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_ceilf.S> +#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceilf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-ppc64.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-ppc64.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-ppc64.S index e39dfc05d8..aa6478ea8b 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf-ppc64.S @@ -21,4 +21,4 @@ #define __ceilf __ceilf_ppc64 -#include <sysdeps/powerpc/powerpc64/fpu/s_ceilf.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_ceilf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_ceilf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_ceilf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-power6.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-power6.S index 7150c32020..9d405dac6c 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-power6.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-power6.S @@ -29,4 +29,4 @@ #define __copysign __copysign_power6 -#include <sysdeps/powerpc/powerpc64/fpu/s_copysign.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_copysign.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-ppc64.S similarity index 95% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-ppc64.S index f19f575393..5d191f3f11 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign-ppc64.S @@ -31,4 +31,4 @@ #define hidden_def(name) \ strong_alias (__copysign_ppc64, __GI___copysign) -#include <sysdeps/powerpc/powerpc64/fpu/s_copysign.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_copysign.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysign.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysign.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysignf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysignf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_copysignf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_copysignf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf-power8.S similarity index 93% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-power8.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf-power8.S index 29a59e9dbc..2d21d69957 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-power8.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf-power8.S @@ -21,4 +21,4 @@ #define __cosf __cosf_power8 -#include <sysdeps/powerpc/powerpc64/power8/fpu/s_cosf.S> +#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_cosf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_cosf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_cosf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power7.S index 8cdfc02003..da728ef02a 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power7.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power7.S @@ -29,4 +29,4 @@ #define __finite __finite_power7 -#include <sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S> +#include <sysdeps/powerpc/powerpc64-common/power7/fpu/s_finite.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power8.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power8.S index 686aa5a331..c01f5eccea 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-power8.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-power8.S @@ -29,4 +29,4 @@ #define __finite __finite_power8 -#include <sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S> +#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_finite.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finite.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finitef-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finitef-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finitef.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_finitef.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_finitef.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-power5+.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-power5+.S index 33640b4d44..cb15604534 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-power5+.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-power5+.S @@ -27,4 +27,4 @@ #define __floor __floor_power5plus -#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_floor.S> +#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floor.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-ppc64.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-ppc64.S index b842ab07cb..afaed72bb1 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor-ppc64.S @@ -27,4 +27,4 @@ #define __floor __floor_ppc64 -#include <sysdeps/powerpc/powerpc64/fpu/s_floor.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_floor.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_floor.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floor.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-power5+.S similarity index 93% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-power5+.S index c7b3065410..57c9e7b7e6 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-power5+.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-power5+.S @@ -21,4 +21,4 @@ #define __floorf __floorf_power5plus -#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_floorf.S> +#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floorf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-ppc64.S similarity index 93% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-ppc64.S index 84ab921f72..fc5e4ac901 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf-ppc64.S @@ -21,4 +21,4 @@ #define __floorf __floorf_ppc64 -#include <sysdeps/powerpc/powerpc64/fpu/s_floorf.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_floorf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_floorf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_floorf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power7.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power7.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power7.S index 914d0d150c..ff4584461f 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power7.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power7.S @@ -29,4 +29,4 @@ #define __isinf __isinf_power7 -#include <sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S> +#include <sysdeps/powerpc/powerpc64-common/power7/fpu/s_isinf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power8.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power8.S index 3545e20a82..e5fc8320c9 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-power8.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-power8.S @@ -29,4 +29,4 @@ #define __isinf __isinf_power8 -#include <sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S> +#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_isinf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinff-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinff-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinff-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinff-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinff.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinff.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinff.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isinff.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power5.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power5.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power5.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power5.S index 54375657bf..e1d6f55355 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power5.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power5.S @@ -29,4 +29,4 @@ #define __isnan __isnan_power5 -#include <sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S> +#include <sysdeps/powerpc/powerpc64-common/power5/fpu/s_isnan.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6.S index ec231ed431..440a1d3607 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6.S @@ -29,4 +29,4 @@ #define __isnan __isnan_power6 -#include <sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S> +#include <sysdeps/powerpc/powerpc64-common/power6/fpu/s_isnan.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6x.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6x.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6x.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6x.S index f59e8395c9..79923ded74 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power6x.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power6x.S @@ -29,4 +29,4 @@ #define __isnan __isnan_power6x -#include <sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S> +#include <sysdeps/powerpc/powerpc64-common/power6x/fpu/s_isnan.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power7.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power7.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power7.S index 2db67b0325..aaac078772 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power7.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power7.S @@ -29,4 +29,4 @@ #define __isnan __isnan_power7 -#include <sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S> +#include <sysdeps/powerpc/powerpc64-common/power7/fpu/s_isnan.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power8.S index db84dc0d03..2c4a1d6cfc 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-power8.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-power8.S @@ -29,4 +29,4 @@ #define __isnan __isnan_power8 -#include <sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S> +#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_isnan.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-ppc64.S similarity index 95% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-ppc64.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-ppc64.S index f09e811677..89be57b52c 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan-ppc64.S @@ -33,4 +33,4 @@ .globl __GI___isnan ; .set __GI___isnan,__isnan_ppc64 #endif -#include <sysdeps/powerpc/powerpc64/fpu/s_isnan.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_isnan.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnan.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnanf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnanf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnanf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_isnanf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power6x.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power6x.S index 887b7532c7..c17720bd41 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power6x.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power6x.S @@ -27,4 +27,4 @@ #define __llrint __llrint_power6x -#include <sysdeps/powerpc/powerpc64/power6x/fpu/s_llrint.S> +#include <sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llrint.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power8.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power8.S index 69aed9c80c..c0f5062b27 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-power8.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-power8.S @@ -27,4 +27,4 @@ #define __llrint __llrint_power8 -#include <sysdeps/powerpc/powerpc64/power8/fpu/s_llrint.S> +#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_llrint.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-ppc64.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-ppc64.S index c8011a468e..00041670fc 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint-ppc64.S @@ -27,4 +27,4 @@ #define __llrint __llrint_ppc64 -#include <sysdeps/powerpc/powerpc64/fpu/s_llrint.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_llrint.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrint.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrint.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrintf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrintf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llrintf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llrintf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power5+.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power5+.S index 6be71aa3dd..2a6c0f551b 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power5+.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power5+.S @@ -28,4 +28,4 @@ #define __llround __llround_power5plus #define __lround __lround_power5plus -#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_llround.S> +#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_llround.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power6x.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power6x.S index d301d7d8e2..0d5ef33d8d 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power6x.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power6x.S @@ -28,4 +28,4 @@ #define __llround __llround_power6x #define __lround __lround_power6x -#include <sysdeps/powerpc/powerpc64/power6x/fpu/s_llround.S> +#include <sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llround.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power8.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power8.S index 5a2a2a6c3c..1a17e622f3 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-power8.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-power8.S @@ -27,4 +27,4 @@ #define __llround __llround_power8 -#include <sysdeps/powerpc/powerpc64/power8/fpu/s_llround.S> +#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_llround.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-ppc64.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-ppc64.S index a2b3e38c42..6e51518431 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround-ppc64.S @@ -24,4 +24,4 @@ #define __llround __llround_ppc64 #define __lround __lround_ppc64 -#include <sysdeps/powerpc/powerpc64/fpu/s_llround.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_llround.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llround.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llround.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llroundf-ppc64.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf-ppc64.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llroundf-ppc64.S index 45de8e3b94..611198968c 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llroundf-ppc64.S @@ -28,4 +28,4 @@ #define __llroundf __llroundf_ppc64 #define __lroundf __lroundf_ppc64 -#include <sysdeps/powerpc/powerpc64/fpu/s_llroundf.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_llroundf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llroundf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_llroundf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_llroundf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb-power7.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb-power7.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb-power7.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logb.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logb.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf-power7.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf-power7.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf-power7.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl-power7.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl-power7.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl-power7.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_logbl.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_logbl.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_lrint.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_lrint.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_lrint.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_lrint.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_lround.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_lround.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_lround.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_lround.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-power5+.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf-power5+.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-power5+.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf-power5+.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_modf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff-power5+.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff-power5+.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff-power5+.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff-power5+.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_modff.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_modff.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-power5+.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-power5+.S index e5bcd92b4d..ad4bf8c720 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-power5+.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-power5+.S @@ -27,4 +27,4 @@ #define __round __round_power5plus -#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_round.S> +#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_round.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-ppc64.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-ppc64.S index 9751093d08..0e2efea29a 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round-ppc64.S @@ -27,4 +27,4 @@ #define __round __round_ppc64 -#include <sysdeps/powerpc/powerpc64/fpu/s_round.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_round.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_round.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_round.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_round.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-power5+.S similarity index 93% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-power5+.S index b8a142e99e..712adf62b4 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-power5+.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-power5+.S @@ -21,4 +21,4 @@ #define __roundf __roundf_power5plus -#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_roundf.S> +#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_roundf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-ppc64.S similarity index 93% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-ppc64.S index a6b6314e72..4b2db60704 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf-ppc64.S @@ -21,4 +21,4 @@ #define __roundf __roundf_ppc64 -#include <sysdeps/powerpc/powerpc64/fpu/s_roundf.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_roundf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_roundf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_roundf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-power8.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf-power8.S similarity index 93% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-power8.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf-power8.S index aaf80e5bab..d857537b37 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-power8.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf-power8.S @@ -21,4 +21,4 @@ #define __sinf __sinf_power8 -#include <sysdeps/powerpc/powerpc64/power8/fpu/s_sinf.S> +#include <sysdeps/powerpc/powerpc64-common/power8/fpu/s_sinf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-ppc64.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf-ppc64.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_sinf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_sinf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-power5+.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-power5+.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-power5+.S index 83ed3c2c52..eddfba3ce8 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-power5+.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-power5+.S @@ -27,4 +27,4 @@ #define __trunc __trunc_power5plus -#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_trunc.S> +#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_trunc.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-ppc64.S similarity index 94% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-ppc64.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-ppc64.S index a3f3a193c1..bc77331471 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc-ppc64.S @@ -27,4 +27,4 @@ #define __trunc __trunc_ppc64 -#include <sysdeps/powerpc/powerpc64/fpu/s_trunc.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_trunc.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_trunc.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_trunc.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-power5+.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-power5+.S similarity index 93% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-power5+.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-power5+.S index 7c64ef5976..eb191ca4b7 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-power5+.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-power5+.S @@ -21,4 +21,4 @@ #define __truncf __truncf_power5plus -#include <sysdeps/powerpc/powerpc64/power5+/fpu/s_truncf.S> +#include <sysdeps/powerpc/powerpc64-common/power5+/fpu/s_truncf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-ppc64.S b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-ppc64.S similarity index 93% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-ppc64.S rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-ppc64.S index f397c43c59..a8f0369aac 100644 --- a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf-ppc64.S @@ -21,4 +21,4 @@ #define __truncf __truncf_ppc64 -#include <sysdeps/powerpc/powerpc64/fpu/s_truncf.S> +#include <sysdeps/powerpc/powerpc64-common/fpu/s_truncf.S> diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/s_truncf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/s_truncf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/w_expf.c b/sysdeps/powerpc/powerpc64-common/fpu/multiarch/w_expf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/multiarch/w_expf.c rename to sysdeps/powerpc/powerpc64-common/fpu/multiarch/w_expf.c diff --git a/sysdeps/powerpc/powerpc64/fpu/s_ceil.S b/sysdeps/powerpc/powerpc64-common/fpu/s_ceil.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_ceil.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_ceil.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_ceilf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_ceilf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_ceilf.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_ceilf.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_copysign.S b/sysdeps/powerpc/powerpc64-common/fpu/s_copysign.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_copysign.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_copysign.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_copysignf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_copysignf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_copysignf.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_copysignf.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_copysignl.S b/sysdeps/powerpc/powerpc64-common/fpu/s_copysignl.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_copysignl.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_copysignl.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_fabsl.S b/sysdeps/powerpc/powerpc64-common/fpu/s_fabsl.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_fabsl.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_fabsl.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_floor.S b/sysdeps/powerpc/powerpc64-common/fpu/s_floor.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_floor.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_floor.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_floorf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_floorf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_floorf.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_floorf.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64-common/fpu/s_isnan.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_isnan.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_isnan.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llrint.S b/sysdeps/powerpc/powerpc64-common/fpu/s_llrint.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_llrint.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_llrint.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llrintf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_llrintf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_llrintf.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_llrintf.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llround.S b/sysdeps/powerpc/powerpc64-common/fpu/s_llround.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_llround.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_llround.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_llroundf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_llroundf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_llroundf.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_llroundf.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_lrint.S b/sysdeps/powerpc/powerpc64-common/fpu/s_lrint.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_lrint.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_lrint.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_lround.S b/sysdeps/powerpc/powerpc64-common/fpu/s_lround.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_lround.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_lround.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_lroundf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_lroundf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_lroundf.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_lroundf.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S b/sysdeps/powerpc/powerpc64-common/fpu/s_nearbyint.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_nearbyint.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_nearbyintf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_nearbyintf.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_rint.S b/sysdeps/powerpc/powerpc64-common/fpu/s_rint.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_rint.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_rint.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_rintf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_rintf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_rintf.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_rintf.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_round.S b/sysdeps/powerpc/powerpc64-common/fpu/s_round.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_round.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_round.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_roundf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_roundf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_roundf.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_roundf.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_trunc.S b/sysdeps/powerpc/powerpc64-common/fpu/s_trunc.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_trunc.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_trunc.S diff --git a/sysdeps/powerpc/powerpc64/fpu/s_truncf.S b/sysdeps/powerpc/powerpc64-common/fpu/s_truncf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/fpu/s_truncf.S rename to sysdeps/powerpc/powerpc64-common/fpu/s_truncf.S diff --git a/sysdeps/powerpc/powerpc64/hp-timing.h b/sysdeps/powerpc/powerpc64-common/hp-timing.h similarity index 100% rename from sysdeps/powerpc/powerpc64/hp-timing.h rename to sysdeps/powerpc/powerpc64-common/hp-timing.h diff --git a/sysdeps/powerpc/powerpc64/lshift.S b/sysdeps/powerpc/powerpc64-common/lshift.S similarity index 100% rename from sysdeps/powerpc/powerpc64/lshift.S rename to sysdeps/powerpc/powerpc64-common/lshift.S diff --git a/sysdeps/powerpc/powerpc64/memcpy.S b/sysdeps/powerpc/powerpc64-common/memcpy.S similarity index 100% rename from sysdeps/powerpc/powerpc64/memcpy.S rename to sysdeps/powerpc/powerpc64-common/memcpy.S diff --git a/sysdeps/powerpc/powerpc64/memset.S b/sysdeps/powerpc/powerpc64-common/memset.S similarity index 100% rename from sysdeps/powerpc/powerpc64/memset.S rename to sysdeps/powerpc/powerpc64-common/memset.S diff --git a/sysdeps/powerpc/powerpc64/mul_1.S b/sysdeps/powerpc/powerpc64-common/mul_1.S similarity index 100% rename from sysdeps/powerpc/powerpc64/mul_1.S rename to sysdeps/powerpc/powerpc64-common/mul_1.S diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64-common/multiarch/Makefile similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/Makefile rename to sysdeps/powerpc/powerpc64-common/multiarch/Makefile diff --git a/sysdeps/powerpc/powerpc64/multiarch/bcopy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/bcopy-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/bcopy-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/bcopy-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/bcopy.c b/sysdeps/powerpc/powerpc64-common/multiarch/bcopy.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/bcopy.c rename to sysdeps/powerpc/powerpc64-common/multiarch/bcopy.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/bzero.c b/sysdeps/powerpc/powerpc64-common/multiarch/bzero.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/bzero.c rename to sysdeps/powerpc/powerpc64-common/multiarch/bzero.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc64-common/multiarch/ifunc-impl-list.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/ifunc-impl-list.c rename to sysdeps/powerpc/powerpc64-common/multiarch/ifunc-impl-list.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/init-arch.h b/sysdeps/powerpc/powerpc64-common/multiarch/init-arch.h similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/init-arch.h rename to sysdeps/powerpc/powerpc64-common/multiarch/init-arch.h diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/memchr-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memchr-power7.S index bf6a8fd825..889014f2b9 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memchr-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memchr-power7.S @@ -23,4 +23,4 @@ #undef weak_alias #define weak_alias(name,alias) -#include <sysdeps/powerpc/powerpc64/power7/memchr.S> +#include <sysdeps/powerpc/powerpc64-common/power7/memchr.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/memchr-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memchr-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memchr-power8.S index 10a8420fef..a218441f92 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memchr-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memchr-power8.S @@ -23,4 +23,4 @@ #undef weak_alias #define weak_alias(name,alias) -#include <sysdeps/powerpc/powerpc64/power8/memchr.S> +#include <sysdeps/powerpc/powerpc64-common/power8/memchr.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/memchr-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/memchr-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/memchr-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/memchr.c b/sysdeps/powerpc/powerpc64-common/multiarch/memchr.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/memchr.c rename to sysdeps/powerpc/powerpc64-common/multiarch/memchr.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power4.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power4.S index 987e7d5edf..c618133f0a 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power4.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power4.S @@ -23,4 +23,4 @@ #undef weak_alias #define weak_alias(name,alias) -#include <sysdeps/powerpc/powerpc64/power4/memcmp.S> +#include <sysdeps/powerpc/powerpc64-common/power4/memcmp.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power7.S index ffea13ea96..ecb8375f73 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power7.S @@ -23,4 +23,4 @@ #undef weak_alias #define weak_alias(name,alias) -#include <sysdeps/powerpc/powerpc64/power7/memcmp.S> +#include <sysdeps/powerpc/powerpc64-common/power7/memcmp.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power8.S index 41c291a5d3..211ac66017 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memcmp-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-power8.S @@ -23,4 +23,4 @@ #undef weak_alias #define weak_alias(name,alias) -#include <sysdeps/powerpc/powerpc64/power8/memcmp.S> +#include <sysdeps/powerpc/powerpc64-common/power8/memcmp.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/memcmp-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/memcmp-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcmp.c b/sysdeps/powerpc/powerpc64-common/multiarch/memcmp.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/memcmp.c rename to sysdeps/powerpc/powerpc64-common/multiarch/memcmp.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-a2.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy-a2.S index 795f32cc0f..9ced9964b5 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-a2.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-a2.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/a2/memcpy.S> +#include <sysdeps/powerpc/powerpc64-common/a2/memcpy.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-cell.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-cell.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memcpy-cell.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy-cell.S index 448a9d6a17..627a2ff889 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-cell.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-cell.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/cell/memcpy.S> +#include <sysdeps/powerpc/powerpc64-common/cell/memcpy.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power4.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power4.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memcpy-power4.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power4.S index 768d8358f1..a43b4a6f6b 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power4.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power4.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power4/memcpy.S> +#include <sysdeps/powerpc/powerpc64-common/power4/memcpy.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power6.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power6.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memcpy-power6.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power6.S index 9a0995f26c..6a51071292 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power6.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power6.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power6/memcpy.S> +#include <sysdeps/powerpc/powerpc64-common/power6/memcpy.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memcpy-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power7.S index 503be8cca5..cb6403b119 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-power7.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power7/memcpy.S> +#include <sysdeps/powerpc/powerpc64-common/power7/memcpy.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-ppc64.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy-ppc64.S index 3cac3de4cb..30452e139b 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memcpy-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy-ppc64.S @@ -23,4 +23,4 @@ # define libc_hidden_builtin_def(name) #endif -#include <sysdeps/powerpc/powerpc64/memcpy.S> +#include <sysdeps/powerpc/powerpc64-common/memcpy.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memcpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/memcpy.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/memcpy.c rename to sysdeps/powerpc/powerpc64-common/multiarch/memcpy.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/memmove-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memmove-power7.S index 90816ce323..038cc4f0ef 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memmove-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memmove-power7.S @@ -24,4 +24,4 @@ #undef bcopy #define bcopy __bcopy_power7 -#include <sysdeps/powerpc/powerpc64/power7/memmove.S> +#include <sysdeps/powerpc/powerpc64-common/power7/memmove.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/memmove-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/memmove-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/memmove.c b/sysdeps/powerpc/powerpc64-common/multiarch/memmove.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/memmove.c rename to sysdeps/powerpc/powerpc64-common/multiarch/memmove.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/mempcpy-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/mempcpy-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/mempcpy-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/mempcpy-power7.S index d0eb400cf0..3397ad81ec 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/mempcpy-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/mempcpy-power7.S @@ -23,4 +23,4 @@ #undef weak_alias #define weak_alias(name, alias) -#include <sysdeps/powerpc/powerpc64/power7/mempcpy.S> +#include <sysdeps/powerpc/powerpc64-common/power7/mempcpy.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/mempcpy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/mempcpy-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/mempcpy-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/mempcpy-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/mempcpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/mempcpy.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/mempcpy.c rename to sysdeps/powerpc/powerpc64-common/multiarch/mempcpy.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power7.S index d35d8b3535..72039417c4 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memrchr-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power7.S @@ -23,4 +23,4 @@ #undef weak_alias #define weak_alias(name,alias) -#include <sysdeps/powerpc/powerpc64/power7/memrchr.S> +#include <sysdeps/powerpc/powerpc64-common/power7/memrchr.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memrchr-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power8.S index 469b1297dd..f2fad0988a 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memrchr-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memrchr-power8.S @@ -23,4 +23,4 @@ #undef weak_alias #define weak_alias(name,alias) -#include <sysdeps/powerpc/powerpc64/power8/memrchr.S> +#include <sysdeps/powerpc/powerpc64-common/power8/memrchr.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/memrchr-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/memrchr-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/memrchr-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/memrchr.c b/sysdeps/powerpc/powerpc64-common/multiarch/memrchr.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/memrchr.c rename to sysdeps/powerpc/powerpc64-common/multiarch/memrchr.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-power4.S b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power4.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memset-power4.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memset-power4.S index 2031e1456e..b345493132 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memset-power4.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power4.S @@ -24,4 +24,4 @@ #undef __bzero #define __bzero __bzero_power4 -#include <sysdeps/powerpc/powerpc64/power4/memset.S> +#include <sysdeps/powerpc/powerpc64-common/power4/memset.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-power6.S b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power6.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memset-power6.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memset-power6.S index 2545ed800d..721e1908fd 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memset-power6.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power6.S @@ -24,4 +24,4 @@ #undef __bzero #define __bzero __bzero_power6 -#include <sysdeps/powerpc/powerpc64/power6/memset.S> +#include <sysdeps/powerpc/powerpc64-common/power6/memset.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memset-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memset-power7.S index e707762831..61d7fc633f 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memset-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power7.S @@ -23,4 +23,4 @@ #undef __bzero #define __bzero __bzero_power7 -#include <sysdeps/powerpc/powerpc64/power7/memset.S> +#include <sysdeps/powerpc/powerpc64-common/power7/memset.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/memset-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memset-power8.S index 45149e14cc..25d52de7af 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memset-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memset-power8.S @@ -24,4 +24,4 @@ #undef __bzero #define __bzero __bzero_power8 -#include <sysdeps/powerpc/powerpc64/power8/memset.S> +#include <sysdeps/powerpc/powerpc64-common/power8/memset.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S b/sysdeps/powerpc/powerpc64-common/multiarch/memset-ppc64.S similarity index 96% rename from sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S rename to sysdeps/powerpc/powerpc64-common/multiarch/memset-ppc64.S index 0f16e21c61..0fffb08773 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/memset-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/memset-ppc64.S @@ -39,4 +39,4 @@ END_GEN_TB (__bzero_ppc,TB_TOCLESS) /* Do not implement __bzero at powerpc64/memset.S. */ #define NO_BZERO_IMPL -#include <sysdeps/powerpc/powerpc64/memset.S> +#include <sysdeps/powerpc/powerpc64-common/memset.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/memset.c b/sysdeps/powerpc/powerpc64-common/multiarch/memset.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/memset.c rename to sysdeps/powerpc/powerpc64-common/multiarch/memset.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr-power7.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr-power7.S index c7bb422c78..6a45de5003 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr-power7.S @@ -18,4 +18,4 @@ #define RAWMEMCHR __rawmemchr_power7 -#include <sysdeps/powerpc/powerpc64/power7/rawmemchr.S> +#include <sysdeps/powerpc/powerpc64-common/power7/rawmemchr.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/rawmemchr-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c b/sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/rawmemchr.c rename to sysdeps/powerpc/powerpc64-common/multiarch/rawmemchr.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/rtld-memset.c b/sysdeps/powerpc/powerpc64-common/multiarch/rtld-memset.c similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/rtld-memset.c rename to sysdeps/powerpc/powerpc64-common/multiarch/rtld-memset.c index 7fb4b733e4..5922bf3f8c 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/rtld-memset.c +++ b/sysdeps/powerpc/powerpc64-common/multiarch/rtld-memset.c @@ -15,4 +15,4 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <sysdeps/powerpc/powerpc64/rtld-memset.c> +#include <sysdeps/powerpc/powerpc64-common/rtld-memset.c> diff --git a/sysdeps/powerpc/powerpc64/multiarch/rtld-strchr.S b/sysdeps/powerpc/powerpc64-common/multiarch/rtld-strchr.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/rtld-strchr.S rename to sysdeps/powerpc/powerpc64-common/multiarch/rtld-strchr.S index 16ba7264c4..61655e494c 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/rtld-strchr.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/rtld-strchr.S @@ -15,4 +15,4 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <sysdeps/powerpc/powerpc64/strchr.S> +#include <sysdeps/powerpc/powerpc64-common/strchr.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/stpcpy-power7.c rename to sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-power7.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/stpcpy-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-power8.S index 3baebfa9b6..6eb67f8cca 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-power8.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power8/stpcpy.S> +#include <sysdeps/powerpc/powerpc64-common/power8/stpcpy.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/stpcpy-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/stpcpy-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpcpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/stpcpy.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/stpcpy.c rename to sysdeps/powerpc/powerpc64-common/multiarch/stpcpy.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/stpncpy-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power7.S index e7ce628e60..be9107c14f 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power7.S @@ -28,4 +28,4 @@ #define MEMSET_is_local #endif -#include <sysdeps/powerpc/powerpc64/power7/stpncpy.S> +#include <sysdeps/powerpc/powerpc64-common/power7/stpncpy.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/stpncpy-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power8.S index f8a0f293ca..d3cb19c9cc 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-power8.S @@ -26,4 +26,4 @@ #define MEMSET_is_local #endif -#include <sysdeps/powerpc/powerpc64/power8/stpncpy.S> +#include <sysdeps/powerpc/powerpc64-common/power8/stpncpy.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpncpy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/stpncpy-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/stpncpy-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/stpncpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/stpncpy.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/stpncpy.c rename to sysdeps/powerpc/powerpc64-common/multiarch/stpncpy.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power7.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power7.S index dc0f68d232..17905e5e38 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power7.S @@ -23,4 +23,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power7/strcasecmp.S> +#include <sysdeps/powerpc/powerpc64-common/power7/strcasecmp.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power8.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power8.S index 49cf3ff5a9..1e503a3202 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-power8.S @@ -23,4 +23,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power8/strcasecmp.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strcasecmp.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcasecmp-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcasecmp.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp_l-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp_l-power7.S index 6bad13ab6b..7345d4e8ee 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp_l-power7.S @@ -28,4 +28,4 @@ #define __STRCMP __strcasecmp_l #define STRCMP strcasecmp_l -#include <sysdeps/powerpc/powerpc64/power7/strcasecmp.S> +#include <sysdeps/powerpc/powerpc64-common/power7/strcasecmp.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp_l.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcasecmp_l.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasecmp_l.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcasestr-power8.S similarity index 95% rename from sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasestr-power8.S index 2fbf8a9143..e2bb0f05aa 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcasestr-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcasestr-power8.S @@ -30,4 +30,4 @@ /* strchr is used to check if first char of r4 is present in r3. */ #define STRCHR __strchr_power8 -#include <sysdeps/powerpc/powerpc64/power8/strcasestr.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strcasestr.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasestr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcasestr-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcasestr-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasestr-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcasestr.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcasestr.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcasestr.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcasestr.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcat-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcat-power7.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcat-power7.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcat-power8.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcat-power8.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcat-power8.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcat-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcat-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcat-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcat.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcat.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcat.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcat.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strchr-power7.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strchr-power7.S index 7505c44b0d..e14c8f5ad6 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strchr-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strchr-power7.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power7/strchr.S> +#include <sysdeps/powerpc/powerpc64-common/power7/strchr.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchr-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strchr-power8.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strchr-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strchr-power8.S index ca01f88887..0a4f17878e 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strchr-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strchr-power8.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power8/strchr.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strchr.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S b/sysdeps/powerpc/powerpc64-common/multiarch/strchr-ppc64.S similarity index 95% rename from sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strchr-ppc64.S index 3bef338684..a82886c244 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strchr-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strchr-ppc64.S @@ -24,4 +24,4 @@ .globl __GI_strchr; __GI_strchr = __strchr_ppc #endif -#include <sysdeps/powerpc/powerpc64/strchr.S> +#include <sysdeps/powerpc/powerpc64-common/strchr.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchr.c b/sysdeps/powerpc/powerpc64-common/multiarch/strchr.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strchr.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strchr.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power7.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power7.S index b934964f78..00205ad5c2 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power7.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power7/strchrnul.S> +#include <sysdeps/powerpc/powerpc64-common/power7/strchrnul.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power8.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strchrnul-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power8.S index e66cdfe149..007cfbb8e1 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-power8.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power8/strchrnul.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strchrnul.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strchrnul-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strchrnul-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strchrnul.c b/sysdeps/powerpc/powerpc64-common/multiarch/strchrnul.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strchrnul.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strchrnul.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power7.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strcmp-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power7.S index 7ef0c91557..08d97f4a8b 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power7.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power7/strcmp.S> +#include <sysdeps/powerpc/powerpc64-common/power7/strcmp.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/strcmp-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power8.S index ee4218c9f9..52a5f2eb9c 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power8.S @@ -22,5 +22,5 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power8/strcmp.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strcmp.S> #endif diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power9.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power9.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/strcmp-power9.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power9.S index 5cfee93132..8ddcfebb7a 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-power9.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-power9.S @@ -22,5 +22,5 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power9/strcmp.S> +#include <sysdeps/powerpc/powerpc64-common/power9/strcmp.S> #endif diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-ppc64.S similarity index 95% rename from sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strcmp-ppc64.S index e4a63f5010..3dc4a43850 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcmp-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp-ppc64.S @@ -24,4 +24,4 @@ .globl __GI_strcmp; __GI_strcmp = __strcmp_ppc #endif /* SHARED && IS_IN */ -#include <sysdeps/powerpc/powerpc64/strcmp.S> +#include <sysdeps/powerpc/powerpc64-common/strcmp.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcmp.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcmp.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcmp.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcmp.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcpy-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcpy-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcpy-power7.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcpy-power7.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcpy-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcpy-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/strcpy-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strcpy-power8.S index 7c9378dcc2..7dd0d5500b 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcpy-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcpy-power8.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power8/strcpy.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strcpy.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcpy-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcpy-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcpy-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcpy.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcpy.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcpy.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcspn-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strcspn-power8.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strcspn-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strcspn-power8.S index 1320145f80..96d37bc25d 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strcspn-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strcspn-power8.S @@ -20,4 +20,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power8/strcspn.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strcspn.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcspn-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcspn-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcspn-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcspn-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strcspn.c b/sysdeps/powerpc/powerpc64-common/multiarch/strcspn.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strcspn.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strcspn.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strlen-power7.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strlen-power7.S index 067c298fe8..bc776f09f4 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strlen-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strlen-power7.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power7/strlen.S> +#include <sysdeps/powerpc/powerpc64-common/power7/strlen.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strlen-power8.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strlen-power8.S index f7972ff53e..6cae162253 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strlen-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strlen-power8.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power8/strlen.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strlen.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S b/sysdeps/powerpc/powerpc64-common/multiarch/strlen-ppc64.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strlen-ppc64.S index 8d6cf5204b..7c0a9a151e 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strlen-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strlen-ppc64.S @@ -23,4 +23,4 @@ # define libc_hidden_builtin_def(name) #endif -#include <sysdeps/powerpc/powerpc64/strlen.S> +#include <sysdeps/powerpc/powerpc64-common/strlen.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strlen.c b/sysdeps/powerpc/powerpc64-common/multiarch/strlen.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strlen.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strlen.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncase-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strncase-power7.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strncase-power7.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncase-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/strncase-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strncase-power8.S index 3b5a8de315..35a8d9d4db 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncase-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncase-power8.S @@ -23,4 +23,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power8/strncase.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strncase.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncase-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strncase-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strncase-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncase.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strncase.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strncase.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncase_l-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strncase_l-power7.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strncase_l-power7.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncase_l.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncase_l.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strncase_l.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strncase_l.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncat-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncat-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strncat-power7.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strncat-power7.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncat-power8.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncat-power8.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strncat-power8.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strncat-power8.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncat-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncat-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strncat-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strncat-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncat.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncat.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strncat.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strncat.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power4.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power4.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strncmp-power4.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power4.S index 138512621e..f8b90c8c68 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power4.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power4.S @@ -20,4 +20,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power4/strncmp.S> +#include <sysdeps/powerpc/powerpc64-common/power4/strncmp.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power7.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strncmp-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power7.S index 32a5cfcbcf..ea01f086b2 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power7.S @@ -20,4 +20,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power7/strncmp.S> +#include <sysdeps/powerpc/powerpc64-common/power7/strncmp.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power8.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strncmp-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power8.S index 5d8eeb417c..9ca70ddde2 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power8.S @@ -21,5 +21,5 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power8/strncmp.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strncmp.S> #endif diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power9.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power9.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strncmp-power9.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power9.S index 52934cf159..9faf606f83 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-power9.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-power9.S @@ -21,5 +21,5 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power9/strncmp.S> +#include <sysdeps/powerpc/powerpc64-common/power9/strncmp.S> #endif diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-ppc64.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strncmp-ppc64.S index 4d4210fbe8..bfb65ebef1 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncmp-ppc64.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp-ppc64.S @@ -23,4 +23,4 @@ .globl __GI_strncmp; __GI_strncmp = __strncmp_ppc #endif -#include <sysdeps/powerpc/powerpc64/strncmp.S> +#include <sysdeps/powerpc/powerpc64-common/strncmp.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncmp.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncmp.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strncmp.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strncmp.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/strncpy-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power7.S index a65bb89bb6..f8efb14756 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncpy-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power7.S @@ -26,4 +26,4 @@ #define MEMSET_is_local #endif -#include <sysdeps/powerpc/powerpc64/power7/strncpy.S> +#include <sysdeps/powerpc/powerpc64-common/power7/strncpy.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/strncpy-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power8.S index 3d16363ed5..65101ae541 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strncpy-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strncpy-power8.S @@ -27,4 +27,4 @@ #define MEMSET_is_local #endif -#include <sysdeps/powerpc/powerpc64/power8/strncpy.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strncpy.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncpy-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strncpy-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strncpy-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strncpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/strncpy.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strncpy.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strncpy.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power7.S index 3f6a005278..cba3622f5d 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power7.S @@ -23,4 +23,4 @@ #undef weak_alias #define weak_alias(name, alias) -#include <sysdeps/powerpc/powerpc64/power7/strnlen.S> +#include <sysdeps/powerpc/powerpc64-common/power7/strnlen.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power8.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/strnlen-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power8.S index 9ed0f91e22..367f6e5a35 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strnlen-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strnlen-power8.S @@ -23,4 +23,4 @@ #undef weak_alias #define weak_alias(name, alias) -#include <sysdeps/powerpc/powerpc64/power8/strnlen.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strnlen.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strnlen-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strnlen-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strnlen-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strnlen.c b/sysdeps/powerpc/powerpc64-common/multiarch/strnlen.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strnlen.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strnlen.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power7.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strrchr-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power7.S index 73602f4a25..0d2b608931 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strrchr-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power7.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power7/strrchr.S> +#include <sysdeps/powerpc/powerpc64-common/power7/strrchr.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power8.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power8.S index 51adbb0a29..51f91bb769 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strrchr-power8.S @@ -21,4 +21,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power8/strrchr.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strrchr.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strrchr-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strrchr-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strrchr.c b/sysdeps/powerpc/powerpc64-common/multiarch/strrchr.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strrchr.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strrchr.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strspn-power8.S b/sysdeps/powerpc/powerpc64-common/multiarch/strspn-power8.S similarity index 93% rename from sysdeps/powerpc/powerpc64/multiarch/strspn-power8.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strspn-power8.S index 89e2e5b109..a041d1b160 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strspn-power8.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strspn-power8.S @@ -20,4 +20,4 @@ #undef libc_hidden_builtin_def #define libc_hidden_builtin_def(name) -#include <sysdeps/powerpc/powerpc64/power8/strspn.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strspn.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strspn-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strspn-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strspn-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strspn.c b/sysdeps/powerpc/powerpc64-common/multiarch/strspn.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strspn.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strspn.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strstr-power7.S b/sysdeps/powerpc/powerpc64-common/multiarch/strstr-power7.S similarity index 94% rename from sysdeps/powerpc/powerpc64/multiarch/strstr-power7.S rename to sysdeps/powerpc/powerpc64-common/multiarch/strstr-power7.S index 82a0e4c8fc..a135da1d8e 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/strstr-power7.S +++ b/sysdeps/powerpc/powerpc64-common/multiarch/strstr-power7.S @@ -30,4 +30,4 @@ #define STRCHR_is_local #endif -#include <sysdeps/powerpc/powerpc64/power7/strstr.S> +#include <sysdeps/powerpc/powerpc64-common/power7/strstr.S> diff --git a/sysdeps/powerpc/powerpc64/multiarch/strstr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/strstr-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strstr-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strstr-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/strstr.c b/sysdeps/powerpc/powerpc64-common/multiarch/strstr.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/strstr.c rename to sysdeps/powerpc/powerpc64-common/multiarch/strstr.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcschr-power6.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcschr-power6.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/wcschr-power6.c rename to sysdeps/powerpc/powerpc64-common/multiarch/wcschr-power6.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcschr-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcschr-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/wcschr-power7.c rename to sysdeps/powerpc/powerpc64-common/multiarch/wcschr-power7.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcschr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcschr-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/wcschr-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/wcschr-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcschr.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcschr.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/wcschr.c rename to sysdeps/powerpc/powerpc64-common/multiarch/wcschr.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcscpy-power6.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-power6.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/wcscpy-power6.c rename to sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-power6.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcscpy-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/wcscpy-power7.c rename to sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-power7.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcscpy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/wcscpy-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/wcscpy-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcscpy.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcscpy.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/wcscpy.c rename to sysdeps/powerpc/powerpc64-common/multiarch/wcscpy.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcsrchr-power6.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-power6.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/wcsrchr-power6.c rename to sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-power6.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcsrchr-power7.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-power7.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/wcsrchr-power7.c rename to sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-power7.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcsrchr-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/wcsrchr-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c b/sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/wcsrchr.c rename to sysdeps/powerpc/powerpc64-common/multiarch/wcsrchr.c diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c b/sysdeps/powerpc/powerpc64-common/multiarch/wordcopy-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/multiarch/wordcopy-ppc64.c rename to sysdeps/powerpc/powerpc64-common/multiarch/wordcopy-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/power4/Makefile b/sysdeps/powerpc/powerpc64-common/power4/Makefile similarity index 100% rename from sysdeps/powerpc/powerpc64/power4/Makefile rename to sysdeps/powerpc/powerpc64-common/power4/Makefile diff --git a/sysdeps/powerpc/powerpc64/power4/memcmp.S b/sysdeps/powerpc/powerpc64-common/power4/memcmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power4/memcmp.S rename to sysdeps/powerpc/powerpc64-common/power4/memcmp.S diff --git a/sysdeps/powerpc/powerpc64/power4/memcopy.h b/sysdeps/powerpc/powerpc64-common/power4/memcopy.h similarity index 100% rename from sysdeps/powerpc/powerpc64/power4/memcopy.h rename to sysdeps/powerpc/powerpc64-common/power4/memcopy.h diff --git a/sysdeps/powerpc/powerpc64/power4/memcpy.S b/sysdeps/powerpc/powerpc64-common/power4/memcpy.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power4/memcpy.S rename to sysdeps/powerpc/powerpc64-common/power4/memcpy.S diff --git a/sysdeps/powerpc/powerpc64/power4/memset.S b/sysdeps/powerpc/powerpc64-common/power4/memset.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power4/memset.S rename to sysdeps/powerpc/powerpc64-common/power4/memset.S diff --git a/sysdeps/powerpc/powerpc64/power4/strncmp.S b/sysdeps/powerpc/powerpc64-common/power4/strncmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power4/strncmp.S rename to sysdeps/powerpc/powerpc64-common/power4/strncmp.S diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_ceil.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceil.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_ceil.S rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceil.S diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_ceilf.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceilf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_ceilf.S rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_ceilf.S diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_floor.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floor.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_floor.S rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floor.S diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_floorf.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floorf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_floorf.S rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_floorf.S diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_llround.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_llround.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_llround.S rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_llround.S diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_llroundf.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_llroundf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_llroundf.S rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_llroundf.S diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_round.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_round.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_round.S rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_round.S diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_roundf.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_roundf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_roundf.S rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_roundf.S diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_trunc.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_trunc.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_trunc.S rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_trunc.S diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/s_truncf.S b/sysdeps/powerpc/powerpc64-common/power5+/fpu/s_truncf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power5+/fpu/s_truncf.S rename to sysdeps/powerpc/powerpc64-common/power5+/fpu/s_truncf.S diff --git a/sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64-common/power5/fpu/s_isnan.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S rename to sysdeps/powerpc/powerpc64-common/power5/fpu/s_isnan.S diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S b/sysdeps/powerpc/powerpc64-common/power6/fpu/s_copysign.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S rename to sysdeps/powerpc/powerpc64-common/power6/fpu/s_copysign.S diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/s_copysignf.S b/sysdeps/powerpc/powerpc64-common/power6/fpu/s_copysignf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power6/fpu/s_copysignf.S rename to sysdeps/powerpc/powerpc64-common/power6/fpu/s_copysignf.S diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64-common/power6/fpu/s_isnan.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S rename to sysdeps/powerpc/powerpc64-common/power6/fpu/s_isnan.S diff --git a/sysdeps/powerpc/powerpc64/power6/memcpy.S b/sysdeps/powerpc/powerpc64-common/power6/memcpy.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power6/memcpy.S rename to sysdeps/powerpc/powerpc64-common/power6/memcpy.S diff --git a/sysdeps/powerpc/powerpc64/power6/memset.S b/sysdeps/powerpc/powerpc64-common/power6/memset.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power6/memset.S rename to sysdeps/powerpc/powerpc64-common/power6/memset.S diff --git a/sysdeps/powerpc/powerpc64/power6/wcschr.c b/sysdeps/powerpc/powerpc64-common/power6/wcschr.c similarity index 100% rename from sysdeps/powerpc/powerpc64/power6/wcschr.c rename to sysdeps/powerpc/powerpc64-common/power6/wcschr.c diff --git a/sysdeps/powerpc/powerpc64/power6/wcscpy.c b/sysdeps/powerpc/powerpc64-common/power6/wcscpy.c similarity index 100% rename from sysdeps/powerpc/powerpc64/power6/wcscpy.c rename to sysdeps/powerpc/powerpc64-common/power6/wcscpy.c diff --git a/sysdeps/powerpc/powerpc64/power6/wcsrchr.c b/sysdeps/powerpc/powerpc64-common/power6/wcsrchr.c similarity index 100% rename from sysdeps/powerpc/powerpc64/power6/wcsrchr.c rename to sysdeps/powerpc/powerpc64-common/power6/wcsrchr.c diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64-common/power6x/fpu/s_isnan.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S rename to sysdeps/powerpc/powerpc64-common/power6x/fpu/s_isnan.S diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/s_llrint.S b/sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llrint.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power6x/fpu/s_llrint.S rename to sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llrint.S diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/s_llround.S b/sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llround.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power6x/fpu/s_llround.S rename to sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llround.S diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/s_llroundf.S b/sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llroundf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power6x/fpu/s_llroundf.S rename to sysdeps/powerpc/powerpc64-common/power6x/fpu/s_llroundf.S diff --git a/sysdeps/powerpc/powerpc64/power7/Makefile b/sysdeps/powerpc/powerpc64-common/power7/Makefile similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/Makefile rename to sysdeps/powerpc/powerpc64-common/power7/Makefile diff --git a/sysdeps/powerpc/powerpc64/power7/add_n.S b/sysdeps/powerpc/powerpc64-common/power7/add_n.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/add_n.S rename to sysdeps/powerpc/powerpc64-common/power7/add_n.S diff --git a/sysdeps/powerpc/powerpc64/power7/bcopy.c b/sysdeps/powerpc/powerpc64-common/power7/bcopy.c similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/bcopy.c rename to sysdeps/powerpc/powerpc64-common/power7/bcopy.c diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_finite.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_finite.S diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_finitef.S b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_finitef.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/fpu/s_finitef.S rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_finitef.S diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_isinf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_isinf.S diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isinff.S b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_isinff.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/fpu/s_isinff.S rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_isinff.S diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_isnan.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_isnan.S diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_isnanf.S b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_isnanf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/fpu/s_isnanf.S rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_isnanf.S diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_logb.c b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_logb.c similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/fpu/s_logb.c rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_logb.c diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_logbf.c b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_logbf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/fpu/s_logbf.c rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_logbf.c diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/s_logbl.c b/sysdeps/powerpc/powerpc64-common/power7/fpu/s_logbl.c similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/fpu/s_logbl.c rename to sysdeps/powerpc/powerpc64-common/power7/fpu/s_logbl.c diff --git a/sysdeps/powerpc/powerpc64/power7/memchr.S b/sysdeps/powerpc/powerpc64-common/power7/memchr.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/memchr.S rename to sysdeps/powerpc/powerpc64-common/power7/memchr.S diff --git a/sysdeps/powerpc/powerpc64/power7/memcmp.S b/sysdeps/powerpc/powerpc64-common/power7/memcmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/memcmp.S rename to sysdeps/powerpc/powerpc64-common/power7/memcmp.S diff --git a/sysdeps/powerpc/powerpc64/power7/memcpy.S b/sysdeps/powerpc/powerpc64-common/power7/memcpy.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/memcpy.S rename to sysdeps/powerpc/powerpc64-common/power7/memcpy.S diff --git a/sysdeps/powerpc/powerpc64/power7/memmove.S b/sysdeps/powerpc/powerpc64-common/power7/memmove.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/memmove.S rename to sysdeps/powerpc/powerpc64-common/power7/memmove.S diff --git a/sysdeps/powerpc/powerpc64/power7/mempcpy.S b/sysdeps/powerpc/powerpc64-common/power7/mempcpy.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/mempcpy.S rename to sysdeps/powerpc/powerpc64-common/power7/mempcpy.S diff --git a/sysdeps/powerpc/powerpc64/power7/memrchr.S b/sysdeps/powerpc/powerpc64-common/power7/memrchr.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/memrchr.S rename to sysdeps/powerpc/powerpc64-common/power7/memrchr.S diff --git a/sysdeps/powerpc/powerpc64/power7/memset.S b/sysdeps/powerpc/powerpc64-common/power7/memset.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/memset.S rename to sysdeps/powerpc/powerpc64-common/power7/memset.S diff --git a/sysdeps/powerpc/powerpc64/power7/rawmemchr.S b/sysdeps/powerpc/powerpc64-common/power7/rawmemchr.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/rawmemchr.S rename to sysdeps/powerpc/powerpc64-common/power7/rawmemchr.S diff --git a/sysdeps/powerpc/powerpc64/power7/stpncpy.S b/sysdeps/powerpc/powerpc64-common/power7/stpncpy.S similarity index 94% rename from sysdeps/powerpc/powerpc64/power7/stpncpy.S rename to sysdeps/powerpc/powerpc64-common/power7/stpncpy.S index a346dd7e28..7dc16ab7b5 100644 --- a/sysdeps/powerpc/powerpc64/power7/stpncpy.S +++ b/sysdeps/powerpc/powerpc64-common/power7/stpncpy.S @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #define USE_AS_STPNCPY -#include <sysdeps/powerpc/powerpc64/power7/strncpy.S> +#include <sysdeps/powerpc/powerpc64-common/power7/strncpy.S> weak_alias (__stpncpy, stpncpy) libc_hidden_def (__stpncpy) diff --git a/sysdeps/powerpc/powerpc64/power7/strcasecmp.S b/sysdeps/powerpc/powerpc64-common/power7/strcasecmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/strcasecmp.S rename to sysdeps/powerpc/powerpc64-common/power7/strcasecmp.S diff --git a/sysdeps/powerpc/powerpc64/power7/strcasecmp_l.S b/sysdeps/powerpc/powerpc64-common/power7/strcasecmp_l.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/strcasecmp_l.S rename to sysdeps/powerpc/powerpc64-common/power7/strcasecmp_l.S diff --git a/sysdeps/powerpc/powerpc64/power7/strchr.S b/sysdeps/powerpc/powerpc64-common/power7/strchr.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/strchr.S rename to sysdeps/powerpc/powerpc64-common/power7/strchr.S diff --git a/sysdeps/powerpc/powerpc64/power7/strchrnul.S b/sysdeps/powerpc/powerpc64-common/power7/strchrnul.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/strchrnul.S rename to sysdeps/powerpc/powerpc64-common/power7/strchrnul.S diff --git a/sysdeps/powerpc/powerpc64/power7/strcmp.S b/sysdeps/powerpc/powerpc64-common/power7/strcmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/strcmp.S rename to sysdeps/powerpc/powerpc64-common/power7/strcmp.S diff --git a/sysdeps/powerpc/powerpc64/power7/strlen.S b/sysdeps/powerpc/powerpc64-common/power7/strlen.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/strlen.S rename to sysdeps/powerpc/powerpc64-common/power7/strlen.S diff --git a/sysdeps/powerpc/powerpc64/power7/strncmp.S b/sysdeps/powerpc/powerpc64-common/power7/strncmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/strncmp.S rename to sysdeps/powerpc/powerpc64-common/power7/strncmp.S diff --git a/sysdeps/powerpc/powerpc64/power7/strncpy.S b/sysdeps/powerpc/powerpc64-common/power7/strncpy.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/strncpy.S rename to sysdeps/powerpc/powerpc64-common/power7/strncpy.S diff --git a/sysdeps/powerpc/powerpc64/power7/strnlen.S b/sysdeps/powerpc/powerpc64-common/power7/strnlen.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/strnlen.S rename to sysdeps/powerpc/powerpc64-common/power7/strnlen.S diff --git a/sysdeps/powerpc/powerpc64/power7/strrchr.S b/sysdeps/powerpc/powerpc64-common/power7/strrchr.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/strrchr.S rename to sysdeps/powerpc/powerpc64-common/power7/strrchr.S diff --git a/sysdeps/powerpc/powerpc64/power7/strstr-ppc64.c b/sysdeps/powerpc/powerpc64-common/power7/strstr-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/strstr-ppc64.c rename to sysdeps/powerpc/powerpc64-common/power7/strstr-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/power7/strstr.S b/sysdeps/powerpc/powerpc64-common/power7/strstr.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/strstr.S rename to sysdeps/powerpc/powerpc64-common/power7/strstr.S diff --git a/sysdeps/powerpc/powerpc64/power7/sub_n.S b/sysdeps/powerpc/powerpc64-common/power7/sub_n.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power7/sub_n.S rename to sysdeps/powerpc/powerpc64-common/power7/sub_n.S diff --git a/sysdeps/powerpc/powerpc64/power8/Makefile b/sysdeps/powerpc/powerpc64-common/power8/Makefile similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/Makefile rename to sysdeps/powerpc/powerpc64-common/power8/Makefile diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/e_expf.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/e_expf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/fpu/e_expf.S rename to sysdeps/powerpc/powerpc64-common/power8/fpu/e_expf.S diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_cosf.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_cosf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/fpu/s_cosf.S rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_cosf.S diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_finite.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_finite.S diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_finitef.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_finitef.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/fpu/s_finitef.S rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_finitef.S diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_isinf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_isinf.S diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isinff.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_isinff.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/fpu/s_isinff.S rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_isinff.S diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_isnan.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_isnan.S diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_isnanf.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_isnanf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/fpu/s_isnanf.S rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_isnanf.S diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_llrint.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_llrint.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/fpu/s_llrint.S rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_llrint.S diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_llround.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_llround.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/fpu/s_llround.S rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_llround.S diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_llroundf.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_llroundf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/fpu/s_llroundf.S rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_llroundf.S diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/s_sinf.S b/sysdeps/powerpc/powerpc64-common/power8/fpu/s_sinf.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/fpu/s_sinf.S rename to sysdeps/powerpc/powerpc64-common/power8/fpu/s_sinf.S diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/w_expf.c b/sysdeps/powerpc/powerpc64-common/power8/fpu/w_expf.c similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/fpu/w_expf.c rename to sysdeps/powerpc/powerpc64-common/power8/fpu/w_expf.c diff --git a/sysdeps/powerpc/powerpc64/power8/memchr.S b/sysdeps/powerpc/powerpc64-common/power8/memchr.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/memchr.S rename to sysdeps/powerpc/powerpc64-common/power8/memchr.S diff --git a/sysdeps/powerpc/powerpc64/power8/memcmp.S b/sysdeps/powerpc/powerpc64-common/power8/memcmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/memcmp.S rename to sysdeps/powerpc/powerpc64-common/power8/memcmp.S diff --git a/sysdeps/powerpc/powerpc64/power8/memrchr.S b/sysdeps/powerpc/powerpc64-common/power8/memrchr.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/memrchr.S rename to sysdeps/powerpc/powerpc64-common/power8/memrchr.S diff --git a/sysdeps/powerpc/powerpc64/power8/memset.S b/sysdeps/powerpc/powerpc64-common/power8/memset.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/memset.S rename to sysdeps/powerpc/powerpc64-common/power8/memset.S diff --git a/sysdeps/powerpc/powerpc64/power8/stpcpy.S b/sysdeps/powerpc/powerpc64-common/power8/stpcpy.S similarity index 94% rename from sysdeps/powerpc/powerpc64/power8/stpcpy.S rename to sysdeps/powerpc/powerpc64-common/power8/stpcpy.S index 955e738cee..49094f680c 100644 --- a/sysdeps/powerpc/powerpc64/power8/stpcpy.S +++ b/sysdeps/powerpc/powerpc64-common/power8/stpcpy.S @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #define USE_AS_STPCPY -#include <sysdeps/powerpc/powerpc64/power8/strcpy.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strcpy.S> weak_alias (__stpcpy, stpcpy) libc_hidden_def (__stpcpy) diff --git a/sysdeps/powerpc/powerpc64/power8/stpncpy.S b/sysdeps/powerpc/powerpc64-common/power8/stpncpy.S similarity index 94% rename from sysdeps/powerpc/powerpc64/power8/stpncpy.S rename to sysdeps/powerpc/powerpc64-common/power8/stpncpy.S index c14d984dd0..2c3efc9708 100644 --- a/sysdeps/powerpc/powerpc64/power8/stpncpy.S +++ b/sysdeps/powerpc/powerpc64-common/power8/stpncpy.S @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #define USE_AS_STPNCPY -#include <sysdeps/powerpc/powerpc64/power8/strncpy.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strncpy.S> weak_alias (__stpncpy, stpncpy) libc_hidden_def (__stpncpy) diff --git a/sysdeps/powerpc/powerpc64/power8/strcasecmp.S b/sysdeps/powerpc/powerpc64-common/power8/strcasecmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/strcasecmp.S rename to sysdeps/powerpc/powerpc64-common/power8/strcasecmp.S diff --git a/sysdeps/powerpc/powerpc64/power8/strcasestr-ppc64.c b/sysdeps/powerpc/powerpc64-common/power8/strcasestr-ppc64.c similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/strcasestr-ppc64.c rename to sysdeps/powerpc/powerpc64-common/power8/strcasestr-ppc64.c diff --git a/sysdeps/powerpc/powerpc64/power8/strcasestr.S b/sysdeps/powerpc/powerpc64-common/power8/strcasestr.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/strcasestr.S rename to sysdeps/powerpc/powerpc64-common/power8/strcasestr.S diff --git a/sysdeps/powerpc/powerpc64/power8/strchr.S b/sysdeps/powerpc/powerpc64-common/power8/strchr.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/strchr.S rename to sysdeps/powerpc/powerpc64-common/power8/strchr.S diff --git a/sysdeps/powerpc/powerpc64/power8/strchrnul.S b/sysdeps/powerpc/powerpc64-common/power8/strchrnul.S similarity index 94% rename from sysdeps/powerpc/powerpc64/power8/strchrnul.S rename to sysdeps/powerpc/powerpc64-common/power8/strchrnul.S index 3bf4b275dd..a6e388c10a 100644 --- a/sysdeps/powerpc/powerpc64/power8/strchrnul.S +++ b/sysdeps/powerpc/powerpc64-common/power8/strchrnul.S @@ -17,7 +17,7 @@ <http://www.gnu.org/licenses/>. */ #define USE_AS_STRCHRNUL 1 -#include <sysdeps/powerpc/powerpc64/power8/strchr.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strchr.S> weak_alias (__strchrnul,strchrnul) libc_hidden_builtin_def (__strchrnul) diff --git a/sysdeps/powerpc/powerpc64/power8/strcmp.S b/sysdeps/powerpc/powerpc64-common/power8/strcmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/strcmp.S rename to sysdeps/powerpc/powerpc64-common/power8/strcmp.S diff --git a/sysdeps/powerpc/powerpc64/power8/strcpy.S b/sysdeps/powerpc/powerpc64-common/power8/strcpy.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/strcpy.S rename to sysdeps/powerpc/powerpc64-common/power8/strcpy.S diff --git a/sysdeps/powerpc/powerpc64/power8/strcspn.S b/sysdeps/powerpc/powerpc64-common/power8/strcspn.S similarity index 93% rename from sysdeps/powerpc/powerpc64/power8/strcspn.S rename to sysdeps/powerpc/powerpc64-common/power8/strcspn.S index c9a7a2e3c3..37d5ba9a7b 100644 --- a/sysdeps/powerpc/powerpc64/power8/strcspn.S +++ b/sysdeps/powerpc/powerpc64-common/power8/strcspn.S @@ -17,4 +17,4 @@ <http://www.gnu.org/licenses/>. */ #define USE_AS_STRCSPN 1 -#include <sysdeps/powerpc/powerpc64/power8/strspn.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strspn.S> diff --git a/sysdeps/powerpc/powerpc64/power8/strlen.S b/sysdeps/powerpc/powerpc64-common/power8/strlen.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/strlen.S rename to sysdeps/powerpc/powerpc64-common/power8/strlen.S diff --git a/sysdeps/powerpc/powerpc64/power8/strncase.S b/sysdeps/powerpc/powerpc64-common/power8/strncase.S similarity index 93% rename from sysdeps/powerpc/powerpc64/power8/strncase.S rename to sysdeps/powerpc/powerpc64-common/power8/strncase.S index 32e09e4d94..12649789cb 100644 --- a/sysdeps/powerpc/powerpc64/power8/strncase.S +++ b/sysdeps/powerpc/powerpc64-common/power8/strncase.S @@ -17,4 +17,4 @@ <http://www.gnu.org/licenses/>. */ #define USE_AS_STRNCASECMP 1 -#include <sysdeps/powerpc/powerpc64/power8/strcasecmp.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strcasecmp.S> diff --git a/sysdeps/powerpc/powerpc64/power8/strncmp.S b/sysdeps/powerpc/powerpc64-common/power8/strncmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/strncmp.S rename to sysdeps/powerpc/powerpc64-common/power8/strncmp.S diff --git a/sysdeps/powerpc/powerpc64/power8/strncpy.S b/sysdeps/powerpc/powerpc64-common/power8/strncpy.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/strncpy.S rename to sysdeps/powerpc/powerpc64-common/power8/strncpy.S diff --git a/sysdeps/powerpc/powerpc64/power8/strnlen.S b/sysdeps/powerpc/powerpc64-common/power8/strnlen.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/strnlen.S rename to sysdeps/powerpc/powerpc64-common/power8/strnlen.S diff --git a/sysdeps/powerpc/powerpc64/power8/strrchr.S b/sysdeps/powerpc/powerpc64-common/power8/strrchr.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/strrchr.S rename to sysdeps/powerpc/powerpc64-common/power8/strrchr.S diff --git a/sysdeps/powerpc/powerpc64/power8/strspn.S b/sysdeps/powerpc/powerpc64-common/power8/strspn.S similarity index 100% rename from sysdeps/powerpc/powerpc64/power8/strspn.S rename to sysdeps/powerpc/powerpc64-common/power8/strspn.S diff --git a/sysdeps/powerpc/powerpc64/power9/strcmp.S b/sysdeps/powerpc/powerpc64-common/power9/strcmp.S similarity index 99% rename from sysdeps/powerpc/powerpc64/power9/strcmp.S rename to sysdeps/powerpc/powerpc64-common/power9/strcmp.S index 87883ef0c8..226830cc3b 100644 --- a/sysdeps/powerpc/powerpc64/power9/strcmp.S +++ b/sysdeps/powerpc/powerpc64-common/power9/strcmp.S @@ -264,5 +264,5 @@ L(pagecross_nullfound): END (STRCMP) libc_hidden_builtin_def (strcmp) #else -#include <sysdeps/powerpc/powerpc64/power8/strcmp.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strcmp.S> #endif diff --git a/sysdeps/powerpc/powerpc64/power9/strncmp.S b/sysdeps/powerpc/powerpc64-common/power9/strncmp.S similarity index 99% rename from sysdeps/powerpc/powerpc64/power9/strncmp.S rename to sysdeps/powerpc/powerpc64-common/power9/strncmp.S index ff6f8aceeb..730a6d1b50 100644 --- a/sysdeps/powerpc/powerpc64/power9/strncmp.S +++ b/sysdeps/powerpc/powerpc64-common/power9/strncmp.S @@ -375,5 +375,5 @@ L(byte_ne_3): END(STRNCMP) libc_hidden_builtin_def(strncmp) #else -#include <sysdeps/powerpc/powerpc64/power8/strncmp.S> +#include <sysdeps/powerpc/powerpc64-common/power8/strncmp.S> #endif diff --git a/sysdeps/powerpc/powerpc64/ppc-mcount.S b/sysdeps/powerpc/powerpc64-common/ppc-mcount.S similarity index 100% rename from sysdeps/powerpc/powerpc64/ppc-mcount.S rename to sysdeps/powerpc/powerpc64-common/ppc-mcount.S diff --git a/sysdeps/powerpc/powerpc64/register-dump.h b/sysdeps/powerpc/powerpc64-common/register-dump.h similarity index 100% rename from sysdeps/powerpc/powerpc64/register-dump.h rename to sysdeps/powerpc/powerpc64-common/register-dump.h diff --git a/sysdeps/powerpc/powerpc64/rtld-memset.c b/sysdeps/powerpc/powerpc64-common/rtld-memset.c similarity index 100% rename from sysdeps/powerpc/powerpc64/rtld-memset.c rename to sysdeps/powerpc/powerpc64-common/rtld-memset.c diff --git a/sysdeps/powerpc/powerpc64/setjmp-common.S b/sysdeps/powerpc/powerpc64-common/setjmp-common.S similarity index 100% rename from sysdeps/powerpc/powerpc64/setjmp-common.S rename to sysdeps/powerpc/powerpc64-common/setjmp-common.S diff --git a/sysdeps/powerpc/powerpc64/setjmp.S b/sysdeps/powerpc/powerpc64-common/setjmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/setjmp.S rename to sysdeps/powerpc/powerpc64-common/setjmp.S diff --git a/sysdeps/powerpc/powerpc64/stackguard-macros.h b/sysdeps/powerpc/powerpc64-common/stackguard-macros.h similarity index 100% rename from sysdeps/powerpc/powerpc64/stackguard-macros.h rename to sysdeps/powerpc/powerpc64-common/stackguard-macros.h diff --git a/sysdeps/powerpc/powerpc64/start.S b/sysdeps/powerpc/powerpc64-common/start.S similarity index 100% rename from sysdeps/powerpc/powerpc64/start.S rename to sysdeps/powerpc/powerpc64-common/start.S diff --git a/sysdeps/powerpc/powerpc64/strchr.S b/sysdeps/powerpc/powerpc64-common/strchr.S similarity index 100% rename from sysdeps/powerpc/powerpc64/strchr.S rename to sysdeps/powerpc/powerpc64-common/strchr.S diff --git a/sysdeps/powerpc/powerpc64/strcmp.S b/sysdeps/powerpc/powerpc64-common/strcmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/strcmp.S rename to sysdeps/powerpc/powerpc64-common/strcmp.S diff --git a/sysdeps/powerpc/powerpc64/strlen.S b/sysdeps/powerpc/powerpc64-common/strlen.S similarity index 100% rename from sysdeps/powerpc/powerpc64/strlen.S rename to sysdeps/powerpc/powerpc64-common/strlen.S diff --git a/sysdeps/powerpc/powerpc64/strncmp.S b/sysdeps/powerpc/powerpc64-common/strncmp.S similarity index 100% rename from sysdeps/powerpc/powerpc64/strncmp.S rename to sysdeps/powerpc/powerpc64-common/strncmp.S diff --git a/sysdeps/powerpc/powerpc64/submul_1.S b/sysdeps/powerpc/powerpc64-common/submul_1.S similarity index 100% rename from sysdeps/powerpc/powerpc64/submul_1.S rename to sysdeps/powerpc/powerpc64-common/submul_1.S diff --git a/sysdeps/powerpc/powerpc64/sysdep.h b/sysdeps/powerpc/powerpc64-common/sysdep.h similarity index 100% rename from sysdeps/powerpc/powerpc64/sysdep.h rename to sysdeps/powerpc/powerpc64-common/sysdep.h diff --git a/sysdeps/powerpc/powerpc64/tls-macros.h b/sysdeps/powerpc/powerpc64-common/tls-macros.h similarity index 100% rename from sysdeps/powerpc/powerpc64/tls-macros.h rename to sysdeps/powerpc/powerpc64-common/tls-macros.h diff --git a/sysdeps/powerpc/powerpc64/tst-audit.h b/sysdeps/powerpc/powerpc64-common/tst-audit.h similarity index 100% rename from sysdeps/powerpc/powerpc64/tst-audit.h rename to sysdeps/powerpc/powerpc64-common/tst-audit.h diff --git a/sysdeps/powerpc/powerpc64/970/Implies b/sysdeps/powerpc/powerpc64/970/Implies index bedb20b65c..876568a8ad 100644 --- a/sysdeps/powerpc/powerpc64/970/Implies +++ b/sysdeps/powerpc/powerpc64/970/Implies @@ -1,2 +1,3 @@ +powerpc/powerpc64-common/970 powerpc/powerpc64/power4/fpu powerpc/powerpc64/power4 diff --git a/sysdeps/powerpc/powerpc64/Implies b/sysdeps/powerpc/powerpc64/Implies index a8cae95f9d..f8d7ded895 100644 --- a/sysdeps/powerpc/powerpc64/Implies +++ b/sysdeps/powerpc/powerpc64/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common wordsize-64 diff --git a/sysdeps/powerpc/powerpc64/a2/Implies b/sysdeps/powerpc/powerpc64/a2/Implies new file mode 100644 index 0000000000..8e79a6c1ab --- /dev/null +++ b/sysdeps/powerpc/powerpc64/a2/Implies @@ -0,0 +1 @@ +powerpc/powerpc64-common/a2 diff --git a/sysdeps/powerpc/powerpc64/cell/Implies b/sysdeps/powerpc/powerpc64/cell/Implies new file mode 100644 index 0000000000..b99d6f5a80 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/cell/Implies @@ -0,0 +1 @@ +powerpc/powerpc64-common/cell diff --git a/sysdeps/powerpc/powerpc64/fpu/Implies b/sysdeps/powerpc/powerpc64/fpu/Implies new file mode 100644 index 0000000000..26682593f0 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/fpu/Implies @@ -0,0 +1 @@ +powerpc/powerpc64-common/fpu diff --git a/sysdeps/powerpc/powerpc64/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/fpu/multiarch/Implies new file mode 100644 index 0000000000..be8c678700 --- /dev/null +++ b/sysdeps/powerpc/powerpc64/fpu/multiarch/Implies @@ -0,0 +1 @@ +powerpc/powerpc64-common/fpu/multiarch diff --git a/sysdeps/powerpc/powerpc64/multiarch/Implies b/sysdeps/powerpc/powerpc64/multiarch/Implies new file mode 100644 index 0000000000..69d9709b4f --- /dev/null +++ b/sysdeps/powerpc/powerpc64/multiarch/Implies @@ -0,0 +1 @@ +powerpc/powerpc64-common/multiarch diff --git a/sysdeps/powerpc/powerpc64/power4/Implies b/sysdeps/powerpc/powerpc64/power4/Implies index a372141bb7..9caa77fbe9 100644 --- a/sysdeps/powerpc/powerpc64/power4/Implies +++ b/sysdeps/powerpc/powerpc64/power4/Implies @@ -1,2 +1,3 @@ +powerpc/powerpc64-common/power4 powerpc/power4/fpu powerpc/power4 diff --git a/sysdeps/powerpc/powerpc64/power4/fpu/Implies b/sysdeps/powerpc/powerpc64/power4/fpu/Implies index c1f617b7da..9811f46386 100644 --- a/sysdeps/powerpc/powerpc64/power4/fpu/Implies +++ b/sysdeps/powerpc/powerpc64/power4/fpu/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power4/fpu powerpc/powerpc64/fpu diff --git a/sysdeps/powerpc/powerpc64/power4/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power4/fpu/multiarch/Implies index 8d6531a174..4e81648ab6 100644 --- a/sysdeps/powerpc/powerpc64/power4/fpu/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power4/fpu/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power4/fpu/multiarch powerpc/powerpc64/fpu/multiarch diff --git a/sysdeps/powerpc/powerpc64/power4/multiarch/Implies b/sysdeps/powerpc/powerpc64/power4/multiarch/Implies index 30edcf7f9d..9805a4632a 100644 --- a/sysdeps/powerpc/powerpc64/power4/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power4/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power4/multiarch powerpc/powerpc64/multiarch diff --git a/sysdeps/powerpc/powerpc64/power5+/Implies b/sysdeps/powerpc/powerpc64/power5+/Implies index 565bc94471..471085ce9f 100644 --- a/sysdeps/powerpc/powerpc64/power5+/Implies +++ b/sysdeps/powerpc/powerpc64/power5+/Implies @@ -1,3 +1,4 @@ +powerpc/powerpc64-common/power5+ powerpc/power5+/fpu powerpc/power5+ powerpc/powerpc64/power5/fpu diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/Implies b/sysdeps/powerpc/powerpc64/power5+/fpu/Implies index f00c50fb49..e718df9d94 100644 --- a/sysdeps/powerpc/powerpc64/power5+/fpu/Implies +++ b/sysdeps/powerpc/powerpc64/power5+/fpu/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power5+/fpu powerpc/powerpc64/power5/fpu diff --git a/sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies index c0e67848e2..d2aa42a032 100644 --- a/sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power5+/fpu/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power5+/fpu/multiarch powerpc/powerpc64/power5/fpu/multiarch diff --git a/sysdeps/powerpc/powerpc64/power5+/multiarch/Implies b/sysdeps/powerpc/powerpc64/power5+/multiarch/Implies index 0851b19fa2..6e408499ce 100644 --- a/sysdeps/powerpc/powerpc64/power5+/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power5+/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power5+/multiarch powerpc/powerpc64/power5/multiarch diff --git a/sysdeps/powerpc/powerpc64/power5/Implies b/sysdeps/powerpc/powerpc64/power5/Implies index bedb20b65c..67a06aae30 100644 --- a/sysdeps/powerpc/powerpc64/power5/Implies +++ b/sysdeps/powerpc/powerpc64/power5/Implies @@ -1,2 +1,3 @@ +powerpc/powerpc64-common/power5 powerpc/powerpc64/power4/fpu powerpc/powerpc64/power4 diff --git a/sysdeps/powerpc/powerpc64/power5/fpu/Implies b/sysdeps/powerpc/powerpc64/power5/fpu/Implies index 6b8c23efa6..2f5e46ea51 100644 --- a/sysdeps/powerpc/powerpc64/power5/fpu/Implies +++ b/sysdeps/powerpc/powerpc64/power5/fpu/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power5/fpu powerpc/powerpc64/power4/fpu/ diff --git a/sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies index 3740d050a6..f4dc043c40 100644 --- a/sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power5/fpu/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power5/fpu/multiarch powerpc/powerpc64/power4/fpu/multiarch diff --git a/sysdeps/powerpc/powerpc64/power5/multiarch/Implies b/sysdeps/powerpc/powerpc64/power5/multiarch/Implies index 9a3cbb0938..606213da1d 100644 --- a/sysdeps/powerpc/powerpc64/power5/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power5/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power5/multiarch powerpc/powerpc64/power4/multiarch diff --git a/sysdeps/powerpc/powerpc64/power6/Implies b/sysdeps/powerpc/powerpc64/power6/Implies index 4c782d4122..a1226e0fe6 100644 --- a/sysdeps/powerpc/powerpc64/power6/Implies +++ b/sysdeps/powerpc/powerpc64/power6/Implies @@ -1,2 +1,3 @@ +powerpc/powerpc64-common/power6 powerpc/powerpc64/power5+/fpu powerpc/powerpc64/power5+ diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/Implies b/sysdeps/powerpc/powerpc64/power6/fpu/Implies index f09854edb6..62469539ac 100644 --- a/sysdeps/powerpc/powerpc64/power6/fpu/Implies +++ b/sysdeps/powerpc/powerpc64/power6/fpu/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power6/fpu powerpc/powerpc64/power5+/fpu diff --git a/sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies index fca8a4ef0f..89bee4782a 100644 --- a/sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power6/fpu/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power6/fpu/multiarch powerpc/powerpc64/power5+/fpu/multiarch diff --git a/sysdeps/powerpc/powerpc64/power6/multiarch/Implies b/sysdeps/powerpc/powerpc64/power6/multiarch/Implies index 2ebe304fa6..f86445c46b 100644 --- a/sysdeps/powerpc/powerpc64/power6/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power6/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power6/multiarch powerpc/powerpc64/power5+/multiarch diff --git a/sysdeps/powerpc/powerpc64/power6x/Implies b/sysdeps/powerpc/powerpc64/power6x/Implies index 9d68f39d22..7478a1184c 100644 --- a/sysdeps/powerpc/powerpc64/power6x/Implies +++ b/sysdeps/powerpc/powerpc64/power6x/Implies @@ -1,2 +1,3 @@ +powerpc/powerpc64-common/power6x powerpc/powerpc64/power6/fpu powerpc/powerpc64/power6 diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/Implies b/sysdeps/powerpc/powerpc64/power6x/fpu/Implies index 30fa17646e..e858ceb445 100644 --- a/sysdeps/powerpc/powerpc64/power6x/fpu/Implies +++ b/sysdeps/powerpc/powerpc64/power6x/fpu/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power6x/fpu powerpc/powerpc64/power6/fpu diff --git a/sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies index 410d289a6d..2e6b13e13e 100644 --- a/sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power6x/fpu/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power6x/fpu/multiarch powerpc/powerpc64/power6/fpu/multiarch diff --git a/sysdeps/powerpc/powerpc64/power6x/multiarch/Implies b/sysdeps/powerpc/powerpc64/power6x/multiarch/Implies index bf5d6171a5..e73bde9f85 100644 --- a/sysdeps/powerpc/powerpc64/power6x/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power6x/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power6x/multiarch powerpc/powerpc64/power6/multiarch diff --git a/sysdeps/powerpc/powerpc64/power7/Implies b/sysdeps/powerpc/powerpc64/power7/Implies index 9d68f39d22..c5e7be31a9 100644 --- a/sysdeps/powerpc/powerpc64/power7/Implies +++ b/sysdeps/powerpc/powerpc64/power7/Implies @@ -1,2 +1,3 @@ +powerpc/powerpc64-common/power7 powerpc/powerpc64/power6/fpu powerpc/powerpc64/power6 diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/Implies b/sysdeps/powerpc/powerpc64/power7/fpu/Implies index 30fa17646e..28f0217bc0 100644 --- a/sysdeps/powerpc/powerpc64/power7/fpu/Implies +++ b/sysdeps/powerpc/powerpc64/power7/fpu/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power7/fpu powerpc/powerpc64/power6/fpu diff --git a/sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies index 410d289a6d..b43c91707d 100644 --- a/sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power7/fpu/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power7/fpu/multiarch powerpc/powerpc64/power6/fpu/multiarch diff --git a/sysdeps/powerpc/powerpc64/power7/multiarch/Implies b/sysdeps/powerpc/powerpc64/power7/multiarch/Implies index bf5d6171a5..851cf1d798 100644 --- a/sysdeps/powerpc/powerpc64/power7/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power7/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power7/multiarch powerpc/powerpc64/power6/multiarch diff --git a/sysdeps/powerpc/powerpc64/power8/Implies b/sysdeps/powerpc/powerpc64/power8/Implies index 9a5e3c7277..bf3947c1eb 100644 --- a/sysdeps/powerpc/powerpc64/power8/Implies +++ b/sysdeps/powerpc/powerpc64/power8/Implies @@ -1,2 +1,3 @@ +powerpc/powerpc64-common/power8 powerpc/powerpc64/power7/fpu powerpc/powerpc64/power7 diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/Implies b/sysdeps/powerpc/powerpc64/power8/fpu/Implies index 1187cdfb0a..0f6aae77c3 100644 --- a/sysdeps/powerpc/powerpc64/power8/fpu/Implies +++ b/sysdeps/powerpc/powerpc64/power8/fpu/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power8/fpu powerpc/powerpc64/power7/fpu/ diff --git a/sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies index 7fd86fdf87..1613aaa288 100644 --- a/sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power8/fpu/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power8/fpu/multiarch powerpc/powerpc64/power7/fpu/multiarch diff --git a/sysdeps/powerpc/powerpc64/power8/multiarch/Implies b/sysdeps/powerpc/powerpc64/power8/multiarch/Implies index 1fc7b7cd39..4ab5c296fd 100644 --- a/sysdeps/powerpc/powerpc64/power8/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power8/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power8/multiarch powerpc/powerpc64/power7/multiarch diff --git a/sysdeps/powerpc/powerpc64/power9/Implies b/sysdeps/powerpc/powerpc64/power9/Implies index fad2505ab9..55ad928c3e 100644 --- a/sysdeps/powerpc/powerpc64/power9/Implies +++ b/sysdeps/powerpc/powerpc64/power9/Implies @@ -1,2 +1,3 @@ +powerpc/powerpc64-common/power9 powerpc/powerpc64/power8/fpu powerpc/powerpc64/power8 diff --git a/sysdeps/powerpc/powerpc64/power9/fpu/Implies b/sysdeps/powerpc/powerpc64/power9/fpu/Implies index ae0dbaf857..3b0263d979 100644 --- a/sysdeps/powerpc/powerpc64/power9/fpu/Implies +++ b/sysdeps/powerpc/powerpc64/power9/fpu/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power9/fpu powerpc/powerpc64/power8/fpu diff --git a/sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies index f11e1bdba2..20607fcd95 100644 --- a/sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power9/fpu/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power9/fpu/multiarch powerpc/powerpc64/power8/fpu/multiarch diff --git a/sysdeps/powerpc/powerpc64/power9/multiarch/Implies b/sysdeps/powerpc/powerpc64/power9/multiarch/Implies index dd6bca4b36..5412683ac6 100644 --- a/sysdeps/powerpc/powerpc64/power9/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64/power9/multiarch/Implies @@ -1 +1,2 @@ +powerpc/powerpc64-common/power9/multiarch powerpc/powerpc64/power8/multiarch diff --git a/sysdeps/powerpc/powerpc64le/Implies b/sysdeps/powerpc/powerpc64le/Implies index a105a325f7..f8d7ded895 100644 --- a/sysdeps/powerpc/powerpc64le/Implies +++ b/sysdeps/powerpc/powerpc64le/Implies @@ -1 +1,2 @@ -powerpc/powerpc64 +powerpc/powerpc64-common +wordsize-64 diff --git a/sysdeps/powerpc/powerpc64le/fpu/Implies b/sysdeps/powerpc/powerpc64le/fpu/Implies index c1f617b7da..26682593f0 100644 --- a/sysdeps/powerpc/powerpc64le/fpu/Implies +++ b/sysdeps/powerpc/powerpc64le/fpu/Implies @@ -1 +1 @@ -powerpc/powerpc64/fpu +powerpc/powerpc64-common/fpu diff --git a/sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies index 8d6531a174..be8c678700 100644 --- a/sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64le/fpu/multiarch/Implies @@ -1 +1 @@ -powerpc/powerpc64/fpu/multiarch +powerpc/powerpc64-common/fpu/multiarch diff --git a/sysdeps/powerpc/powerpc64le/multiarch/Implies b/sysdeps/powerpc/powerpc64le/multiarch/Implies index 30edcf7f9d..69d9709b4f 100644 --- a/sysdeps/powerpc/powerpc64le/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64le/multiarch/Implies @@ -1 +1 @@ -powerpc/powerpc64/multiarch +powerpc/powerpc64-common/multiarch diff --git a/sysdeps/powerpc/powerpc64le/power7/Implies b/sysdeps/powerpc/powerpc64le/power7/Implies index eedef823d5..2e7ed1c7fd 100644 --- a/sysdeps/powerpc/powerpc64le/power7/Implies +++ b/sysdeps/powerpc/powerpc64le/power7/Implies @@ -1 +1,13 @@ -powerpc/powerpc64/power7 +powerpc/powerpc64-common/power7 +powerpc/powerpc64-common/power6/fpu +powerpc/powerpc64-common/power6 +powerpc/powerpc64-common/power5+/fpu +powerpc/powerpc64-common/power5+ +powerpc/power5+/fpu/ +powerpc/power5+/ +powerpc/powerpc64-common/power5/fpu +powerpc/powerpc64-common/power5 +powerpc/powerpc64-common/power4/fpu +powerpc/powerpc64-common/power4 +powerpc/power4/fpu +powerpc/power4 diff --git a/sysdeps/powerpc/powerpc64le/power7/fpu/Implies b/sysdeps/powerpc/powerpc64le/power7/fpu/Implies index 8447198fbc..174077a028 100644 --- a/sysdeps/powerpc/powerpc64le/power7/fpu/Implies +++ b/sysdeps/powerpc/powerpc64le/power7/fpu/Implies @@ -1 +1,5 @@ -powerpc/powerpc64/power7/fpu +powerpc/powerpc64-common/power7/fpu +powerpc/powerpc64-common/power6/fpu +powerpc/powerpc64-common/power5+/fpu +powerpc/powerpc64-common/power5/fpu +powerpc/powerpc64-common/power4/fpu diff --git a/sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies index 7fd86fdf87..ba256f7753 100644 --- a/sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64le/power7/fpu/multiarch/Implies @@ -1 +1,5 @@ -powerpc/powerpc64/power7/fpu/multiarch +powerpc/powerpc64-common/power7/fpu/multiarch +powerpc/powerpc64-common/power6/fpu/multiarch +powerpc/powerpc64-common/power5+/fpu/multiarch +powerpc/powerpc64-common/power5/fpu/multiarch +powerpc/powerpc64-common/power4/fpu/multiarch diff --git a/sysdeps/powerpc/powerpc64le/power7/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power7/multiarch/Implies index 1fc7b7cd39..a585afd730 100644 --- a/sysdeps/powerpc/powerpc64le/power7/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64le/power7/multiarch/Implies @@ -1 +1,5 @@ -powerpc/powerpc64/power7/multiarch +powerpc/powerpc64-common/power7/multiarch +powerpc/powerpc64-common/power6/multiarch +powerpc/powerpc64-common/power5+/multiarch +powerpc/powerpc64-common/power5/multiarch +powerpc/powerpc64-common/power4/multiarch diff --git a/sysdeps/powerpc/powerpc64le/power8/Implies b/sysdeps/powerpc/powerpc64le/power8/Implies index 3c37351dcc..1a39fe41f4 100644 --- a/sysdeps/powerpc/powerpc64le/power8/Implies +++ b/sysdeps/powerpc/powerpc64le/power8/Implies @@ -1 +1,3 @@ -powerpc/powerpc64/power8 +powerpc/powerpc64-common/power8 +powerpc/powerpc64le/power7/fpu +powerpc/powerpc64le/power7 diff --git a/sysdeps/powerpc/powerpc64le/power8/fpu/Implies b/sysdeps/powerpc/powerpc64le/power8/fpu/Implies index ae0dbaf857..44d93aa989 100644 --- a/sysdeps/powerpc/powerpc64le/power8/fpu/Implies +++ b/sysdeps/powerpc/powerpc64le/power8/fpu/Implies @@ -1 +1,2 @@ -powerpc/powerpc64/power8/fpu +powerpc/powerpc64-common/power8/fpu +powerpc/powerpc64le/power7/fpu diff --git a/sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies index f11e1bdba2..e005b72de2 100644 --- a/sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64le/power8/fpu/multiarch/Implies @@ -1 +1,2 @@ -powerpc/powerpc64/power8/fpu/multiarch +powerpc/powerpc64-common/power8/fpu/multiarch +powerpc/powerpc64le/power7/fpu/multiarch diff --git a/sysdeps/powerpc/powerpc64le/power8/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power8/multiarch/Implies index dd6bca4b36..63810b5070 100644 --- a/sysdeps/powerpc/powerpc64le/power8/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64le/power8/multiarch/Implies @@ -1 +1,2 @@ -powerpc/powerpc64/power8/multiarch +powerpc/powerpc64-common/power8/multiarch +powerpc/powerpc64le/power7/multiarch diff --git a/sysdeps/powerpc/powerpc64le/power9/Implies b/sysdeps/powerpc/powerpc64le/power9/Implies index efe5d4193c..ea3759f4b5 100644 --- a/sysdeps/powerpc/powerpc64le/power9/Implies +++ b/sysdeps/powerpc/powerpc64le/power9/Implies @@ -1 +1,3 @@ -powerpc/powerpc64/power9 +powerpc/powerpc64-common/power9 +powerpc/powerpc64le/power8/fpu +powerpc/powerpc64le/power8 diff --git a/sysdeps/powerpc/powerpc64le/power9/fpu/Implies b/sysdeps/powerpc/powerpc64le/power9/fpu/Implies index 3633114b47..7f36d52585 100644 --- a/sysdeps/powerpc/powerpc64le/power9/fpu/Implies +++ b/sysdeps/powerpc/powerpc64le/power9/fpu/Implies @@ -1 +1,2 @@ -powerpc/powerpc64/power9/fpu/ +powerpc/powerpc64-common/power9/fpu/ +powerpc/powerpc64le/power8/fpu diff --git a/sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies index 105948092d..d0758e8fbb 100644 --- a/sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64le/power9/fpu/multiarch/Implies @@ -1 +1,2 @@ -powerpc/powerpc64/power9/fpu/multiarch +powerpc/powerpc64-common/power9/fpu/multiarch +powerpc/powerpc64le/power8/fpu/multiarch diff --git a/sysdeps/powerpc/powerpc64le/power9/multiarch/Implies b/sysdeps/powerpc/powerpc64le/power9/multiarch/Implies index 02be30cfd0..8db21ae0c5 100644 --- a/sysdeps/powerpc/powerpc64le/power9/multiarch/Implies +++ b/sysdeps/powerpc/powerpc64le/power9/multiarch/Implies @@ -1 +1,2 @@ -powerpc/powerpc64/power9/multiarch +powerpc/powerpc64-common/power9/multiarch +powerpc/powerpc64le/power8/multiarch diff --git a/sysdeps/unix/powerpc/sysdep.h b/sysdeps/unix/powerpc/sysdep.h index 2141593a2b..7fe99e5641 100644 --- a/sysdeps/unix/powerpc/sysdep.h +++ b/sysdeps/unix/powerpc/sysdep.h @@ -18,7 +18,7 @@ #include <sysdeps/unix/sysdep.h> #include <bits/wordsize.h> #if __WORDSIZE == 64 -#include <sysdeps/powerpc/powerpc64/sysdep.h> +#include <sysdeps/powerpc/powerpc64-common/sysdep.h> #else #include <sysdeps/powerpc/powerpc32/sysdep.h> #endif