@@ -101,6 +101,7 @@ def test_abs(self):
         self.assertEqual(abs(0), 0)
         self.assertEqual(abs(1234), 1234)
         self.assertEqual(abs(-1234), 1234)
+        self.assertTrue(abs(-sys.maxint-1) > 0)
         # float
         self.assertEqual(abs(0.0), 0.0)
         self.assertEqual(abs(3.14), 3.14)
 
@@ -12,6 +12,9 @@ What's New in Python 2.4.4c1?
 Core and builtins
 -----------------
 
+- Integer negation and absolute value were fixed to not rely
+  on undefined behaviour of the C compiler anymore.
+
 - Patch #1567691: super() and new.instancemethod() now don't accept
   keyword arguments any more (previously they accepted them, but didn't
   use them).
 
@@ -674,10 +674,9 @@ int_pow(PyIntObject *v, PyIntObject *w, PyIntObject *z)
 static PyObject *
 int_neg(PyIntObject *v)
 {
-	register long a, x;
+	register long a;
 	a = v->ob_ival;
-	x = -a;
-	if (a < 0 && x < 0) {
+	if (a < 0 && (unsigned long)a == 0-(unsigned long)a) {
 		PyObject *o = PyLong_FromLong(a);
 		if (o != NULL) {
 			PyObject *result = PyNumber_Negative(o);
@@ -686,7 +685,7 @@ int_neg(PyIntObject *v)
 		}
 		return NULL;
 	}
-	return PyInt_FromLong(x);
+	return PyInt_FromLong(-a);
 }
 
 static PyObject *
Original file line number	Diff line number	Diff line change
`@@ -674,10 +674,9 @@ int_pow(PyIntObject v, PyIntObject w, PyIntObject *z)`
`674`	`674`	`static PyObject *`
`675`	`675`	`int_neg(PyIntObject *v)`
`676`	`676`	`{`
`677`		`- register long a, x;`
	`677`	`+ register long a;`
`678`	`678`	`a = v->ob_ival;`
`679`		`- x = -a;`
`680`		`- if (a < 0 && x < 0) {`
	`679`	`+ if (a < 0 && (unsigned long)a == 0-(unsigned long)a) {`
`681`	`680`	`PyObject *o = PyLong_FromLong(a);`
`682`	`681`	`if (o != NULL) {`
`683`	`682`	`PyObject *result = PyNumber_Negative(o);`
`@@ -686,7 +685,7 @@ int_neg(PyIntObject *v)`
`686`	`685`	`}`
`687`	`686`	`return NULL;`
`688`	`687`	`}`
`689`		`- return PyInt_FromLong(x);`
	`688`	`+ return PyInt_FromLong(-a);`
`690`	`689`	`}`
`691`	`690`
`692`	`691`	`static PyObject *`