Skip to contentSkip to conversation

to make grub2 compile on NetBSD

PATCH In review walt 4 participants 12 messages Feb 3, 2008 – Feb 13, 2008

lore
Share & tools
lore

walt

author
#0 lore raw

PATCH 1/1 to make grub2 compile on NetBSD

NetBSD's gcc wants libgcc and libc to define __enable_execute_stack, but this is useless for a free-standing executable like grub. Define a dummy function in lieu of libgcc to supply __enable_execute_stack.

Index: include/grub/mm.h
===================================================================
RCS file: /sources/grub/grub2/include/grub/mm.h,v
retrieving revision 1.8

grub/mm.h 3 Feb 2008 21:24:18 -0000 renamed from grub/mm.h 21 Jul 2007 23:32:22 -0000 1.8 +1 -0
diff -u -r1.8 mm.h
@@ -33,6 +33,7 @@
 void EXPORT_FUNC(grub_free) (void *ptr);
 void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size);
 void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
+void EXPORT_FUNC(__enable_execute_stack) (void);   /* For NetBSD gcc */
 
 /* For debugging.  */
 #if defined(MM_DEBUG) && !defined(GRUB_UTIL)

Index: kern/mm.c
===================================================================
RCS file: /sources/grub/grub2/kern/mm.c,v
retrieving revision 1.19

mm.c 3 Feb 2008 21:24:19 -0000 renamed from mm.c 23 Jan 2008 14:57:40 -0000 1.19 +6 -0
diff -u -r1.19 mm.c
@@ -66,6 +66,12 @@
 #include <grub/disk.h>
 #include <grub/dl.h>
 
+/* Dummy symbol to make NetBSD gcc happy */
+void
+__enable_execute_stack(void)
+{
+}
+
 #ifdef MM_DEBUG
 # undef grub_malloc
 # undef grub_realloc
#1 lore raw
Quoted 3 lines · walt

NetBSD's gcc wants libgcc and libc to define __enable_execute_stack, but this is useless for a free-standing executable like grub. Define a dummy function in lieu of libgcc to supply __enable_execute_stack.

Great, thanks!

Can you send in a changelog entry?

grub/mm.h 3 Feb 2008 21:24:18 -0000 line 36

Quoted 12 lines

Index: include/grub/mm.h
===================================================================
RCS file: /sources/grub/grub2/include/grub/mm.h,v
retrieving revision 1.8
diff -u -r1.8 mm.h

grub/mm.h 3 Feb 2008 21:24:18 -0000 renamed from grub/mm.h 21 Jul 2007 23:32:22 -0000 1.8 +1 -0
@@ -33,6 +33,7 @@
 void EXPORT_FUNC(grub_free) (void *ptr);
 void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size);
 void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
+void EXPORT_FUNC(__enable_execute_stack) (void);   /* For NetBSD gcc */

Please use our style of commenting. So a `.' followed by two spaces. Better put this on a separate line. If this is for NetBSD only, shouldn't you add a #ifdef instead of a comment?

Quoted 31 lines
grub/mm.h 3 Feb 2008 21:24:18 -0000 renamed from grub/mm.h 21 Jul 2007 23:32:22 -0000 1.8 +0 -0
 /* For debugging.  */
 #if defined(MM_DEBUG) && !defined(GRUB_UTIL)

Index: kern/mm.c
===================================================================
RCS file: /sources/grub/grub2/kern/mm.c,v
retrieving revision 1.19
diff -u -r1.19 mm.c

mm.c 3 Feb 2008 21:24:19 -0000 renamed from mm.c 23 Jan 2008 14:57:40 -0000 1.19 +6 -0
@@ -66,6 +66,12 @@
 #include <grub/disk.h>
 #include <grub/dl.h>
 
+/* Dummy symbol to make NetBSD gcc happy */
+void
+__enable_execute_stack(void)
+{
+}
+
 #ifdef MM_DEBUG
 # undef grub_malloc
 # undef grub_realloc

_______________________________________________
Grub-devel mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/grub-devel

author
#2 lore raw
Quoted 8 lines · Marco Gerards
Quoted 3 lines · walt

NetBSD's gcc wants libgcc and libc to define __enable_execute_stack, but this is useless for a free-standing executable like grub. Define a dummy function in lieu of libgcc to supply __enable_execute_stack.

... If this is for NetBSD only,
shouldn't you add a #ifdef instead of a comment?

Second try:

Make NetBSD's gcc happy.

* kern/mm.c: New dummy symbol __enable_execute_stack. (include/grub/mm.h): Likewise.

Index: include/grub/mm.h
===================================================================
RCS file: /sources/grub/grub2/include/grub/mm.h,v
retrieving revision 1.8

grub/mm.h 4 Feb 2008 20:05:36 -0000 renamed from grub/mm.h 21 Jul 2007 23:32:22 -0000 1.8 +5 -0
diff -u -r1.8 mm.h
@@ -34,6 +34,11 @@
 void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size);
 void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
 
+#ifdef __NetBSD__
+/* Dummy symbol to make gcc happy. */
+void EXPORT_FUNC(__enable_execute_stack) (void);
+#endif
+
 /* For debugging.  */
 #if defined(MM_DEBUG) && !defined(GRUB_UTIL)
 /* Set this variable to 1 when you want to trace all memory function

calls. */
Index: kern/mm.c
===================================================================
RCS file: /sources/grub/grub2/kern/mm.c,v
retrieving revision 1.19

mm.c 4 Feb 2008 20:05:36 -0000 renamed from mm.c 23 Jan 2008 14:57:40 -0000 1.19 +8 -0
diff -u -r1.19 mm.c
@@ -66,6 +66,14 @@
 #include <grub/disk.h>
 #include <grub/dl.h>
 
+#ifdef __NetBSD__
+/* Dummy symbol to make gcc happy. */
+void
+__enable_execute_stack(void)
+{
+}
+#endif
+
 #ifdef MM_DEBUG
 # undef grub_malloc
 # undef grub_realloc
#3 lore raw
Quoted 10 lines · walt
Quoted 8 lines · Marco Gerards
Quoted 3 lines · walt

NetBSD's gcc wants libgcc and libc to define __enable_execute_stack, but this is useless for a free-standing executable like grub. Define a dummy function in lieu of libgcc to supply __enable_execute_stack.

... If this is for NetBSD only,
shouldn't you add a #ifdef instead of a comment?

Quoted 6 lines

Second try:

Make NetBSD's gcc happy.

* kern/mm.c: New dummy symbol __enable_execute_stack. (include/grub/mm.h): Likewise.

The patch looks fine to me. Can you please supply the header for the changelog entry? It's not complete this way.

--
Marco

#4 lore raw
In reply to walt
Quoted 11 lines · walt
Quoted 8 lines · Marco Gerards
Quoted 3 lines · walt

NetBSD's gcc wants libgcc and libc to define __enable_execute_stack, but this is useless for a free-standing executable like grub. Define a dummy function in lieu of libgcc to supply __enable_execute_stack.

... If this is for NetBSD only,
shouldn't you add a #ifdef instead of a comment?

Quoted 6 lines

Second try:

Make NetBSD's gcc happy.

* kern/mm.c: New dummy symbol __enable_execute_stack. (include/grub/mm.h): Likewise.

This ChangeLog entry seems wrong. I'll write it up for you, as it's easier to explain with an example:

Make NetBSD's gcc happy.

* include/grub/mm.h
[__NetBSD__] (__enable_execute_stack): New function prototype.
* kern/mm.c
[__NetBSD__] (__enable_execute_stack): New function.

mm.c 4 Feb 2008 20:05:36 -0000 line 72

Quoted 4 lines
mm.c 4 Feb 2008 20:05:36 -0000 renamed from mm.c 23 Jan 2008 14:57:40 -0000 1.19 +4 -0
+#ifdef __NetBSD__
+/* Dummy symbol to make gcc happy. */
+void
+__enable_execute_stack(void)

Missing space here ^

Signature · 5 lines
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)
author
#5 lore raw
Quoted 16 lines · Robert Millan
Quoted 6 lines
Quoted 5 lines
Quoted 3 lines · walt

NetBSD's gcc wants libgcc and libc to define __enable_execute_stack, but this is useless for a free-standing executable like grub. Define a dummy function in lieu of libgcc to supply __enable_execute_stack.

Quoted 6 lines

Second try:

Make NetBSD's gcc happy.

* kern/mm.c: New dummy symbol __enable_execute_stack. (include/grub/mm.h): Likewise.

This ChangeLog entry seems wrong. I'll write it up for you, as it's easier to explain with an example:

Quoted 6 lines

Make NetBSD's gcc happy.

* include/grub/mm.h
[__NetBSD__] (__enable_execute_stack): New function prototype.
* kern/mm.c
[__NetBSD__] (__enable_execute_stack): New function.

Okay, thanks. Does the [__NetBSD__] token denote an #ifdef? How would I indicate a patch for, say, Net/Free/Dragonfly BSD's at the same time?

Oh, and should you mention that the new function does nothing?

Marco: I didn't add the header for the changelog because I don't know who (if anyone) is going to commit it.

#6 lore raw
Quoted 4 lines · walt

Okay, thanks. Does the [__NetBSD__] token denote an #ifdef? How would I indicate a patch for, say, Net/Free/Dragonfly BSD's at the same time?

No idea, you just caught me on this ;-)

Anyway, if we come to this, maybe it is better to just add an autoconf check.

Quoted 1 line

Oh, and should you mention that the new function does nothing?

That's optional.

Quoted 2 lines

Marco: I didn't add the header for the changelog because I don't know who (if anyone) is going to commit it.

Just put your name in it.

Signature · 5 lines
Robert Millan

<GPLv2> I know my rights; I want my phone call!
<DRM> What use is a phone call… if you are unable to speak?
(as seen on /.)
#7 lore raw
In reply to walt
Quoted 24 lines · walt
Quoted 16 lines · Robert Millan
Quoted 6 lines
Quoted 5 lines
Quoted 3 lines · walt

NetBSD's gcc wants libgcc and libc to define __enable_execute_stack, but this is useless for a free-standing executable like grub. Define a dummy function in lieu of libgcc to supply __enable_execute_stack.

Quoted 6 lines

Second try:

Make NetBSD's gcc happy.

* kern/mm.c: New dummy symbol __enable_execute_stack. (include/grub/mm.h): Likewise.

This ChangeLog entry seems wrong. I'll write it up for you, as it's easier to explain with an example:

Quoted 6 lines

Make NetBSD's gcc happy.

* include/grub/mm.h
[__NetBSD__] (__enable_execute_stack): New function prototype.
* kern/mm.c
[__NetBSD__] (__enable_execute_stack): New function.

Quoted 8 lines

Okay, thanks. Does the [__NetBSD__] token denote an #ifdef? How would I indicate a patch for, say, Net/Free/Dragonfly BSD's at the same time?

Oh, and should you mention that the new function does nothing?

Marco: I didn't add the header for the changelog because I don't know who (if anyone) is going to commit it.

Your name and email address should be used when committing, at least that's preferred. The date will be updated to the commit date when committing.

--
Marco

author
#8 lore raw
In reply to Marco Gerards
Quoted 8 lines · Marco Gerards
Quoted 3 lines · walt

NetBSD's gcc wants libgcc and libc to define __enable_execute_stack, but this is useless for a free-standing executable like grub. Define a dummy function in lieu of libgcc to supply __enable_execute_stack.

... If this is for NetBSD only,
shouldn't you add a #ifdef instead of a comment?

Third try:

2008-??-?? walt <[email protected]>

Make NetBSD's gcc happy. Based on pkgsrc/wip/grub2 patches.

* include/grub/mm.h
[__NetBSD__] (__enable_execute_stack): New function prototype.
* kern/mm.c
[__NetBSD__] (__enable_execute_stack): New function.

Index: include/grub/mm.h
===================================================================
RCS file: /sources/grub/grub2/include/grub/mm.h,v
retrieving revision 1.8

grub/mm.h 4 Feb 2008 20:05:36 -0000 renamed from grub/mm.h 21 Jul 2007 23:32:22 -0000 1.8 +4 -0
diff -u -r1.8 mm.h
@@ -34,6 +34,11 @@
 void *EXPORT_FUNC(grub_realloc) (void *ptr, grub_size_t size);
 void *EXPORT_FUNC(grub_memalign) (grub_size_t align, grub_size_t size);
 +#ifdef __NetBSD__
+/* Dummy symbol to make gcc happy. */
+void EXPORT_FUNC(__enable_execute_stack) (void);
+#endif
+
 /* For debugging.  */
 #if defined(MM_DEBUG) && !defined(GRUB_UTIL)
 /* Set this variable to 1 when you want to trace all memory function

calls. */
Index: kern/mm.c
===================================================================
RCS file: /sources/grub/grub2/kern/mm.c,v
retrieving revision 1.19

mm.c 4 Feb 2008 20:05:36 -0000 renamed from mm.c 23 Jan 2008 14:57:40 -0000 1.19 +7 -0
diff -u -r1.19 mm.c
@@ -66,6 +66,14 @@
 #include <grub/disk.h>
 #include <grub/dl.h>
 +#ifdef __NetBSD__
+/* Dummy symbol to make gcc happy. */
+void
+__enable_execute_stack (void)
+{
+}
+#endif
+
 #ifdef MM_DEBUG
 # undef grub_malloc
 # undef grub_realloc
#9 lore raw
Quoted 11 lines · walt
Quoted 7 lines · Marco Gerards
Quoted 3 lines · walt

NetBSD's gcc wants libgcc and libc to define __enable_execute_stack, but this is useless for a free-standing executable like grub. Define a dummy function in lieu of libgcc to supply __enable_execute_stack.

... If this is for NetBSD only,
shouldn't you add a #ifdef instead of a comment?

Third try:

Quoted 8 lines

2008-??-?? walt <[email protected]>

Make NetBSD's gcc happy. Based on pkgsrc/wip/grub2 patches.

* include/grub/mm.h
[__NetBSD__] (__enable_execute_stack): New function prototype.
* kern/mm.c
[__NetBSD__] (__enable_execute_stack): New function.

I don't strongly object to this way, but I feel that it would be better to probe if __enable_execute_stack must be defined, and define a variable in configure, instead of hardcoding __NetBSD__.

Okuji

author
#10 lore raw
Quoted 16 lines · Yoshinori K. Okuji
Quoted 15 lines · walt
Quoted 7 lines · Marco Gerards
Quoted 3 lines · walt

NetBSD's gcc wants libgcc and libc to define __enable_execute_stack, but this is useless for a free-standing executable like grub. Define a dummy function in lieu of libgcc to supply __enable_execute_stack.

... If this is for NetBSD only,
shouldn't you add a #ifdef instead of a comment?

Third try:

2008-??-?? walt <[email protected]>

Make NetBSD's gcc happy. Based on pkgsrc/wip/grub2 patches.

Quoted 8 lines
Quoted 4 lines

* include/grub/mm.h
[__NetBSD__] (__enable_execute_stack): New function prototype.
* kern/mm.c
[__NetBSD__] (__enable_execute_stack): New function.

I don't strongly object to this way, but I feel that it would be better to probe if __enable_execute_stack must be defined, and define a variable in configure, instead of hardcoding __NetBSD__.

That sounds excellent -- I hate adding ifdefs for specific operating systems because it just disguises the real problem instead of solving it.

This is a link-time error, and I have no clue how to detect it at configure time. Please show me how you would do it.

Thanks!

#11 lore raw
Quoted 2 lines · walt

This is a link-time error, and I have no clue how to detect it at configure time. Please show me how you would do it.

I think the following would be sufficient:

1. Find small code which produces a reference to __enable_execute_stack even with -fno-stack-protector. Probably using a nested function should be enough.

2. Compile it to an object file, and run "nm -u object_file | grep __enable_execute_stack".

3. Write a test in aclocal.m4 using the above, and call it from configure.ac.

You can see many examples in aclocal.m4. If you have no clue on writing an autoconf test, I can write it for you, if you show me such code.

Okuji