From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 97566 invoked by alias); 11 Apr 2019 14:20:51 -0000 Mailing-List: contact newlib-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: newlib-cvs-owner@sourceware.org Received: (qmail 97547 invoked by uid 9798); 11 Apr 2019 14:20:51 -0000 Date: Thu, 11 Apr 2019 14:20:00 -0000 Message-ID: <20190411142051.97546.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Christophe Lyon To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] Include code in trap.S for APCS only. X-Act-Checkin: newlib-cygwin X-Git-Author: Christophe Lyon X-Git-Refname: refs/heads/master X-Git-Oldrev: 630808d2a2865634df3f54cec403a058511596e7 X-Git-Newrev: cc430406ac09d99570b5218668f2bb00371ae983 X-SW-Source: 2019-q2/txt/msg00003.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=cc430406ac09d99570b5218668f2bb00371ae983 commit cc430406ac09d99570b5218668f2bb00371ae983 Author: Christophe Lyon Date: Wed Apr 10 15:04:13 2019 +0000 Include code in trap.S for APCS only. The code in trap.S is to support the old APCS chunked stack variant, which dates back to the Acorn days, so put it under #ifndef __ARM_EABI__. * libgloss/arm/trap.S: Use __ARM_EABI rather than PREFER_THUMB. * newlib/libc/sys/arm/trap.S: Use __ARM_EABI rather than __thumb2__. Diff: --- libgloss/arm/trap.S | 2 +- newlib/libc/sys/arm/trap.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libgloss/arm/trap.S b/libgloss/arm/trap.S index d854b57..845ad01 100644 --- a/libgloss/arm/trap.S +++ b/libgloss/arm/trap.S @@ -1,6 +1,6 @@ #include "arm.h" /* Run-time exception support */ -#ifndef PREFER_THUMB +#ifndef __ARM_EABI__ #include "swi.h" /* .text is used instead of .section .text so it works with arm-aout too. */ diff --git a/newlib/libc/sys/arm/trap.S b/newlib/libc/sys/arm/trap.S index 21b6937..681b3db 100644 --- a/newlib/libc/sys/arm/trap.S +++ b/newlib/libc/sys/arm/trap.S @@ -1,5 +1,5 @@ /* Run-time exception support */ -#if !defined(__thumb2__) +#ifndef __ARM_EABI__ #include "swi.h" /* .text is used instead of .section .text so it works with arm-aout too. */