From: James Almer Date: Tue, 4 Apr 2017 19:04:29 +0000 (-0300) Subject: Merge commit '6a1ea4ec932f4fc9fdc00ec51ee070b298ddb35f' X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d1ee6fb72945d43d55aa0e7f946a957274cd94c9;hp=-c;p=ffmpeg Merge commit '6a1ea4ec932f4fc9fdc00ec51ee070b298ddb35f' * commit '6a1ea4ec932f4fc9fdc00ec51ee070b298ddb35f': arm: warn/error on movrelx usage problematic with PIC on ELF Merged-by: James Almer --- d1ee6fb72945d43d55aa0e7f946a957274cd94c9 diff --combined libavutil/arm/asm.S index f4882899ee5,a791e80c57d..7d33a64fac3 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@@ -1,20 -1,20 +1,20 @@@ /* * Copyright (c) 2008 Mans Rullgard * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@@ -184,6 -184,15 +184,15 @@@ T ldr \rd, [\rd .endm .macro movrelx rd, val, gp + .ifc \rd,\gp + .error "movrelx needs two distinct registers" + .endif + .ifc \rd\()_\gp,r12_ + .warning "movrelx rd=\rd without explicit set gp" + .endif + .ifc \rd\()_\gp,ip_ + .warning "movrelx rd=\rd without explicit set gp" + .endif #if CONFIG_PIC && defined(__ELF__) .ifnb \gp .if .Lpic_gp