...this is not a good commit day for me.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@132294 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index e8f24c1e0580045315d60d02977588db65a14be4..f0e7c4211332c03be81dc2e19c72706b71ca4b0c 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -605,7 +605,7 @@ if test "$enableval" = host-only ; then
   enableval=host
 fi
 case "$enableval" in
-  all) TARGETS_TO_BUILD="X86 Sparc PowerPC Alpha ARM Glulx Mips CellSPU XCore MSP430 SystemZ Blackfin CBackend CppBackend MBlaze PTX" ;;
+  all) TARGETS_TO_BUILD="X86 Sparc PowerPC Alpha ARM Mips CellSPU XCore MSP430 SystemZ Blackfin CBackend CppBackend MBlaze PTX" ;;
   *)for a_target in `echo $enableval|sed -e 's/,/ /g' ` ; do
       case "$a_target" in
         x86)      TARGETS_TO_BUILD="X86 $TARGETS_TO_BUILD" ;;
@@ -614,7 +614,6 @@ case "$enableval" in
         powerpc)  TARGETS_TO_BUILD="PowerPC $TARGETS_TO_BUILD" ;;
         alpha)    TARGETS_TO_BUILD="Alpha $TARGETS_TO_BUILD" ;;
         arm)      TARGETS_TO_BUILD="ARM $TARGETS_TO_BUILD" ;;
-        glulx)    TARGETS_TO_BUILD="Glulx $TARGETS_TO_BUILD" ;;
         mips)     TARGETS_TO_BUILD="Mips $TARGETS_TO_BUILD" ;;
         spu)      TARGETS_TO_BUILD="CellSPU $TARGETS_TO_BUILD" ;;
         xcore)    TARGETS_TO_BUILD="XCore $TARGETS_TO_BUILD" ;;

diff --git a/include/llvm/ADT/Triple.h b/include/llvm/ADT/Triple.h
index df77317e54766df5f650d1d55213878f29ae15a3..078033d8cf370169fbc391d2d06d58c6bfc7cf83 100644 (file)
--- a/include/llvm/ADT/Triple.h
+++ b/include/llvm/ADT/Triple.h
@@ -50,7 +50,6 @@ public:
     arm,     // ARM; arm, armv.*, xscale
     bfin,    // Blackfin: bfin
     cellspu, // CellSPU: spu, cellspu
-    glulx,   // Glulx: glulx, glulx1, glulx2, glulx3
     mips,    // MIPS: mips, mipsallegrex
     mipsel,  // MIPSEL: mipsel, mipsallegrexel, psp
     msp430,  // MSP430: msp430

diff --git a/lib/Support/Triple.cpp b/lib/Support/Triple.cpp
index 56b0878aa76cd3d5466e27a71310088f1f57ca5d..dbdb303a4fdd9553bf5d0d4654c5591746aac817 100644 (file)
--- a/lib/Support/Triple.cpp
+++ b/lib/Support/Triple.cpp
@@ -27,7 +27,6 @@ const char *Triple::getArchTypeName(ArchType Kind) {
   case arm:     return "arm";
   case bfin:    return "bfin";
   case cellspu: return "cellspu";
-  case glulx:   return "glulx";
   case mips:    return "mips";
   case mipsel:  return "mipsel";
   case msp430:  return "msp430";
@@ -63,8 +62,6 @@ const char *Triple::getArchTypePrefix(ArchType Kind) {
 
   case cellspu: return "spu";
 
-  case glulx:   return "glulx";
-
   case ppc64:
   case ppc:     return "ppc";
 
@@ -142,8 +139,6 @@ Triple::ArchType Triple::getArchTypeForLLVMName(StringRef Name) {
     return bfin;
   if (Name == "cellspu")
     return cellspu;
-  if (Name == "glulx")
-    return glulx;
   if (Name == "mips")
     return mips;
   if (Name == "mipsel")
@@ -282,8 +277,6 @@ Triple::ArchType Triple::ParseArch(StringRef ArchName) {
     return thumb;
   else if (ArchName.startswith("alpha"))
     return alpha;
-  else if (ArchName.startswith("glulx"))
-    return glulx;
   else if (ArchName == "spu" || ArchName == "cellspu")
     return cellspu;
   else if (ArchName == "msp430")