From 86ecdfb60e9fd88c17351cd0cacf57a98f99ee7f Mon Sep 17 00:00:00 2001 From: Andrew Pinski Date: Tue, 19 Aug 2003 17:17:27 +0000 Subject: i386.c (legitimate_pic_address_disp_p): Change the strstr with $pb to a strcompare with "" 2003-08-19 Andrew Pinski * config/i386/i386.c (legitimate_pic_address_disp_p): Change the strstr with $pb to a strcompare with "" (ix86_output_addr_diff_elt): Output the real pic base. From-SVN: r70569 --- gcc/ChangeLog | 6 ++++++ gcc/config/i386/i386.c | 9 ++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8c8825a..f323db2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2003-08-19 Andrew Pinski + + * config/i386/i386.c (legitimate_pic_address_disp_p): Change the + strstr with $pb to a strcompare with "" + (ix86_output_addr_diff_elt): Output the real pic base. + 2003-08-19 Gabriel Dos Reis * langhooks-def.h (LANG_HOOKS_INITIALIZE_DIAGNOSTICS): Fix spelling. diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index db404f0..3cba33a 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -5715,7 +5715,7 @@ legitimate_pic_address_disp_p (register rtx disp) if (GET_CODE (XEXP (disp, 1)) == SYMBOL_REF) { const char *sym_name = XSTR (XEXP (disp, 1), 0); - if (strstr (sym_name, "$pb") != 0) + if (! strcmp (sym_name, "")) return 1; } } @@ -8027,8 +8027,11 @@ ix86_output_addr_diff_elt (FILE *file, int value, int rel) fprintf (file, "%s%s%d@GOTOFF\n", ASM_LONG, LPREFIX, value); #if TARGET_MACHO else if (TARGET_MACHO) - fprintf (file, "%s%s%d-%s\n", ASM_LONG, LPREFIX, value, - machopic_function_base_name () + 1); + { + fprintf (file, "%s%s%d-", ASM_LONG, LPREFIX, value); + machopic_output_function_base_name (file); + fprintf(file, "\n"); + } #endif else asm_fprintf (file, "%s%U%s+[.-%s%d]\n", -- cgit v1.1