From 797d2d1671746618ed1d38163506adc058942edd Mon Sep 17 00:00:00 2001
From: Ralf Jung <jung@mpi-sws.org>
Date: Mon, 29 Aug 2016 14:11:04 +0200
Subject: [PATCH] Turn out Coq 8.5 already comes with a module to get lia
 without axioms: Lia

---
 _CoqProject               |  1 -
 prelude/psatz_axiomfree.v | 39 ---------------------------------------
 prelude/tactics.v         |  2 +-
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 prelude/psatz_axiomfree.v

diff --git a/_CoqProject b/_CoqProject
index 2ba6e827..54a1a2d1 100644
--- a/_CoqProject
+++ b/_CoqProject
@@ -21,7 +21,6 @@ prelude/listset.v
 prelude/streams.v
 prelude/gmap.v
 prelude/base.v
-prelude/psatz_axiomfree.v
 prelude/tactics.v
 prelude/prelude.v
 prelude/listset_nodup.v
diff --git a/prelude/psatz_axiomfree.v b/prelude/psatz_axiomfree.v
deleted file mode 100644
index 9b1d430e..00000000
--- a/prelude/psatz_axiomfree.v
+++ /dev/null
@@ -1,39 +0,0 @@
-(** This file is a hack that lets us use Psatz without importing all sorts of
-    axioms about real numbers.  It has been created by copying the file
-    Psatz.v from the Coq distribution, removing everything defined after the lia
-    tactic, and removing the two lines importing RMicromega and Rdefinitions.
-    The original license header follows. *)
-
-(************************************************************************)
-(*  v      *   The Coq Proof Assistant  /  The Coq Development Team     *)
-(* <O___,, *   INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2016     *)
-(*   \VV/  **************************************************************)
-(*    //   *      This file is distributed under the terms of the       *)
-(*         *       GNU Lesser General Public License Version 2.1        *)
-(************************************************************************)
-(*                                                                      *)
-(* Micromega: A reflexive tactic using the Positivstellensatz           *)
-(*                                                                      *)
-(*  Frédéric Besson (Irisa/Inria) 2006-2008                             *)
-(*                                                                      *)
-(************************************************************************)
-
-From Coq Require Import ZMicromega.
-From Coq Require Import QMicromega.
-From Coq Require Import QArith.
-From Coq Require Import ZArith.
-From Coq Require Import RingMicromega.
-From Coq Require Import VarMap.
-From Coq Require Tauto.
-Declare ML Module "micromega_plugin".
-
-Ltac preprocess := 
-    zify ; unfold Z.succ in * ; unfold Z.pred in *.
-
-Ltac lia :=
-  preprocess;
-  xlia ;
-  abstract (
-  intros __wit __varmap __ff ;
-    change (Tauto.eval_f (Zeval_formula (@find Z Z0 __varmap)) __ff) ;
-      apply (ZTautoChecker_sound __ff __wit); vm_cast_no_check (eq_refl true)).
diff --git a/prelude/tactics.v b/prelude/tactics.v
index 2a41f764..dd46cd80 100644
--- a/prelude/tactics.v
+++ b/prelude/tactics.v
@@ -3,7 +3,7 @@
 (** This file collects general purpose tactics that are used throughout
 the development. *)
 From Coq Require Import Omega.
-From iris.prelude Require Export psatz_axiomfree.
+From Coq Require Export Lia.
 From iris.prelude Require Export decidable.
 
 Lemma f_equal_dep {A B} (f g : ∀ x : A, B x) x : f = g → f x = g x.
-- 
2.26.2