 @@ -56,42 +56,43 @@ struct _egl_global _eglGlobal =
       true, /* EGL_EXT_platform_x11 */
       true, /* EGL_EXT_platform_wayland */
       true  /* EGL_MESA_platform_gbm */
    },
    /* ClientExtensionsString */
    "EGL_EXT_client_extensions"
    " EGL_EXT_platform_base"
    " EGL_EXT_platform_x11"
    " EGL_EXT_platform_wayland"
    " EGL_MESA_platform_gbm"
 };
 static EGLBoolean registered = EGL_FALSE;
-static void
+static void __attribute__((__destructor__))
 _eglAtExit(void)
+{
    EGLint i;
    if (!registered)
      return;
    for (i = _eglGlobal.NumAtExitCalls - 1; i >= 0; i--)
       _eglGlobal.AtExitCalls[i]();
+}
 void
 _eglAddAtExitCall(void (*func)(void))
+{
    if (func) {
       static EGLBoolean registered = EGL_FALSE;
       _eglLockMutex(_eglGlobal.Mutex);
-      if (!registered) {
+      registered = EGL_TRUE;
          atexit(_eglAtExit);
          registered = EGL_TRUE;
       assert(_eglGlobal.NumAtExitCalls < ARRAY_SIZE(_eglGlobal.AtExitCalls));
       _eglGlobal.AtExitCalls[_eglGlobal.NumAtExitCalls++] = func;
       _eglUnlockMutex(_eglGlobal.Mutex);
+   }
+}

	@@ -1607,27 +1607,27 @@ do_common_optimization(exec_list *ir, bo		@@ -1607,27 +1607,27 @@ do_common_optimization(exec_list *ir, bo
1607		1607
1608	return progress;	1608	return progress;
1609	}	1609	}
1610		1610
1611	extern "C" {	1611	extern "C" {
1612		1612
1613	/**	1613	/**
1614	* To be called at GL teardown time, this frees compiler datastructures.	1614	* To be called at GL teardown time, this frees compiler datastructures.
1615	*	1615	*
1616	* After calling this, any previously compiled shaders and shader	1616	* After calling this, any previously compiled shaders and shader
1617	* programs would be invalid. So this should happen at approximately	1617	* programs would be invalid. So this should happen at approximately
1618	* program exit.	1618	* program exit.
1619	*/	1619	*/
1620	void	1620	void __attribute__((__destructor__))
1621	_mesa_destroy_shader_compiler(void)	1621	_mesa_destroy_shader_compiler(void)
1622	{	1622	{
1623	_mesa_destroy_shader_compiler_caches();	1623	_mesa_destroy_shader_compiler_caches();
1624		1624
1625	_mesa_glsl_release_types();	1625	_mesa_glsl_release_types();
1626	}	1626	}
1627		1627
1628	/**	1628	/**
1629	* Releases compiler caches to trade off performance for memory.	1629	* Releases compiler caches to trade off performance for memory.
1630	*	1630	*
1631	* Intended to be used with glReleaseShaderCompiler().	1631	* Intended to be used with glReleaseShaderCompiler().
1632	*/	1632	*/
1633	void	1633	void

 @@ -420,27 +420,29 @@ one_time_init( struct gl_context *ctx )
    if (!(api_init_mask & (1 << ctx->API))) {
       _mesa_init_get_hash(ctx);
       _mesa_init_remap_table();
+   }
    api_init_mask |= 1 << ctx->API;
    mtx_unlock(&OneTimeLock);
    /* Hopefully atexit() is widely available.  If not, we may need some
     * #ifdef tests here.
     */
 #if 0 /* using destructor instead */
    atexit(_mesa_destroy_shader_compiler);
 #endif
    dummy_enum_func();
+}
 /**
  * Initialize fields of gl_current_attrib (aka ctx->Current.*)
  */
 static void
 _mesa_init_current(struct gl_context *ctx)
+{
    GLuint i;

 @@ -562,49 +562,49 @@ get_extension_override( struct gl_contex
       _mesa_problem(ctx, "Trying to enable unknown extensions: %s",
                     extra_extensions);
       return strdup(extra_extensions);
+   }
+}
 /**
  * \brief Free extra_extensions and cant_disable_extensions strings
+ *
  * These strings are allocated early during the first context creation by
  * _mesa_one_time_init_extension_overrides.
  */
-static void
+static void __attribute__((__destructor__))
 free_unknown_extensions_strings(void)
+{
    free(extra_extensions);
    free(cant_disable_extensions);
+}
 /**
  * \brief Initialize extension override tables.
+ *
  * This should be called one time early during first context initialization.
  */
 void
 _mesa_one_time_init_extension_overrides(void)
+{
    const char *env_const = _mesa_getenv("MESA_EXTENSION_OVERRIDE");
    char *env;
    char *ext;
    int len;
    size_t offset;
-   atexit(free_unknown_extensions_strings);
+   /* atexit(free_unknown_extensions_strings); */
    memset(&_mesa_extension_override_enables, 0, sizeof(struct gl_extensions));
    memset(&_mesa_extension_override_disables, 0, sizeof(struct gl_extensions));
    if (env_const == NULL) {
       return;
+   }
    /* extra_exts: List of unrecognized extensions. */
    extra_extensions = calloc(ALIGN(strlen(env_const) + 2, 4), sizeof(char));
    cant_disable_extensions = calloc(ALIGN(strlen(env_const) + 2, 4), sizeof(char));
    /* Copy env_const because strtok() is destructive. */