diff options
| -rw-r--r-- | lib/Basic/Targets.cpp | 12 | ||||
| -rw-r--r-- | test/Preprocessor/init.c | 9 |
2 files changed, 9 insertions, 12 deletions
diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index c1cd96e361..b96e17d892 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -1619,25 +1619,23 @@ namespace { virtual void getTargetDefines(const LangOptions &Opts, MacroBuilder &Builder) const { Builder.defineMacro("__pic16"); - Builder.defineMacro("__PIC16"); Builder.defineMacro("rom", "__attribute__((address_space(1)))"); Builder.defineMacro("ram", "__attribute__((address_space(0)))"); - Builder.defineMacro("__section(SectName)", + Builder.defineMacro("_section(SectName)", "__attribute__((section(SectName)))"); Builder.defineMacro("near", "__attribute__((section(\"Address=NEAR\")))"); - Builder.defineMacro("__address(Addr)", + Builder.defineMacro("_address(Addr)", "__attribute__((section(\"Address=\"#Addr)))"); - Builder.defineMacro("__config(conf)", "asm(\"CONFIG \"#conf)"); - Builder.defineMacro("__idlocs(value)", "asm(\"__IDLOCS \"#value)"); - Builder.defineMacro("interrupt", + Builder.defineMacro("_CONFIG(conf)", "asm(\"CONFIG \"#conf)"); + Builder.defineMacro("_interrupt", "__attribute__((section(\"interrupt=0x4\"))) \ __attribute__((used))"); } virtual void getTargetBuiltins(const Builtin::Info *&Records, unsigned &NumRecords) const {} virtual const char *getVAListDeclaration() const { - return "typedef char* __builtin_va_list;"; + return ""; } virtual const char *getClobbers() const { return ""; diff --git a/test/Preprocessor/init.c b/test/Preprocessor/init.c index 00ea92c26b..a1485b6501 100644 --- a/test/Preprocessor/init.c +++ b/test/Preprocessor/init.c @@ -443,7 +443,7 @@ // // RUN: %clang_cc1 -E -dM -ffreestanding -triple=pic16-none-none < /dev/null | FileCheck -check-prefix PIC16 %s // -// PIC16:#define __config(conf) asm("CONFIG "#conf) +// PIC16:#define _CONFIG(conf) asm("CONFIG "#conf) // PIC16:#define __CHAR_BIT__ 8 // PIC16:#define __DBL_DENORM_MIN__ 1.40129846e-45F // PIC16:#define __DBL_DIG__ 6 @@ -518,10 +518,9 @@ // PIC16:#define __clang__ 1 // PIC16:#define __llvm__ 1 // PIC16:#define __pic16 1 -// PIC16:#define __PIC16 1 -// PIC16:#define __address(Addr) __attribute__((section("Address="#Addr))) -// PIC16:#define interrupt __attribute__((section("interrupt=0x4"))) __attribute__((used)) -// PIC16:#define __section(SectName) __attribute__((section(SectName))) +// PIC16:#define _address(Addr) __attribute__((section("Address="#Addr))) +// PIC16:#define _interrupt __attribute__((section("interrupt=0x4"))) __attribute__((used)) +// PIC16:#define _section(SectName) __attribute__((section(SectName))) // PIC16:#define ram __attribute__((address_space(0))) // PIC16:#define rom __attribute__((address_space(1))) // |