author | Wolfgang Rosenauer <wr@rosenauer.org> |
Tue, 15 Nov 2016 21:26:23 +0100 | |
branch | firefox50 |
changeset 932 | a58cc7936ce7 |
parent 920 | 4e5807284ef0 |
permissions | -rw-r--r-- |
920
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
1 |
# HG changeset patch |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
2 |
# User Wolfgang Rosenauer <wr@rosenauer.org> |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
3 |
# Parent 83bc32d997c714b607db1ffa71f02b30e1484a75 |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
4 |
From: NetBSD |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
5 |
Subject: Workaround for gcc/binutils combination in Leap 42.2 |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
6 |
References: |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
7 |
https://bugzilla.opensuse.org/show_bug.cgi?id=984637 |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
8 |
|
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
9 |
diff --git a/xpcom/components/Module.h b/xpcom/components/Module.h |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
10 |
--- a/xpcom/components/Module.h |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
11 |
+++ b/xpcom/components/Module.h |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
12 |
@@ -120,17 +120,17 @@ struct Module |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
13 |
#if defined(MOZILLA_INTERNAL_API) |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
14 |
# define NSMODULE_NAME(_name) _name##_NSModule |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
15 |
# if defined(_MSC_VER) |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
16 |
# pragma section(".kPStaticModules$M", read) |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
17 |
# pragma comment(linker, "/merge:.kPStaticModules=.rdata") |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
18 |
# define NSMODULE_SECTION __declspec(allocate(".kPStaticModules$M"), dllexport) |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
19 |
# elif defined(__GNUC__) |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
20 |
# if defined(__ELF__) |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
21 |
-# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("protected"))) |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
22 |
+# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), visibility("default"))) |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
23 |
# elif defined(__MACH__) |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
24 |
# define NSMODULE_SECTION __attribute__((section("__DATA, .kPStaticModules"), visibility("default"))) |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
25 |
# elif defined (_WIN32) |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
26 |
# define NSMODULE_SECTION __attribute__((section(".kPStaticModules"), dllexport)) |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
27 |
# endif |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
28 |
# endif |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
29 |
# if !defined(NSMODULE_SECTION) |
4e5807284ef0
https://bugzilla.opensuse.org/show_bug.cgi?id=984637
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff
changeset
|
30 |
# error Do not know how to define sections. |