diff options
| author | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-11-26 11:31:25 +0100 |
|---|---|---|
| committer | Iain Buclaw <ibuclaw@gdcproject.org> | 2020-11-27 21:27:14 +0100 |
| commit | 6b2f370fa915d74dff066d4b0340ddb459728046 (patch) | |
| tree | f2f3ab7378cac5701e8d4cb4b8002ec684fdc5e4 /gcc/d/dmd | |
| parent | f886c4a79573f1f1b46c37a1d5d68a4cf5d1319d (diff) | |
| download | gcc-6b2f370fa915d74dff066d4b0340ddb459728046.zip gcc-6b2f370fa915d74dff066d4b0340ddb459728046.tar.gz gcc-6b2f370fa915d74dff066d4b0340ddb459728046.tar.bz2 | |
d: Merge upstream dmd db0df3f7e.
Removes all support code and tests for the extern(Pascal) calling
convention.
Reviewed-on: https://github.com/dlang/dmd/pull/11994
gcc/d/ChangeLog:
* dmd/MERGE: Merge upstream dmd db0df3f7e.
* types.cc (TypeVisitor::visit (TypeFunction *)): Remove LINKpascal.
Diffstat (limited to 'gcc/d/dmd')
| -rw-r--r-- | gcc/d/dmd/MERGE | 2 | ||||
| -rw-r--r-- | gcc/d/dmd/dmangle.c | 2 | ||||
| -rw-r--r-- | gcc/d/dmd/globals.h | 1 | ||||
| -rw-r--r-- | gcc/d/dmd/hdrgen.c | 2 | ||||
| -rw-r--r-- | gcc/d/dmd/idgen.c | 1 | ||||
| -rw-r--r-- | gcc/d/dmd/json.c | 3 | ||||
| -rw-r--r-- | gcc/d/dmd/parse.c | 4 |
7 files changed, 2 insertions, 13 deletions
diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE index b00cb82..453c5e8 100644 --- a/gcc/d/dmd/MERGE +++ b/gcc/d/dmd/MERGE @@ -1,4 +1,4 @@ -b6a779e49a3bba8be6272e6730e14cbb6293ef77 +db0df3f7e6f2570f81d6c91ba173daa23361ea7b The first line of this file holds the git revision number of the last merge done from the dlang/dmd repository. diff --git a/gcc/d/dmd/dmangle.c b/gcc/d/dmd/dmangle.c index ea63bf3..8f86926 100644 --- a/gcc/d/dmd/dmangle.c +++ b/gcc/d/dmd/dmangle.c @@ -223,7 +223,6 @@ public: case LINKd: mc = 'F'; break; case LINKc: mc = 'U'; break; case LINKwindows: mc = 'W'; break; - case LINKpascal: mc = 'V'; break; case LINKcpp: mc = 'R'; break; case LINKobjc: mc = 'Y'; break; default: @@ -415,7 +414,6 @@ public: case LINKc: case LINKwindows: - case LINKpascal: case LINKobjc: buf->writestring(d->ident->toChars()); return; diff --git a/gcc/d/dmd/globals.h b/gcc/d/dmd/globals.h index 9d6e1ec..6aff9b4 100644 --- a/gcc/d/dmd/globals.h +++ b/gcc/d/dmd/globals.h @@ -310,7 +310,6 @@ enum LINK LINKc, LINKcpp, LINKwindows, - LINKpascal, LINKobjc, LINKsystem }; diff --git a/gcc/d/dmd/hdrgen.c b/gcc/d/dmd/hdrgen.c index 22ae9c8..fd4d162 100644 --- a/gcc/d/dmd/hdrgen.c +++ b/gcc/d/dmd/hdrgen.c @@ -1271,7 +1271,6 @@ public: case LINKc: p = "C"; break; case LINKcpp: p = "C++"; break; case LINKwindows: p = "Windows"; break; - case LINKpascal: p = "Pascal"; break; case LINKobjc: p = "Objective-C"; break; default: assert(0); @@ -3367,7 +3366,6 @@ const char *linkageToChars(LINK linkage) case LINKc: return "C"; case LINKcpp: return "C++"; case LINKwindows: return "Windows"; - case LINKpascal: return "Pascal"; case LINKobjc: return "Objective-C"; case LINKsystem: return "System"; default: assert(0); diff --git a/gcc/d/dmd/idgen.c b/gcc/d/dmd/idgen.c index a6267c5..16f3b5f 100644 --- a/gcc/d/dmd/idgen.c +++ b/gcc/d/dmd/idgen.c @@ -145,7 +145,6 @@ Msgtable msgtable[] = { "C", NULL }, { "D", NULL }, { "Windows", NULL }, - { "Pascal", NULL }, { "System", NULL }, { "Objective", NULL }, diff --git a/gcc/d/dmd/json.c b/gcc/d/dmd/json.c index 7da127e..802de81 100644 --- a/gcc/d/dmd/json.c +++ b/gcc/d/dmd/json.c @@ -323,9 +323,6 @@ public: case LINKwindows: property(name, "windows"); break; - case LINKpascal: - property(name, "pascal"); - break; default: assert(false); } diff --git a/gcc/d/dmd/parse.c b/gcc/d/dmd/parse.c index d1017ac..3e4dd06 100644 --- a/gcc/d/dmd/parse.c +++ b/gcc/d/dmd/parse.c @@ -1294,8 +1294,6 @@ LINK Parser::parseLinkage(Identifiers **pidents, CPPMANGLE *pcppmangle, bool *pc nextToken(); if (id == Id::Windows) link = LINKwindows; - else if (id == Id::Pascal) - link = LINKpascal; else if (id == Id::D) link = LINKd; else if (id == Id::C) @@ -1399,7 +1397,7 @@ LINK Parser::parseLinkage(Identifiers **pidents, CPPMANGLE *pcppmangle, bool *pc else { LinvalidLinkage: - error("valid linkage identifiers are D, C, C++, Objective-C, Pascal, Windows, System"); + error("valid linkage identifiers are D, C, C++, Objective-C, Windows, System"); link = LINKd; } } |