diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-09-05 01:28:26 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2007-09-05 01:28:26 +0200 |
| commit | ce629d4d9819052db871ac510c010d7321ad1b30 (patch) | |
| tree | 305119e10a4412b0eaa1580ba4a15dad0fc8cdfc /gcc | |
| parent | 95b2e554d06a34489fe1649f1fa222acadba6c15 (diff) | |
| download | gcc-ce629d4d9819052db871ac510c010d7321ad1b30.zip gcc-ce629d4d9819052db871ac510c010d7321ad1b30.tar.gz gcc-ce629d4d9819052db871ac510c010d7321ad1b30.tar.bz2 | |
tramp.asm: Include config.h.
* config/rs6000/tramp.asm: Include config.h.
Check __PIC__ or __pic__ macro instead of SHARED.
From-SVN: r128106
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/rs6000/tramp.asm | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 8a2dd22..8cbaeaa 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2007-09-05 Jakub Jelinek <jakub@redhat.com> + + * config/rs6000/tramp.asm: Include config.h. + Check __PIC__ or __pic__ macro instead of SHARED. + 2007-09-04 Laurynas Biveinis <laurynas.biveinis@gmail.com> * c-format.c: Include alloc-pool.h. diff --git a/gcc/config/rs6000/tramp.asm b/gcc/config/rs6000/tramp.asm index 63dacc0..cd61f1d 100644 --- a/gcc/config/rs6000/tramp.asm +++ b/gcc/config/rs6000/tramp.asm @@ -1,6 +1,6 @@ /* Special support for trampolines * - * Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. + * Copyright (C) 1996, 1997, 2000, 2007 Free Software Foundation, Inc. * Written By Michael Meissner * * This file is free software; you can redistribute it and/or modify it @@ -37,7 +37,8 @@ .file "tramp.asm" .section ".text" - #include "ppc-asm.h" +#include "ppc-asm.h" +#include "config.h" #ifndef __powerpc64__ .type trampoline_initial,@object @@ -105,7 +106,7 @@ FUNC_START(__trampoline_setup) blr .Labort: -#if defined SHARED && defined HAVE_AS_REL16 +#if (defined __PIC__ || defined __pic__) && defined HAVE_AS_REL16 bcl 20,31,1f 1: mflr r30 addis r30,r30,_GLOBAL_OFFSET_TABLE_-1b@ha |