From b2805dabaa8292ad158039c59b1577e7ce07ea43 Mon Sep 17 00:00:00 2001 From: Roberto Vargas <roberto.vargas@arm.com> Date: Tue, 17 Apr 2018 11:31:43 +0100 Subject: [PATCH] Remove .func and .endfunc assembler directives These directives are only used when stabs debugging information is used, but we use ELF which uses DWARF debugging information. Clang assembler doesn't support these directives, and removing them makes the code more compatible with clang. Change-Id: I2803f22ebd24c0fe248e04ef1b17de9cec5f89c4 Signed-off-by: Roberto Vargas <roberto.vargas@arm.com> --- include/common/aarch64/asm_macros.S | 2 -- include/common/asm_macros_common.S | 4 +--- plat/rockchip/common/pmusram/pmu_sram_cpus_on.S | 1 - plat/rockchip/rk3399/drivers/pmu/plat_pmu_macros.S | 1 - 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/include/common/aarch64/asm_macros.S b/include/common/aarch64/asm_macros.S index 5b050455c..10ed301de 100644 --- a/include/common/aarch64/asm_macros.S +++ b/include/common/aarch64/asm_macros.S @@ -83,7 +83,6 @@ .section \section_name, "ax" .align 7, 0 .type \label, %function - .func \label .cfi_startproc \label: .endm @@ -95,7 +94,6 @@ * vector entry as the parameter */ .macro check_vector_size since - .endfunc .cfi_endproc .if (. - \since) > (32 * 4) .error "Vector exceeds 32 instructions" diff --git a/include/common/asm_macros_common.S b/include/common/asm_macros_common.S index ca8c1ad0f..081addcc5 100644 --- a/include/common/asm_macros_common.S +++ b/include/common/asm_macros_common.S @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -31,7 +31,6 @@ .cfi_sections .debug_frame .section .text.asm.\_name, "ax" .type \_name, %function - .func \_name /* * .cfi_startproc and .cfi_endproc are needed to output entries in * .debug_frame @@ -45,7 +44,6 @@ * This macro is used to mark the end of a function. */ .macro endfunc _name - .endfunc .cfi_endproc .size \_name, . - \_name .endm diff --git a/plat/rockchip/common/pmusram/pmu_sram_cpus_on.S b/plat/rockchip/common/pmusram/pmu_sram_cpus_on.S index 5a1854b42..991fe6cf8 100644 --- a/plat/rockchip/common/pmusram/pmu_sram_cpus_on.S +++ b/plat/rockchip/common/pmusram/pmu_sram_cpus_on.S @@ -12,7 +12,6 @@ .macro pmusram_entry_func _name .section .pmusram.entry, "ax" .type \_name, %function - .func \_name .cfi_startproc \_name: .endm diff --git a/plat/rockchip/rk3399/drivers/pmu/plat_pmu_macros.S b/plat/rockchip/rk3399/drivers/pmu/plat_pmu_macros.S index 70fd9bfc8..546c09a1e 100644 --- a/plat/rockchip/rk3399/drivers/pmu/plat_pmu_macros.S +++ b/plat/rockchip/rk3399/drivers/pmu/plat_pmu_macros.S @@ -15,7 +15,6 @@ .cfi_sections .debug_frame .section .sram.text, "ax" .type \_name, %function - .func \_name .cfi_startproc \_name: .endm -- GitLab