From 3dee689d8fa82d36a83926931bb9ebaad18ee465 Mon Sep 17 00:00:00 2001
From: David Edelsohn <dje.gcc@gmail.com>
Date: Sat, 7 Nov 2015 14:23:32 +0000
Subject: [PATCH] atexit.c: New file.

* config/rs6000/atexit.c: New file.
* config/rs6000/t-aix-cxa (LIB2ADDEH): Build atexit.c.
* config/rs6000/libgcc-aix-cxa.ver (atexit): Add symbol to exports.
* config/rs6000/cxa_finalize.c
(catomic_compare_and_exchange_bool_acq): Negate return value.

From-SVN: r229932
---
 libgcc/ChangeLog                        |  8 +++++
 libgcc/config/rs6000/atexit.c           | 44 +++++++++++++++++++++++++
 libgcc/config/rs6000/cxa_finalize.c     |  4 +--
 libgcc/config/rs6000/libgcc-aix-cxa.ver |  4 +++
 libgcc/config/rs6000/t-aix-cxa          |  3 +-
 5 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 libgcc/config/rs6000/atexit.c

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index d964b243879..cc5f9f28c07 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,11 @@
+2015-11-07  David Edelsohn  <dje.gcc@gmail.com>
+
+	* config/rs6000/atexit.c: New file.
+	* config/rs6000/t-aix-cxa (LIB2ADDEH): Build atexit.c.
+	* config/rs6000/libgcc-aix-cxa.ver (atexit): Add symbol to exports.
+	* config/rs6000/cxa_finalize.c
+	(catomic_compare_and_exchange_bool_acq): Negate return value.
+
 2015-10-30  Venkataramanan Kumar  <venkataramanan.kumar@amd.com>
 
 	* config/i386/cpuinfo.c (enum processor_types): Add AMDFAM17H.
diff --git a/libgcc/config/rs6000/atexit.c b/libgcc/config/rs6000/atexit.c
new file mode 100644
index 00000000000..f12eb36fe0d
--- /dev/null
+++ b/libgcc/config/rs6000/atexit.c
@@ -0,0 +1,44 @@
+/* Copyright (C) 1999-2015 Free Software Foundation, Inc.
+
+   NOTE: This source is derived from an old version taken from the GNU C
+   Library (glibc).
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 3, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
+
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
+
+#include <stdlib.h>
+#include "exit.h"
+
+
+/* This is defined by newer gcc version unique for each module.  */
+extern void *__dso_handle __attribute__ ((__weak__));
+
+
+/* Register FUNC to be executed by `exit'.  */
+int
+#ifndef atexit
+attribute_hidden
+#endif
+atexit (void (*func) (void))
+{
+  return __cxa_atexit ((void (*) (void *)) func, NULL,
+		       &__dso_handle == NULL ? NULL : __dso_handle);
+}
diff --git a/libgcc/config/rs6000/cxa_finalize.c b/libgcc/config/rs6000/cxa_finalize.c
index 71f8579248a..1fc9d605bbf 100644
--- a/libgcc/config/rs6000/cxa_finalize.c
+++ b/libgcc/config/rs6000/cxa_finalize.c
@@ -32,8 +32,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 static boolean_t
 catomic_compare_and_exchange_bool_acq (long *mem, long newval, long oldval)
 {
-  return __atomic_compare_exchange (mem, &oldval, &newval, 0,
-				    __ATOMIC_ACQUIRE, __ATOMIC_ACQUIRE);
+  return ! __atomic_compare_exchange (mem, &oldval, &newval, 0,
+				      __ATOMIC_ACQUIRE, __ATOMIC_ACQUIRE);
 }
 
 /* If D is non-NULL, call all functions registered with `__cxa_atexit'
diff --git a/libgcc/config/rs6000/libgcc-aix-cxa.ver b/libgcc/config/rs6000/libgcc-aix-cxa.ver
index f89df2312a3..c729b585a44 100644
--- a/libgcc/config/rs6000/libgcc-aix-cxa.ver
+++ b/libgcc/config/rs6000/libgcc-aix-cxa.ver
@@ -7,3 +7,7 @@ GCC_4.9 {
   _GLOBAL__AIXI_shr_o
   _GLOBAL__AIXD_shr_o
 }
+
+GCC_5 {
+  atexit
+}
diff --git a/libgcc/config/rs6000/t-aix-cxa b/libgcc/config/rs6000/t-aix-cxa
index f230a88d47f..77d7b5336f3 100644
--- a/libgcc/config/rs6000/t-aix-cxa
+++ b/libgcc/config/rs6000/t-aix-cxa
@@ -1,5 +1,6 @@
 LIB2ADDEH += $(srcdir)/config/rs6000/cxa_atexit.c \
-	$(srcdir)/config/rs6000/cxa_finalize.c
+	$(srcdir)/config/rs6000/cxa_finalize.c \
+	$(srcdir)/config/rs6000/atexit.c
 
 LIB2ADD_ST += $(srcdir)/config/rs6000/aixinitfini.c
 
-- 
2.30.2