public inbox for gentoo-dev@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-dev] [PATCH] cmake-utils.eclass: Extend ASM rules to ASM-ATT
@ 2018-02-25  9:06 Michał Górny
  2018-02-25 11:36 ` Francesco Riosa
  2018-03-02  8:49 ` [gentoo-dev] " Michael Palimaka
  0 siblings, 2 replies; 3+ messages in thread
From: Michał Górny @ 2018-02-25  9:06 UTC (permalink / raw
  To: gentoo-dev; +Cc: Michał Górny

Some CMake projects use ASM-ATT rather than ASM, so extend our rule
overrides to that.

Bug: https://bugs.gentoo.org/625844
---
 eclass/cmake-utils.eclass | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
index b9f69a824b14..ef3f3c2607f8 100644
--- a/eclass/cmake-utils.eclass
+++ b/eclass/cmake-utils.eclass
@@ -516,6 +516,7 @@ cmake-utils_src_configure() {
 	fi
 	cat > "${build_rules}" <<- _EOF_ || die
 		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
+		SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
 		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
 		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
 		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
@@ -531,6 +532,7 @@ cmake-utils_src_configure() {
 	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
 	cat > ${toolchain_file} <<- _EOF_ || die
 		SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
+		SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}")
 		SET (CMAKE_C_COMPILER "${myCC/ /;}")
 		SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
 		SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
@@ -609,6 +611,7 @@ cmake-utils_src_configure() {
 	if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
 		cat >> ${common_config} <<- _EOF_ || die
 			SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
+			SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
 			SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
-- 
2.16.2



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [gentoo-dev] [PATCH] cmake-utils.eclass: Extend ASM rules to ASM-ATT
  2018-02-25  9:06 [gentoo-dev] [PATCH] cmake-utils.eclass: Extend ASM rules to ASM-ATT Michał Górny
@ 2018-02-25 11:36 ` Francesco Riosa
  2018-03-02  8:49 ` [gentoo-dev] " Michael Palimaka
  1 sibling, 0 replies; 3+ messages in thread
From: Francesco Riosa @ 2018-02-25 11:36 UTC (permalink / raw
  To: gentoo development

[-- Attachment #1: Type: text/plain, Size: 3212 bytes --]

2018-02-25 10:06 GMT+01:00 Michał Górny <mgorny@gentoo.org>:

> Some CMake projects use ASM-ATT rather than ASM, so extend our rule
> overrides to that.
>

for the curious:
https://cmake.org/Wiki/CMake/Assembler#ASM-ATT

ASM-ATT

This can be used for assembler files in AT&T assembler syntax. This
includes the GNU assembler gas.

   - Supported assembler names: as, gas, may have toolchain specific prefix
   - Supported source files extensions: .s, .asm
   - .S files, i.e. assembler files which require preprocessing, are not
   supported
   - Involved files: CMakeASM-ATTInformation.cmake,
   CMakeDetermineASM-ATTCompiler.cmake, CMakeTestASM-ATTCompiler.cmake




>
> Bug: https://bugs.gentoo.org/625844
> ---
>  eclass/cmake-utils.eclass | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
> index b9f69a824b14..ef3f3c2607f8 100644
> --- a/eclass/cmake-utils.eclass
> +++ b/eclass/cmake-utils.eclass
> @@ -516,6 +516,7 @@ cmake-utils_src_configure() {
>         fi
>         cat > "${build_rules}" <<- _EOF_ || die
>                 SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER>
> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE
> STRING "ASM compile command" FORCE)
> +               SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM_COMPILER>
> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE
> STRING "ASM compile command" FORCE)
>                 SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES>
> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C
> compile command" FORCE)
>                 SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER>
> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE
> STRING "C++ compile command" FORCE)
>                 SET (CMAKE_Fortran_COMPILE_OBJECT
> "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o
> <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
> @@ -531,6 +532,7 @@ cmake-utils_src_configure() {
>         local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
>         cat > ${toolchain_file} <<- _EOF_ || die
>                 SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
> +               SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}")
>                 SET (CMAKE_C_COMPILER "${myCC/ /;}")
>                 SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
>                 SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
> @@ -609,6 +611,7 @@ cmake-utils_src_configure() {
>         if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
>                 cat >> ${common_config} <<- _EOF_ || die
>                         SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} ""
> CACHE STRING "")
> +                       SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} ""
> CACHE STRING "")
>                         SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE
> STRING "")
>                         SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} ""
> CACHE STRING "")
>                         SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} ""
> CACHE STRING "")
> --
> 2.16.2
>
>
>

[-- Attachment #2: Type: text/html, Size: 6080 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-dev] Re: [PATCH] cmake-utils.eclass: Extend ASM rules to ASM-ATT
  2018-02-25  9:06 [gentoo-dev] [PATCH] cmake-utils.eclass: Extend ASM rules to ASM-ATT Michał Górny
  2018-02-25 11:36 ` Francesco Riosa
@ 2018-03-02  8:49 ` Michael Palimaka
  1 sibling, 0 replies; 3+ messages in thread
From: Michael Palimaka @ 2018-03-02  8:49 UTC (permalink / raw
  To: gentoo-dev; +Cc: kde

On 02/25/2018 08:06 PM, Michał Górny wrote:
> Some CMake projects use ASM-ATT rather than ASM, so extend our rule
> overrides to that.
> 
> Bug: https://bugs.gentoo.org/625844
> ---
>  eclass/cmake-utils.eclass | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass
> index b9f69a824b14..ef3f3c2607f8 100644
> --- a/eclass/cmake-utils.eclass
> +++ b/eclass/cmake-utils.eclass
> @@ -516,6 +516,7 @@ cmake-utils_src_configure() {
>  	fi
>  	cat > "${build_rules}" <<- _EOF_ || die
>  		SET (CMAKE_ASM_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
> +		SET (CMAKE_ASM-ATT_COMPILE_OBJECT "<CMAKE_ASM_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "ASM compile command" FORCE)
>  		SET (CMAKE_C_COMPILE_OBJECT "<CMAKE_C_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C compile command" FORCE)
>  		SET (CMAKE_CXX_COMPILE_OBJECT "<CMAKE_CXX_COMPILER> <DEFINES> ${includes} ${CPPFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "C++ compile command" FORCE)
>  		SET (CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> <DEFINES> ${includes} ${FCFLAGS} <FLAGS> -o <OBJECT> -c <SOURCE>" CACHE STRING "Fortran compile command" FORCE)
> @@ -531,6 +532,7 @@ cmake-utils_src_configure() {
>  	local toolchain_file=${BUILD_DIR}/gentoo_toolchain.cmake
>  	cat > ${toolchain_file} <<- _EOF_ || die
>  		SET (CMAKE_ASM_COMPILER "${myCC/ /;}")
> +		SET (CMAKE_ASM-ATT_COMPILER "${myCC/ /;}")
>  		SET (CMAKE_C_COMPILER "${myCC/ /;}")
>  		SET (CMAKE_CXX_COMPILER "${myCXX/ /;}")
>  		SET (CMAKE_Fortran_COMPILER "${myFC/ /;}")
> @@ -609,6 +611,7 @@ cmake-utils_src_configure() {
>  	if [[ ${CMAKE_BUILD_TYPE} != Gentoo && ${EAPI} != 5 ]]; then
>  		cat >> ${common_config} <<- _EOF_ || die
>  			SET (CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
> +			SET (CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
>  			SET (CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
>  			SET (CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
>  			SET (CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "")
> 

LGTM


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-03-02  8:50 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-02-25  9:06 [gentoo-dev] [PATCH] cmake-utils.eclass: Extend ASM rules to ASM-ATT Michał Górny
2018-02-25 11:36 ` Francesco Riosa
2018-03-02  8:49 ` [gentoo-dev] " Michael Palimaka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox