diff options
| author | Mike Stump <mrs@apple.com> | 2006-10-27 17:47:38 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@gcc.gnu.org> | 2006-10-27 17:47:38 +0000 |
| commit | 95c0fb7a066b8f41723150b08e4aa3c08622bc2b (patch) | |
| tree | 6ff2569a052b5b07d9e69eb0c618dde7fbbfca4f | |
| parent | 88784637273a1e9168651ec843cefb0fa025315d (diff) | |
| download | gcc-95c0fb7a066b8f41723150b08e4aa3c08622bc2b.zip gcc-95c0fb7a066b8f41723150b08e4aa3c08622bc2b.tar.gz gcc-95c0fb7a066b8f41723150b08e4aa3c08622bc2b.tar.bz2 | |
darwin-c.c (darwin_cpp_builtins): Move __STATIC__ and __DYNAMIC__ from here back to ...
* config/darwin-c.c (darwin_cpp_builtins): Move __STATIC__ and
__DYNAMIC__ from here back to ...
* config/darwin.h (CPP_SPEC): ... here.
Radar 4804385
From-SVN: r118082
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/config/darwin-c.c | 5 | ||||
| -rw-r--r-- | gcc/config/darwin.h | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c469970..36f0866 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2006-10-27 Mike Stump <mrs@apple.com> + + * config/darwin-c.c (darwin_cpp_builtins): Move __STATIC__ and + __DYNAMIC__ from here back to ... + * config/darwin.h (CPP_SPEC): ... here. + 2006-10-26 Nathan Froyd <froydnj@codesourcery.com> Nathan Sidwell <nathan@codesourcery.com> diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c index 51dbf5c..88ce9ef 100644 --- a/gcc/config/darwin-c.c +++ b/gcc/config/darwin-c.c @@ -619,9 +619,4 @@ darwin_cpp_builtins (cpp_reader *pfile) if (darwin_macosx_version_min) builtin_define_with_value ("__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__", version_as_macro(), false); - - if (flag_pic || MACHO_DYNAMIC_NO_PIC_P) - builtin_define ("__DYNAMIC__"); - else - builtin_define ("__STATIC__"); } diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index 21f909d..43288f7 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -214,7 +214,7 @@ extern GTY(()) int darwin_ms_struct; them to darwin_cpp_builtins in darwin-c.c. */ #undef CPP_SPEC -#define CPP_SPEC "" +#define CPP_SPEC "%{static:%{!dynamic:-D__STATIC__}}%{!static:-D__DYNAMIC__}" /* This is mostly a clone of the standard LINK_COMMAND_SPEC, plus precomp, libtool, and fat build additions. Also we |