From a1e27b76d4c60eee5121c7a7f8779a4254e1a845 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Wed, 23 Dec 1998 14:34:18 +0000 Subject: [PATCH] Enable -fleading-underscore for arm-elf builds. From-SVN: r24409 --- gcc/ChangeLog | 15 +++++++++++++++ gcc/config/arm/lib1funcs.asm | 18 +++++++++--------- gcc/config/arm/t-arm-elf | 4 ++-- gcc/config/arm/thumb.h | 4 ++-- gcc/config/arm/unknown-elf.h | 2 +- 5 files changed, 29 insertions(+), 14 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5d14e87..1da6d68 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,18 @@ +Wed Dec 23 10:27:44 1998 Nick Clifton + + * config/arm/t-arm-elf: Add multiplib option for leading + underscores. + + * config/arm/thumb.h (ASM_OUTPUT_LABELREF): Use variable + 'user_label_prefix' rather than macro USER_LABEL_PREFIX. + + (thumb_shiftable_const): Use macro 'BASE_REG_CLASS' rather + than variable 'reload_address_base_reg_class'. [Note this + change is unrelated to the others in this patch]. + + * config/arm/unknown-elf.h (USER_LABEL_PREFIX): Default to no + leading underscore. + Wed Dec 23 09:51:32 1998 Kaveh R. Ghazi * alias.c (record_alias_subset): Remove ignored `&'. diff --git a/gcc/config/arm/lib1funcs.asm b/gcc/config/arm/lib1funcs.asm index 1e592a2..ded20ff 100644 --- a/gcc/config/arm/lib1funcs.asm +++ b/gcc/config/arm/lib1funcs.asm @@ -47,6 +47,15 @@ Boston, MA 02111-1307, USA. */ #error __USER_LABEL_PREFIX__ not defined #endif +/* ANSI concatenation macros. */ + +#define CONCAT1(a, b) CONCAT2(a, b) +#define CONCAT2(a, b) a ## b + +/* Use the right prefix for global labels. */ + +#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x) + #ifdef __elf__ #define __PLT__ (PLT) #define TYPE(x) .type SYM(x),function @@ -57,15 +66,6 @@ Boston, MA 02111-1307, USA. */ #define SIZE(x) #endif -/* ANSI concatenation macros. */ - -#define CONCAT1(a, b) CONCAT2(a, b) -#define CONCAT2(a, b) a ## b - -/* Use the right prefix for global labels. */ - -#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x) - #ifdef L_udivsi3 dividend .req r0 diff --git a/gcc/config/arm/t-arm-elf b/gcc/config/arm/t-arm-elf index 8071259..5f57d80 100644 --- a/gcc/config/arm/t-arm-elf +++ b/gcc/config/arm/t-arm-elf @@ -23,8 +23,8 @@ dp-bit.c: $(srcdir)/config/fp-bit.c echo '#endif' >> dp-bit.c cat $(srcdir)/config/fp-bit.c >> dp-bit.c -MULTILIB_OPTIONS = mlittle-endian/mbig-endian mhard-float/msoft-float mapcs-32/mapcs-26 -MULTILIB_DIRNAMES = le be fpu soft 32bit 26bit +MULTILIB_OPTIONS = mlittle-endian/mbig-endian mhard-float/msoft-float mapcs-32/mapcs-26 fno-leading-underscore/fleading-underscore +MULTILIB_DIRNAMES = le be fpu soft 32bit 26bit elf under MULTILIB_MATCHES = LIBGCC = stmp-multilib diff --git a/gcc/config/arm/thumb.h b/gcc/config/arm/thumb.h index 0f6c60c..be2a0e4 100644 --- a/gcc/config/arm/thumb.h +++ b/gcc/config/arm/thumb.h @@ -161,7 +161,7 @@ extern int target_flags; /* Output a reference to a label. */ #define ASM_OUTPUT_LABELREF(STREAM,NAME) \ - fprintf ((STREAM), "%s%s", USER_LABEL_PREFIX, (NAME)) + fprintf ((STREAM), "%s%s", user_label_prefix, (NAME)) /* This is how to output an assembler line for a numeric constant byte. */ #define ASM_OUTPUT_BYTE(STREAM,VALUE) \ @@ -977,7 +977,7 @@ int thumb_shiftable_const (); rtx orig_X = X; \ X = copy_rtx (X); \ push_reload (orig_X, NULL_RTX, &X, NULL_PTR, \ - reload_address_base_reg_class, \ + BASE_REG_CLASS, \ Pmode, VOIDmode, 0, 0, OPNUM, TYPE); \ goto WIN; \ } \ diff --git a/gcc/config/arm/unknown-elf.h b/gcc/config/arm/unknown-elf.h index be8da81..5fa5d72 100644 --- a/gcc/config/arm/unknown-elf.h +++ b/gcc/config/arm/unknown-elf.h @@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA. */ #define ENDFILE_SPEC "crtend%O%s" -#define USER_LABEL_PREFIX "_" /* FIXME: This ought to be "" */ +#define USER_LABEL_PREFIX "" #define LOCAL_LABEL_PREFIX "." #define TEXT_SECTION " .text" -- 2.7.4