From 792c719e1c08aad3979f2a64a2af253118ed058f Mon Sep 17 00:00:00 2001
From: phessler <phessler@openbsd.org>
Date: Sat, 17 Aug 2024 09:48:31 +0000
Subject: [PATCH] effectively revert revision 1.7.

The original reason was some corner cases around COPY relocations, which
caused problems for miniperl which directly modified environ and accessed
environ via libc functions.

This causes duplicate symbols for environ/__progname in some (poorly written)
apps, but is allowed on most other architectures.

Since the time this was added other arm architecture changes mean that we
don't need it, so remove it.

debugged with kettenis@ and jca@
tested and OK guenther@
---
 lib/csu/arm/md_init.h | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/csu/arm/md_init.h b/lib/csu/arm/md_init.h
index 63bfc8bee1d..66e6f6df65f 100644
--- a/lib/csu/arm/md_init.h
+++ b/lib/csu/arm/md_init.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: md_init.h,v 1.18 2023/11/18 16:26:16 deraadt Exp $ */
+/* $OpenBSD: md_init.h,v 1.19 2024/08/17 09:48:31 phessler Exp $ */
 
 /*-
  * Copyright (c) 2001 Ross Harvey
@@ -87,7 +87,6 @@
  * of COPY relocations for WEAK symbols.
  */
 #define	MD_CRT0_START				\
-	char **environ, *__progname;		\
 	__asm(					\
 	".text					\n" \
 	"	.align	0			\n" \
-- 
2.20.1