From: Alan Modra Date: Fri, 18 Jun 2010 10:57:21 +0000 (+0930) Subject: linux64.h (SET_CMODEL): Don't expand to empty. X-Git-Tag: releases/gcc-4.6.0~6358 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9628d8f6670fcf721ce6c96619820e9fe6f90174;p=thirdparty%2Fgcc.git linux64.h (SET_CMODEL): Don't expand to empty. * config/rs6000/linux64.h (SET_CMODEL): Don't expand to empty. From-SVN: r160978 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 69d49ff0a108..2af7e6ba212a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,7 @@ +2010-06-18 Alan Modra + + * config/rs6000/linux64.h (SET_CMODEL): Don't expand to empty. + 2010-06-17 John David Anglin PR target/43740 @@ -358,7 +362,7 @@ * config.in: Regenerate. * config/rs6000/linux64.opt (mcmodel): New. * config/rs6000/linux64.h (TARGET_USES_LINUX64_OPT): Define. - (TARGET_CMODEL): Define. + (TARGET_CMODEL, SET_CMODEL): Define. (SUBSUBTARGET_OVERRIDE_OPTIONS): Check user -mcmodel choice, select CMODEL_MEDIUM default. * config/rs6000/rs6000.h (enum rs6000_cmodel): New. diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h index d787d297db58..c4e365174cef 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h @@ -70,7 +70,7 @@ extern enum rs6000_cmodel cmodel; #define TARGET_CMODEL cmodel #define SET_CMODEL(opt) cmodel = opt #else -#define SET_CMODEL(opt) +#define SET_CMODEL(opt) do {} while (0) #endif #undef PROCESSOR_DEFAULT