multilib_header.bbclass: Add oe_multilib_header wrapper
This helper function and associated header will allow us to resolve two/three header files that conflict due to contents that change based on wordsize and ABI. (From OE-Core rev: 1fe66d01b7bce70a37245d47b1abce155fae926e) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
ba8a726b7d
commit
a447c3e859
|
@ -0,0 +1,29 @@
|
||||||
|
inherit siteinfo
|
||||||
|
|
||||||
|
# If applicable on the architecture, this routine will rename the header and add
|
||||||
|
# a unique identifier to the name for the ABI/bitsize that is being used. A wrapper will
|
||||||
|
# be generated for the architecture that knows how to call all of the ABI variants for that
|
||||||
|
# given architecture.
|
||||||
|
#
|
||||||
|
# TODO: mips64 n32 is not yet recognized in this code
|
||||||
|
# when that is identified the name of the wrapped item should be "n32" and appropriately
|
||||||
|
# determined int he if coding...
|
||||||
|
#
|
||||||
|
oe_multilib_header() {
|
||||||
|
# Do nothing on ARM, only one ABI is supported at once
|
||||||
|
if echo ${TARGET_ARCH} | grep -q arm; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
for each_header in "$@" ; do
|
||||||
|
if [ ! -f "${D}/${includedir}/$each_header" ]; then
|
||||||
|
bberror "oe_multilib_header: Unable to find header $each_header."
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
stem=$(echo $each_header | sed 's#\.h$##')
|
||||||
|
ident=${SITEINFO_BITS}
|
||||||
|
# if mips64/n32 set ident to n32
|
||||||
|
mv ${D}/${includedir}/$each_header ${D}/${includedir}/${stem}-${ident}.h
|
||||||
|
|
||||||
|
sed -e "s#ENTER_HEADER_FILENAME_HERE#${stem}#g" ${COREBASE}/scripts/multilib_header_wrapper.h > ${D}/${includedir}/$each_header
|
||||||
|
done
|
||||||
|
}
|
|
@ -0,0 +1,55 @@
|
||||||
|
/*
|
||||||
|
* Copyright (C) 2005-2011 by Wind River Systems, Inc.
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <bits/wordsize.h>
|
||||||
|
|
||||||
|
#ifdef __WORDSIZE
|
||||||
|
|
||||||
|
#if __WORDSIZE == 32
|
||||||
|
|
||||||
|
#ifdef _MIPS_SIM
|
||||||
|
|
||||||
|
#if _MIPS_SIM == _ABIO32
|
||||||
|
#include <ENTER_HEADER_FILENAME_HERE-32.h>
|
||||||
|
#elif _MIPS_SIM == _ABIN32
|
||||||
|
#include <ENTER_HEADER_FILENAME_HERE-n32.h>
|
||||||
|
#else
|
||||||
|
#error "Unknown _MIPS_SIM"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#else /* _MIPS_SIM is not defined */
|
||||||
|
#include <ENTER_HEADER_FILENAME_HERE-32.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#elif __WORDSIZE == 64
|
||||||
|
#include <ENTER_HEADER_FILENAME_HERE-64.h>
|
||||||
|
#else
|
||||||
|
#error "Unknown __WORDSIZE detected"
|
||||||
|
#endif /* matches #if __WORDSIZE == 32 */
|
||||||
|
|
||||||
|
#else /* __WORDSIZE is not defined */
|
||||||
|
|
||||||
|
#error "__WORDSIZE is not defined"
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue